diff -Nru gthumb-2.14.3/aclocal.m4 gthumb-3.0.0/aclocal.m4 --- gthumb-2.14.3/aclocal.m4 2012-03-25 18:34:05.000000000 +0000 +++ gthumb-3.0.0/aclocal.m4 2012-04-23 18:09:40.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.11.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -20,51 +20,6 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -dnl AM_GCONF_SOURCE_2 -dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -dnl (i.e. pass to gconftool-2 -dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -dnl you should install foo.schemas files -dnl - -AC_DEFUN([AM_GCONF_SOURCE_2], -[ - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - - AC_ARG_WITH([gconf-source], - AC_HELP_STRING([--with-gconf-source=sourceaddress], - [Config database for installing schema files.]), - [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) - - AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) - AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) - - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' - fi - - AC_ARG_WITH([gconf-schema-file-dir], - AC_HELP_STRING([--with-gconf-schema-file-dir=dir], - [Directory for installing schema files.]), - [GCONF_SCHEMA_FILE_DIR="$withval"],) - - AC_SUBST(GCONF_SCHEMA_FILE_DIR) - AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) - - AC_ARG_ENABLE(schemas-install, - AC_HELP_STRING([--disable-schemas-install], - [Disable the schemas installation]), - [case ${enableval} in - yes|no) ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; - esac]) - AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -]) - # Copyright (C) 1995-2002 Free Software Foundation, Inc. # Copyright (C) 2001-2003,2004 Red Hat, Inc. # @@ -549,7 +504,7 @@ DISABLE_DEPRECATED="" if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" + DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" for DOMAIN in $DOMAINS; do DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" done @@ -700,6 +655,90 @@ AC_SUBST(WARN_CXXFLAGS) ]) +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) + +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + # nls.m4 serial 5 (gettext-0.18) dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, dnl Inc. @@ -911,7 +950,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.11.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -927,7 +966,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.11.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -Nru gthumb-2.14.3/ChangeLog gthumb-3.0.0/ChangeLog --- gthumb-2.14.3/ChangeLog 2012-03-25 19:24:32.000000000 +0000 +++ gthumb-3.0.0/ChangeLog 2012-04-23 19:15:14.000000000 +0000 @@ -1,13 +1,643 @@ -commit 37e75870d911c5018f27b6907c8e26e3dcd98db0 +commit ce00b5baddcf9526be7d925367a8ea269f8dac65 Author: Paolo Bacchilega -Date: 2012-03-25 +Date: 2012-04-23 - updated for version 2.14.3 + updated for version 3.0.0 M NEWS M configure.ac -commit 6a3a0beb13b368b593a6382b21ae962c5b1c1c17 +commit 2565eae4749e61bda7d6d25b582f537e0d4a2695 +Author: Paolo Bacchilega +Date: 2012-04-23 + + do not clear the location_source before the location is loaded + + this makes the code more robust if a selection-changed signal + is wrongly + emitted by the folder tree. + +M gthumb/gth-browser.c + +commit d57c99e44f702ec9c275a05b8fc9db55b851d84e +Author: Paolo Bacchilega +Date: 2012-04-23 + + browser: fixed error when the new location is an entry point + + Block selection-changed signals when collapsing the folder tree, + to avoid + to incorrectly open an automatically selected entry. + +M gthumb/gth-browser.c +M gthumb/gth-folder-tree.c +M gthumb/gth-folder-tree.h + +commit 1ddb2daf17503ba93258e75e872aa996523e7be7 +Author: Paolo Bacchilega +Date: 2012-04-23 + + do not call gth_file_source_monitor_directory if the location is NULL + +M gthumb/gth-browser.c +M gthumb/gth-file-source.c + +commit 184cac5375fba19ccb852b3b20f8f9aea5bdc73a +Author: Paolo Bacchilega +Date: 2012-04-23 + + fixed wrong sensitivity of the zoom buttons on the toolbar + + reset the fit mode before setting the zoom level + +M gthumb/gth-image-viewer.c + +commit a014e624c04cbb4ad09ea97e692af1faa18b6af8 +Author: Paolo Bacchilega +Date: 2012-04-21 + + GthImageViewer: add scroll events to the window event mask + +M gthumb/gth-image-viewer.c + +commit 72a668f601e24a23a05845f94a603801e485265b +Author: Paolo Bacchilega +Date: 2012-04-21 + + GthEmpyList: skip GtkScrolledWindow::unrealize when unrealizing + + as we skip GtkScrolledWindow::realize when realizing the widget as + well. + +M gthumb/gth-empty-list.c + +commit 4d9fdfda1faed705d65451c9b0d031a434a7cbf6 +Author: Paolo Bacchilega +Date: 2012-04-21 + + do not load extensions with a different api version + +M extensions/23hq/23hq.extension.in.in +M extensions/bookmarks/bookmarks.extension.in.in +M extensions/burn_disc/burn_disc.extension.in.in +M extensions/cairo_io/cairo_io.extension.in.in +M extensions/catalogs/catalogs.extension.in.in +M extensions/change_date/change_date.extension.in.in +M extensions/comments/comments.extension.in.in +M extensions/contact_sheet/contact_sheet.extension.in.in +M extensions/convert_format/convert_format.extension.in.in +M extensions/desktop_background/desktop_background.extension.in.in +M extensions/edit_metadata/edit_metadata.extension.in.in +M extensions/example/src/example.extension.in.in +M extensions/exiv2_tools/exiv2_tools.extension.in.in +M extensions/export_tools/export_tools.extension.in.in +M extensions/facebook/facebook.extension.in.in +M extensions/file_manager/file_manager.extension.in.in +M extensions/file_tools/file_tools.extension.in.in +M extensions/file_viewer/file_viewer.extension.in.in +M extensions/find_duplicates/find_duplicates.extension.in.in +M extensions/flicker/flicker.extension.in.in +M extensions/flicker_utils/flicker_utils.extension.in.in +M extensions/gstreamer_tools/gstreamer_tools.extension.in.in +M extensions/gstreamer_utils/gstreamer_utils.extension.in.in +M extensions/image_print/image_print.extension.in.in +M extensions/image_rotation/image_rotation.extension.in.in +M extensions/image_viewer/image_viewer.extension.in.in +M extensions/importer/importer.extension.in.in +M extensions/jpeg_utils/jpeg_utils.extension.in.in +M extensions/list_tools/list_tools.extension.in.in +M extensions/map_view/map_view.extension.in.in +M extensions/oauth/oauth.extension.in.in +M extensions/photo_importer/photo_importer.extension.in.in +M extensions/photobucket/photobucket.extension.in.in +M extensions/picasaweb/picasaweb.extension.in.in +M extensions/pixbuf_savers/pixbuf_savers.extension.in.in +M extensions/raw_files/raw_files.extension.in.in +M extensions/red_eye_removal/red_eye_removal.extension.in.in +M extensions/rename_series/rename_series.extension.in.in +M extensions/resize_images/resize_images.extension.in.in +M extensions/search/search.extension.in.in +M extensions/selections/selections.extension.in.in +M extensions/slideshow/slideshow.extension.in.in +M extensions/webalbums/webalbums.extension.in.in +M gthumb/gth-extensions.c +M m4/gthumb.m4 + +commit 2452534685dad9a3ac6262902b44834ba8482043 +Author: Paolo Bacchilega +Date: 2012-04-21 + + automatically set the api version as the first two numbers of + the version + +M configure.ac + +commit fa305b7f3abf7abcfa72af09ce485b69931e54ad +Author: Paolo Bacchilega +Date: 2012-04-20 + + do not compile the extensions that require jpeg_utils if jpeg_tools + is not enabled + +M extensions/contact_sheet/Makefile.am +M extensions/image_rotation/Makefile.am +M extensions/importer/Makefile.am +M extensions/jpeg_utils/Makefile.am +M extensions/photo_importer/Makefile.am +M extensions/pixbuf_savers/Makefile.am +M extensions/webalbums/Makefile.am + +commit 6fec3fc95e4ae89a141023f797843f23e09ba09d +Author: Paolo Bacchilega +Date: 2012-04-20 + + browser: perfoem some actions only when the location changed + + no need to make the current file visible, to update the sensitivity + and other actions after listing the children of a folder tree item. + +M gthumb/gth-browser.c + +commit e6e8dbede4ee628fcbbbcc3cc73f15d2453cfe3e +Author: Paolo Bacchilega +Date: 2012-04-20 + + tree view: do not scroll to the location when listing the children + + this is annoying and unexpected from the user + +M gthumb/gth-browser.c + +commit 69897a69d78b7a5eb24ce77e5068fcb525c326c3 +Author: Paolo Bacchilega +Date: 2012-04-20 + + browser: set the location source only if the location was changed + +M gthumb/gth-browser.c + +commit d450e794c1cb892b30d7553104a1eeaeae0163d2 +Author: Paolo Bacchilega +Date: 2012-04-20 + + catalogs: hide the QuickAddToCatalog action correctly + + use gtk_action_set_visible instead of hiding the related widgets + +M extensions/catalogs/callbacks.c + +commit 3b09b0afba4eb55bbfe9dc53e632c4c46ccb9ba8 +Author: Paolo Bacchilega +Date: 2012-04-20 + + removed GTH_ACTION_GO_INTO + + it is unused. + +M gthumb/gth-browser.c +M gthumb/gth-browser.h + +commit ba9cef6e300f1aafbfb21f40fd7e3eb5250485dc +Author: OKANO Takayoshi +Date: 2012-04-17 + + [l10n] Update Japanese translation + + http://mail.gnome.gr.jp/ml/gnome-translation/201204/msg00238.html + +M po/ja.po + +commit 321039e4a4b711a001b447eb10c7e0591bc6570c +Author: OKANO Takayoshi +Date: 2012-04-17 + + [l10n] Update Japanese translation + + Fix a typo + +M po/ja.po + +commit 6407c884f4e3467597893dd813a21642ed24bccf +Author: Jiro Matsuzawa +Date: 2012-04-15 + + [l10n] Update Japanese translation + + Remove extra white spaces + +M po/ja.po + +commit 0845b52a8bf2d38cfe6cbcec01680a8a12b2292d +Author: OKANO Takayoshi +Date: 2012-04-15 + + [l10n] Update Japanese translation + + Fix a typo + +M po/ja.po + +commit bb6c4f60314b6ac8c3b75ba9e39d24d585ccfd31 +Author: Paolo Bacchilega +Date: 2012-04-14 + + make git ignore patches + +M Makefile.am + +commit 533762f76a883cd3d56bdae99d81fd175fb96b69 +Author: Ritsuko Sato +Date: 2012-04-14 + + [l10n] Update Japanese translation + +M po/ja.po + +commit 3ac33b7ddf21b9d6d71504aab2b0910f9612e0e8 +Author: Jiro Matsuzawa +Date: 2012-04-13 + + metadata category names WON'T show translated strings + + [bug #674033] + +M extensions/rename_series/gth-template-selector.c +M gthumb/gth-file-properties.c + +commit 0fab5bb0276ce26c221fe6170908e73cba0f8530 +Author: Paolo Bacchilega +Date: 2012-04-13 + + fixed focusing of the thumbnail list + + do not focus the grid view if it is not realized yet + +M gthumb/gth-browser.c +M gthumb/gth-dumb-notebook.c +M gthumb/gth-empty-list.c +M gthumb/gth-file-list.c + +commit e49e208e5c5e6a4a3561adde71c3f4711e4d7b50 +Author: Paolo Bacchilega +Date: 2012-04-11 + + selections: fixed keyboard shortcuts for some keyboard layouts + + Fixed the keyboard shortcuts for French keyboards (and maybe + others as well) where the number keys are shifted. + + [bug #673872] + +M extensions/selections/actions.c +M extensions/selections/actions.h +M extensions/selections/callbacks.c +M gthumb/gth-empty-list.c + +commit f264c1e4da741e74fe54281eaad79c387d016b42 +Author: Kjartan Maraas +Date: 2012-04-12 + + Updated Norwegian bokmål translation + +M po/nb.po + +commit a8f1cd18cf14d186216548fa6d6bfc98314b7e46 +Author: Marek Černocký +Date: 2012-04-10 + + Updated Czech translation + +M po/cs.po + +commit a0043bdd388b024712139d6b9779b2ee45cf57ed +Author: Paolo Bacchilega +Date: 2012-04-09 + + updated for version 2.90.3 + +M NEWS +M configure.ac + +commit c6711eecfc4d931a9574ada64be12c010f00d932 +Author: Paolo Bacchilega +Date: 2012-04-09 + + updated POTFILES.in + +M po/POTFILES.in + +commit bdc81841beef5ea609987259eb93d8947b6df364 +Author: Paolo Bacchilega +Date: 2012-04-09 + + selections: show an emblem when a file is added to a selection + +M extensions/selections/Makefile.am +A extensions/selections/gth-metadata-provider-selections.c +A extensions/selections/gth-metadata-provider-selections.h +M extensions/selections/gth-selections-manager.c +M extensions/selections/gth-selections-manager.h +M extensions/selections/main.c +M gthumb/glib-utils.h +M gthumb/gth-browser.c +M gthumb/gth-file-list.c +M gthumb/gth-file-list.h +M gthumb/gth-file-store.c +M gthumb/gth-file-store.h +M gthumb/gth-grid-view.c +M gthumb/gth-main-default-metadata.c +M gthumb/gth-monitor.c +M gthumb/gth-monitor.h + +commit 0ce0f9ee68b1fe7dabc1cf876c4a4407d3a881c7 +Author: Paolo Bacchilega +Date: 2012-04-09 + + fixed name of the gth_monitor_entry_points_changed function + +M gthumb/gth-browser.c +M gthumb/gth-file-source-vfs.c +M gthumb/gth-monitor.c +M gthumb/gth-monitor.h + +commit ffdbabbdf509af120648558fbea764752b9ceb74 +Author: Paolo Bacchilega +Date: 2012-04-09 + + selections: added a command to open the original folder + +M extensions/selections/actions.c +M extensions/selections/actions.h +M extensions/selections/callbacks.c +M extensions/selections/callbacks.h +M extensions/selections/main.c + +commit d1a3f8876a297acc07092ffa65ca0a7284fd9a97 +Author: Paolo Bacchilega +Date: 2012-04-09 + + selections: added command Alt+Shift+n to remove files from selection n + +M extensions/selections/actions.c +M extensions/selections/actions.h +M extensions/selections/callbacks.c + +commit 774e291295541f06a1860d0c95f75f4aeb920f2c +Author: Paolo Bacchilega +Date: 2012-04-09 + + comments: removed useless variable + + 'matcher' is not used anywhere + +M extensions/comments/gth-metadata-provider-comment.c + +commit ad1e836d299a75f811657c1b3927ee266201ac59 +Author: Andrej Žnidaršič +Date: 2012-04-08 + + Updated Slovenian translation + +M help/sl/sl.po + +commit ee56dca5c1e9f7b03dc31af6cf81f781b30c90df +Author: Andrej Žnidaršič +Date: 2012-04-08 + + Updated Slovenian translation + +M help/sl/sl.po + +commit 4c21f38f57f823f462605f416d589b96cd039e8e +Author: Andrej Žnidaršič +Date: 2012-04-08 + + Updated Slovenian translation + +M help/sl/sl.po + +commit 795a3973afc67116f5682ce7df4531a729045ec3 +Author: Paolo Bacchilega +Date: 2012-04-08 + + require exiv2 version 0.21 + + since the code uses Exiv2::LogMsg + + [bug #673711] + +M configure.ac + +commit 7560ed72243e62ee8145937930faf13856619acc +Author: Marek Černocký +Date: 2012-04-05 + + Updated Czech translation + +M po/cs.po + +commit 78a09f804f65b1df3fc845d057a5dd1e173642d4 +Author: Aurimas Černius +Date: 2012-04-05 + + Updated Lithuanian translation + +M po/lt.po + +commit 6d64c2a175bc794a59a0064b6853aa92741cba7b +Author: Marek Černocký +Date: 2012-04-03 + + Updated Czech translation + +M po/cs.po + +commit 2d3708d74646d155988829673edd2590b9e5ce2f +Author: Daniel Mustieles +Date: 2012-03-29 + + Updated Spanish translation + +M po/es.po + +commit 6f4cefc24a70b52eb5aae9d293f22204f81532a7 +Author: Paolo Bacchilega +Date: 2012-03-28 + + fixed run-time warning when uninhibiting the screensaver + + don't call uninhibit with the same cookie more then once + +M gthumb/gth-screensaver.c + +commit db2f9042aee2b5ce72eff2c569c4cbdb3edefcc8 +Author: Daniel Mustieles +Date: 2012-03-28 + + Updated Spanish translation + +M po/es.po + +commit 20ad2dafd06b3b0f459565757087a5d338268d4c +Author: Marek Černocký +Date: 2012-03-28 + + Updated Czech translation + +M po/cs.po + +commit 82cc7e8f746cdf6fdaff2b910adfd9c15294bd75 +Author: Paolo Bacchilega +Date: 2012-03-26 + + use the 3 dots unicode character instead of 3 dots + +M gthumb/gth-file-properties.c + +commit d9a97b9cd0980430e4cf1f89cad1ae03008e03c7 +Author: Paolo Bacchilega +Date: 2012-03-26 + + removed useless and potentially dangerous strncpy + + [bug #672866] + +M gthumb/gth-file-properties.c + +commit dae19e5a2edf0ddcc7f2b29f71c1ecccd72e848f +Author: Paolo Bacchilega +Date: 2012-03-26 + + selections: fixed reordering of files + +M extensions/catalogs/gth-file-source-catalogs.c +M extensions/selections/gth-file-source-selections.c +M extensions/selections/gth-selections-manager.c +M extensions/selections/gth-selections-manager.h +M gthumb/gio-utils.c +M gthumb/glib-utils.c +M gthumb/glib-utils.h + +commit a8684c70afc9dcca81fb653b8d47bdad501af1a6 +Author: Paolo Bacchilega +Date: 2012-03-26 + + fixed possible crash after closing the context menu in the folder tree + +M gthumb/gth-browser.c + +commit 3b977c15552a605b238a9d1f45a276bfad59bd46 +Author: Paolo Bacchilega +Date: 2012-03-26 + + location dialog: reload the list after an invalid location has + been entered + +M gthumb/dlg-location.c + +commit 2f32deae212ead5bd3b3a5b04f19cb417e4062a2 +Author: Paolo Bacchilega +Date: 2012-03-26 + + location dialog: do not crash if the file name is not set + +M gthumb/dlg-location.c + +commit f3410fc8662143a1a33d581b27c23fa550be40b8 +Author: Paolo Bacchilega +Date: 2012-03-26 + + selection: set the file name as well + +M extensions/selections/gth-selections-manager.c + +commit 41940ea53ad15bf0ae9901861b3494dd10695954 +Author: Paolo Bacchilega +Date: 2012-03-26 + + selections: return an error if the selection number is invalid + +M extensions/selections/gth-file-source-selections.c +M extensions/selections/gth-selections-manager.c +M extensions/selections/gth-selections-manager.h + +commit b4d40c3322024963975fb6b23a6b1a84c8932a0f +Author: Paolo Bacchilega +Date: 2012-03-25 + + fixed possible crash when changing directory quickly + +M gthumb/gth-file-list.c + +commit b0ada0dd875290fbb49383af1b1b75af04312737 +Author: Piotr Drąg +Date: 2012-03-25 + + Updated Polish translation + +M po/pl.po + +commit 267e3ad11fbcb4ca0c85cb9659896a43e4c9c60c +Author: Matej Urbančič +Date: 2012-03-25 + + Updated Slovenian translation + +M po/sl.po + +commit ded0ca0aa1f589c36e819db07d6bcc6a62f1d890 +Author: Paolo Bacchilega +Date: 2012-03-25 + + updated for version 2.90.2 + +M NEWS +M configure.ac + +commit f82bf1e8cab644888b4649ded87e86a3d80e2fd0 +Author: Daniel Mustieles +Date: 2012-03-25 + + Updated Spanish translation + +M po/es.po + +commit eb30b96a3aa9508b20371c1ee26efe220730273c +Author: Paolo Bacchilega +Date: 2012-03-25 + + updated POTFILES.in + +M po/POTFILES.in + +commit 402c96e2dcdb4705537088e6a3a99cfa77ec9077 +Author: Paolo Bacchilega +Date: 2012-03-25 + + removed duplicated code + +M gthumb/gth-tags-entry.c + +commit cc689b5b2f5c6e8d8befa6d5c65fe39b36b89ca1 +Author: Paolo Bacchilega +Date: 2012-03-25 + + added a Location dialog to enter the path to display + + [new feature] + +M data/ui/Makefile.am +A data/ui/location.ui +M gthumb/Makefile.am +A gthumb/dlg-location.c +A gthumb/dlg-location.h +M gthumb/gth-browser-actions-callbacks.c +M gthumb/gth-browser-actions-callbacks.h +M gthumb/gth-browser-actions-entries.h +M gthumb/gth-browser-ui.h +M gthumb/gth-browser.c + +commit 3f89d7b9016e3254ffa2ef513b68521d1321b341 Author: Paolo Bacchilega Date: 2012-03-25 @@ -15,7 +645,15 @@ M extensions/file_manager/callbacks.c -commit 892797c479ee90e07bbf50d5151ec271c3aab357 +commit be309ae4a4ef962dbd2adc4ef6371c8a8900072f +Author: Paolo Bacchilega +Date: 2012-03-24 + + require gtk+ 3.0 in the package config file + +M data/gthumb.pc.in + +commit 72c3f05d0a9809231bfeda6f8c61d7829d295c97 Author: Paolo Bacchilega Date: 2012-03-24 @@ -25,10 +663,10 @@ M extensions/cairo_io/cairo-io-png.c M extensions/catalogs/gth-catalog.c M extensions/catalogs/gth-file-source-catalogs.c -M extensions/catalogs/gth-organize-task.c M extensions/comments/gth-comment.c M extensions/exiv2_tools/exiv2-utils.cpp M extensions/file_manager/callbacks.c +M extensions/selections/gth-selections-manager.c M gthumb/gio-utils.c M gthumb/glib-utils.c M gthumb/gnome-desktop-thumbnail.c @@ -44,6 +682,7 @@ M gthumb/gth-image.c M gthumb/gth-location-chooser.c M gthumb/gth-main.c +M gthumb/gth-multipage.c M gthumb/gth-tags-file.c M gthumb/gth-test-chain.c M gthumb/gth-test.c @@ -51,334 +690,3752 @@ M gthumb/gth-time-selector.c M gthumb/gtk-utils.c -commit c64f4af146c99fbfca1637847815402ae2ca0d90 +commit b51f6d66a4295f93e06db58217a5938abebdf18f +Author: Paolo Bacchilega +Date: 2012-03-23 + + grid view: fix display of the focused item + +M gthumb/gth-grid-view.c + +commit bd575ae8ba2fa162d0ae5c75486dfbd1add6b789 +Author: Paolo Bacchilega +Date: 2012-03-23 + + grid view: do not use the adjustment values as it may not be + configured yet + +M gthumb/gth-grid-view.c + +commit 543a706e6cfe41729acfc532179f2ae47713ef2d +Author: Paolo Bacchilega +Date: 2012-03-23 + + copy/move dialog: save the list of the last 10 choosed folders + + [new feature] + +M data/org.gnome.gthumb.file-manager.gschema.xml.in +M extensions/file_manager/actions.c +M extensions/file_manager/preferences.h + +commit 2f66759e4732943aebd8d5f22f7a80274cc356a8 +Author: Paolo Bacchilega +Date: 2012-03-23 + + fixed wrong behaviuor in navigation history + + steps to reproduce the problem: + + open A, open B, back button, open C + + before the change the history was: C, B, A; but B wasn't the + previuos visited folder, after the change the history is: C, A. + +M gthumb/gth-browser.c + +commit 533e7b981f0676413d9f1e4ee377346da3b52103 +Author: Paolo Bacchilega +Date: 2012-03-22 + + Thumbnail pane stays empty until directory change + + [bug #672184] + +M gthumb/gth-grid-view.c + +commit f4cfc0cea2a68659f7307b8d1eae7dcfff5960da +Author: Matej Urbančič +Date: 2012-03-22 + + Updated Slovenian translation + +M po/sl.po + +commit 69ec88345124cd707ece0b8b5855f287ad3dd3ef +Author: Paolo Bacchilega +Date: 2012-03-22 + + fixed some performance issues when updating thumbnails + + use a state machine to avoid to scan the whole list for each thumbnail + +M gthumb/gth-file-list.c + +commit 2548663bab27ce2ed810e11588b8089ca37a8115 +Author: Paolo Bacchilega +Date: 2012-03-22 + + added some comments to make the code clearer + +M gthumb/gth-browser.c + +commit 8b615efa748b181cf3987d7f5a9cf656baf37e51 +Author: Paolo Bacchilega +Date: 2012-03-22 + + added a tool to import the embedded metadata in the gThumb comment + system + + [new feature] + +M extensions/comments/Makefile.am +A extensions/comments/actions.c +A extensions/comments/actions.h +A extensions/comments/callbacks.c +A extensions/comments/callbacks.h +M extensions/comments/gth-comment.c +M extensions/comments/gth-comment.h +A extensions/comments/gth-import-metadata-task.c +A extensions/comments/gth-import-metadata-task.h +M extensions/comments/main.c +M extensions/list_tools/callbacks.c +M po/POTFILES.in + +commit 964c6a87a8d8eb5cf3f528ef5369ded9fc236dea +Author: Michael J. Chudobiak +Date: 2012-03-21 + + fixed help button in preferences window, bug 671290 + +M gthumb/dlg-preferences.c + +commit 81342db39125f0cc28932255ac3b2f3c5275e03a +Author: Paolo Bacchilega +Date: 2012-03-20 + + show "Moving" instead of "Copying" when moving a file + + Use _g_copy_file_async_private to move files as well. To do this + we have + to ignore non-existing metadata files to avoid false error messages + and to + delete the original directories after moving all the files. + +M gthumb/gio-utils.c + +commit 3a0c8e0eb38dc47533ee25840ce3e2a0801486fb +Author: Paolo Bacchilega +Date: 2012-03-18 + + map view: added a scale on the map + +M extensions/map_view/gth-map-view.c + +commit 4e4c2a635f9f8e20348258a3aee2a2d8f3100812 +Author: Paolo Bacchilega +Date: 2012-03-12 + + added librsvg libs to gthumb + +M gthumb/Makefile.am + +commit e244de4b5b3cc7b7053f5830bee66942db27bd0c +Author: Paolo Bacchilega +Date: 2012-03-12 + + always compile the cairo png loader + + [bug #671940] + +M extensions/cairo_io/Makefile.am + +commit 30219aeba7b8e8924730690a7e771a4c5df54dc1 +Author: Paolo Bacchilega +Date: 2012-03-12 + + fixed compilation when libtiff is not available + + [bug #671892] + +M extensions/pixbuf_savers/gth-tiff-saver.c + +commit eb9be1c9bd32a3c7c4ec919226a5aaa87a8589ad +Author: Paolo Bacchilega +Date: 2012-03-06 + + removed wrong use of GDK_EXTENSION_EVENTS_ALL + + this prevents compilation with gtk+ 3.3.18 + + [bug #671451] + +M gthumb/gth-image-navigator.c +M gthumb/gth-time-selector.c + +commit c077f8ad588a261cba1fc30583c64534f9534215 +Author: Paolo Bacchilega +Date: 2012-03-06 + + GthTestCategory: fixed possible crashes + + *) do not connect to the "tags-changed" signal more than once; + *) reset the tag store when the control is destroyed. + +M gthumb/gth-test-category.c + +commit 978d63ab83e13bafa84ef0c100e8df0639c3f136 +Author: Paolo Bacchilega +Date: 2012-03-06 + + Revert "test category: keep a ref of the store until the object + is finilized" + + This reverts commit ebd96c2336ce2996dcc092edc373e2bcb38f5e63. + +M gthumb/gth-test-category.c + +commit 5a03d2cde0322bfb817f4a1921850c39bde18fd4 +Author: Paolo Bacchilega +Date: 2012-03-06 + + strip the tags when setting the list from a text value + +M gthumb/gth-tags-entry.c + +commit 4ddab1bc6e4c41b4af3543ab4cbb6954e17be827 +Author: Paolo Bacchilega +Date: 2012-03-06 + + fixed test for embedded title and description + + use the GthTestSimple object with data-type STRING instead of a + GthTestCategory. + +M gthumb/gth-main-default-tests.c + +commit 076508f6964241a4cdc378a87b8d3e0df120ba09 +Author: Paolo Bacchilega +Date: 2012-03-06 + + test category: keep a ref of the store until the object is finilized + +M gthumb/gth-test-category.c + +commit 1356e815635321efb31051c70da4743add843be0 +Author: Paolo Bacchilega +Date: 2012-03-06 + + removed use of gdk_window_get_pointer + +M gthumb/gth-browser.c +M gthumb/gth-image-navigator.c + +commit d33d31bc07b2da1c6c00a5cacb007c0eb6fd582b +Author: Paolo Bacchilega +Date: 2012-03-06 + + removed use of Gtk[HV]Box and Gtk[HV]Separator + +M extensions/edit_metadata/gth-edit-general-page.c +M extensions/edit_metadata/gth-edit-general-page.h +M extensions/exiv2_tools/gth-edit-iptc-page.c +M extensions/exiv2_tools/gth-edit-iptc-page.h +M extensions/map_view/gth-map-view.c +M extensions/map_view/gth-map-view.h +M extensions/rename_series/gth-template-selector.c +M extensions/rename_series/gth-template-selector.h +M extensions/search/gth-search-editor.c +M extensions/search/gth-search-editor.h +M extensions/slideshow/gth-slideshow-preferences.c +M extensions/slideshow/gth-slideshow-preferences.h +M gthumb/gedit-message-area.c +M gthumb/gedit-message-area.h +M gthumb/gth-file-properties.c +M gthumb/gth-file-properties.h +M gthumb/gth-filterbar.c +M gthumb/gth-filterbar.h +M gthumb/gth-multipage.c +M gthumb/gth-multipage.h +M gthumb/gth-progress-dialog.c +M gthumb/gth-statusbar.c +M gthumb/gth-tags-entry.c +M gthumb/gth-tags-entry.h +M gthumb/gth-test-selector.c +M gthumb/gth-test-selector.h +M gthumb/gth-time-selector.c +M gthumb/gth-time-selector.h +M gthumb/gth-toolbox.c + +commit d5cbd36ce5a3a6344dff336535a2341f095cb891 +Author: Martin Srebotnjak +Date: 2012-03-06 + + Updated Slovenian translation + +M po/sl.po + +commit c95fbe3a1f23169e0e918d5c91ccb006afadf99a +Author: Paolo Bacchilega +Date: 2012-03-05 + + added the 24x24 icons directory + +M data/icons/hicolor/Makefile.am + +commit b23458426854cd623504aef154fe5a548f26ba8a +Author: Paolo Bacchilega +Date: 2012-03-05 + + fixed name of the file selection.svg in EXTRA_DIST + +M data/icons/Makefile.am + +commit aeab8e10a78a321f6e161d541c2ab9ff65e3a767 +Author: Paolo Bacchilega +Date: 2012-03-05 + + use EXTENSION_DESCRIPTION_COLUMN instead of 0 + +M gthumb/dlg-preferences-extensions.c + +commit d044b9305d6c93a068d4edc0fab608bf9b2a4372 +Author: Paolo Bacchilega +Date: 2012-03-05 + + contact sheet: fixed name of the action group + +M extensions/contact_sheet/callbacks.c + +commit 7c619d40c03975ec4bd0ac5720f60cdc2d125ad1 +Author: Martin Srebotnjak +Date: 2012-03-05 + + Updated Slovenian translation + +M po/sl.po + +commit e195fc3a781837dd3688db4c3e97db658373b0e1 +Author: Daniel Mustieles +Date: 2012-03-05 + + Updated Spanish translation + +M po/es.po + +commit 5bc415939c8def2fbe89aedbeb7b9b87dd9e2798 +Author: Jiro Matsuzawa +Date: 2012-03-05 + + [l10n] Update Japanese translation + +M po/ja.po + +commit cb658a4822e1b3f2fcfb3013dd9d06bd978ab608 +Author: Piotr Drąg +Date: 2012-03-04 + + Updated POTFILES.in + +M po/POTFILES.in + +commit 2ea7d46e69e22a0d4b302dcca9faf474433f1a71 +Author: Daniel Mustieles +Date: 2012-03-04 + + Updated Spanish translation + +M help/es/es.po + +commit d22aeb9464e4b4b44067372380c503f0f3e16b2e +Author: Paolo Bacchilega +Date: 2012-03-04 + + Help title is missing a space between "gThumb" and "Help" + + [bug #671289] + +M help/C/index.page + +commit 87b7ddba023127a576b8e747b23c04f2b56f6c56 +Author: Paolo Bacchilega +Date: 2012-03-04 + + updated NEWS + +M NEWS + +commit e6b3f6fec434bfd65664fb920d4ed569c196b1fa +Merge: e6d6bf0 9a3c65e +Author: Paolo Bacchilega +Date: 2012-03-04 + + Merge branch 'release-notes' + +commit e6d6bf0b4512642c0696108987ce9fb1cbfbba72 +Author: Paolo Bacchilega +Date: 2012-03-04 + + selections: added context menu commands to add files to a selection + +M extensions/selections/actions.c +M extensions/selections/actions.h +M extensions/selections/callbacks.c + +commit ac19a8e5a96a4b0abf09be7d52c93c2dcd7b9f56 +Merge: ffaf13f 8297916 +Author: Paolo Bacchilega +Date: 2012-03-04 + + Merge branch 'selections' + +commit 82979168ea2610edd1d3ff939983fd6cd5a06e2d +Author: Paolo Bacchilega +Date: 2012-03-04 + + renamed work queues to selections + +M configure.ac +A data/icons/hicolor/22x22/actions/selection.png +M data/icons/selection.svg +M extensions/Makefile.am +A extensions/selections/Makefile.am +R063 extensions/work_queues/actions.c +extensions/selections/actions.c +R084 extensions/work_queues/actions.h +extensions/selections/actions.h +R068 extensions/work_queues/callbacks.c +extensions/selections/callbacks.c +R076 extensions/work_queues/callbacks.h +extensions/selections/callbacks.h +A extensions/selections/gth-file-source-selections.c +A extensions/selections/gth-file-source-selections.h +R054 extensions/work_queues/gth-queue-manager.c +extensions/selections/gth-selections-manager.c +A extensions/selections/gth-selections-manager.h +R082 extensions/work_queues/main.c extensions/selections/main.c +R088 extensions/work_queues/work_queues.extension.in.in +extensions/selections/selections.extension.in.in +D extensions/work_queues/Makefile.am +D extensions/work_queues/gth-file-source-work-queues.c +D extensions/work_queues/gth-file-source-work-queues.h +D extensions/work_queues/gth-queue-manager.h +M gthumb/gth-main.c + +commit 5f5ba698a1f5398644d4bf30f160bf6861050f9f +Author: Paolo Bacchilega +Date: 2012-03-04 + + work queue: added icons + +M data/icons/Makefile.am +M data/icons/hicolor/16x16/actions/Makefile.am +A data/icons/hicolor/16x16/actions/selection.png +A data/icons/hicolor/16x16/actions/selection1.png +A data/icons/hicolor/16x16/actions/selection2.png +A data/icons/hicolor/16x16/actions/selection3.png +M data/icons/hicolor/48x48/actions/Makefile.am +A data/icons/hicolor/48x48/actions/selection.png +A data/icons/hicolor/48x48/actions/selection1.png +A data/icons/hicolor/48x48/actions/selection2.png +A data/icons/hicolor/48x48/actions/selection3.png +A data/icons/selection.svg +M extensions/work_queues/gth-queue-manager.c + +commit 63136255d9306790e790ddd408668cfed2ad19ad +Author: Paolo Bacchilega +Date: 2012-03-04 + + extra widget: disable the line_wrap option to ellipsize the labels + correctly + +M gthumb/gth-embedded-dialog.c + +commit 622399278ef00531228fc6d6734199dc8e4bb164 +Author: Paolo Bacchilega +Date: 2012-03-03 + + extra widget: use a smaller padding between labels, center labels + vertically + +M gthumb/gth-embedded-dialog.c + +commit 2012f8b4607154146cfe019d12c5cfd83f7cb64c +Author: Paolo Bacchilega +Date: 2012-03-03 + + work queues: added some info on how to use the selections + +M extensions/work_queues/callbacks.c +M extensions/work_queues/callbacks.h +M extensions/work_queues/main.c + +commit 363db5d8edf125d4725bd6dbc70b4531e5dc0ccc +Author: Paolo Bacchilega +Date: 2012-03-03 + + work queues: use the term 'selection' instead of 'work queue' + +M extensions/work_queues/gth-queue-manager.c + +commit 583dabdea0045edefd9e4c1d5c2cddc0d6d2d0b3 +Author: Paolo Bacchilega +Date: 2012-03-03 + + compare the uris instead of the files + +M gthumb/gth-browser.c + +commit ffaf13fc9dcad388f1d434d1101c76fced535268 +Author: Mario Blättermann +Date: 2012-03-01 + + [l10n] Updated German translation + +M po/de.po + +commit a60d75721db2921e0db99c43ae4dff97d0191af7 +Author: Paolo Bacchilega +Date: 2012-02-22 + + set the 'error' variable if the extension description could not + be found + +M gthumb/gth-extensions.c + +commit 3038953d1c262604580c03a16058cdef4bcb6f7a +Author: Paolo Bacchilega +Date: 2012-02-22 + + abort if a mandatory extension cannot be loaded + +M gthumb/gth-main.c + +commit 8bcefaccae784af3735a736cb0d95a03a4d91501 +Author: Paolo Bacchilega +Date: 2012-02-22 + + abort if the extensions folder doesn't exist + +M gthumb/gth-extensions.c + +commit 82b41c7ef4b0eca73847b17a90c22e36dad81a85 +Author: Paolo Bacchilega +Date: 2012-02-19 + + Fixed renaming in viewer mode + + [bug 670392] + +M extensions/file_manager/actions.c + +commit d9a2ae4f1bc35fb352ba06995e26f054777acca3 +Author: Paolo Bacchilega +Date: 2012-02-19 + + call the gth-browser-file-list-key-press hook only if the list widget + is realized + +M gthumb/gth-browser.c + +commit 5717c5be5c9a0ad75934972a93923fb23cabe49a +Author: Paolo Bacchilega +Date: 2012-02-11 + + tweaks to the catalog icon + +M data/icons/hicolor/16x16/actions/file-catalog.png +M data/icons/hicolor/16x16/actions/file-library.png +M data/icons/hicolor/16x16/actions/file-search.png +M data/icons/hicolor/48x48/actions/file-catalog.png +M data/icons/hicolor/48x48/actions/file-library.png +M data/icons/hicolor/48x48/actions/file-search.png +M data/icons/hicolor/scalable/actions/file-catalog.svg +M data/icons/hicolor/scalable/actions/file-library.svg +M data/icons/hicolor/scalable/actions/file-search.svg + +commit 43d9ac254da9d06d77242e1cead74decc86e8801 +Author: Paolo Bacchilega +Date: 2012-02-19 + + call the gth-browser-file-list-key-press hook only if the list widget + is realized + +M gthumb/gth-browser.c + +commit b8ea54006fb2419238bebc17476a176fdf0d43b5 +Author: Paolo Bacchilega +Date: 2012-02-19 + + work queues: added keyboard accelerators to view the queues + + Ctrl+n to view the queue n with n in 1,2,3 + +M extensions/work_queues/actions.c +M extensions/work_queues/actions.h +M extensions/work_queues/callbacks.c +M extensions/work_queues/callbacks.h +M extensions/work_queues/main.c + +commit 08b7d04ce1e3922ad980f2a4809003512d9657b8 +Author: Matej Urbančič +Date: 2012-02-17 + + Updated Slovenian translation + +M po/sl.po + +commit 1fc0902f8f76b64080840171a9251ba918397218 +Author: Paolo Bacchilega +Date: 2012-02-15 + + catalog: fixed the scheme name + +M extensions/catalogs/gth-file-source-catalogs.c + +commit 170c0a2c9ff31cd64f42a485edb8ec74551e4e03 +Author: Paolo Bacchilega +Date: 2012-02-15 + + use gth_file_source_read_metadata instead of + gth_file_source_read_attributes to read the location metadata + + gth_file_source_read_metadata works for GthFileSourceWorkQueues + as well + +M gthumb/gth-browser.c + +commit 15ff06824915e1167f19f7a4836474e5a7e67d34 +Author: Paolo Bacchilega +Date: 2012-02-15 + + added work queues extension as a more powerful way to select files + + [new feature] + +M configure.ac +M extensions/Makefile.am +A extensions/work_queues/Makefile.am +A extensions/work_queues/actions.c +A extensions/work_queues/actions.h +A extensions/work_queues/callbacks.c +A extensions/work_queues/callbacks.h +A extensions/work_queues/gth-file-source-work-queues.c +A extensions/work_queues/gth-file-source-work-queues.h +A extensions/work_queues/gth-queue-manager.c +A extensions/work_queues/gth-queue-manager.h +A extensions/work_queues/main.c +A extensions/work_queues/work_queues.extension.in.in +M gthumb/gth-main.c + +commit 9aaf6112daf720a5aa99b95c61ef4b4bf92225e0 +Author: Paolo Bacchilega +Date: 2012-02-15 + + configure: removed info on libunique, which is not used anymore + +M configure.ac + +commit 27355db408e9fdd2e01cdd043a9b837bffac33da +Author: Daniel Nylander +Date: 2012-02-14 + + Updated Swedish translation + +M po/sv.po + +commit 020a0fa0fbd9e9039a1e7ad4ad1255aabffc3005 +Author: Bruno Brouard +Date: 2012-02-12 + + Updated French doc translation + +M help/fr/fr.po + +commit 9a3c65e7fa0e3aba1845264d803cece40a13ee4f +Author: Paolo Bacchilega +Date: 2012-02-12 + + updated for version 2.90.1 + +M NEWS +M configure.ac + +commit c12333e73d05c05961c3c77dca69ddfe2b95343e +Author: Paolo Bacchilega +Date: 2012-02-11 + + tweaks to the catalog icon + +M data/icons/hicolor/16x16/actions/file-catalog.png +M data/icons/hicolor/16x16/actions/file-library.png +M data/icons/hicolor/16x16/actions/file-search.png +M data/icons/hicolor/48x48/actions/file-catalog.png +M data/icons/hicolor/48x48/actions/file-library.png +M data/icons/hicolor/48x48/actions/file-search.png +M data/icons/hicolor/scalable/actions/file-catalog.svg +M data/icons/hicolor/scalable/actions/file-library.svg +M data/icons/hicolor/scalable/actions/file-search.svg + +commit c45d914b65a26789f01e4f08de7ee5697846af60 +Author: Daniel Mustieles +Date: 2012-02-09 + + Updated Spanish translation + +M po/es.po + +commit 507b7174efebb25f305b4bddaaa27815bf8edaa7 +Author: Paolo Bacchilega +Date: 2012-02-07 + + fixed drag and drop with the middle mouse button + +M gthumb/gth-browser.c +M gthumb/gth-grid-view.c + +commit 0ae766dfbf70c6c296bd7ae68e437201374b662b +Author: Paolo Bacchilega +Date: 2012-02-05 + + do not show duplicate entries in the sidebar and bookmarks menu + + [bug #669367] + +M gthumb/gth-file-source-vfs.c + +commit 25ef65868d3749abd23c2b1afdaff0105780f658 +Author: Paolo Bacchilega +Date: 2012-01-31 + + grid view: usa a lower page increment to have a smoother scrolling + +M gthumb/gth-grid-view.c + +commit 5e51111691b440311bffb5b03157a5c013ab08da +Author: Paolo Bacchilega +Date: 2012-01-31 + + grid view: put the caption always at the same height + + it was a little bit higher for video thumbnails + +M gthumb/gth-grid-view.c + +commit e86e059c505e113553e569e3dc6aee0881a2ea1c +Author: Paolo Bacchilega +Date: 2012-01-30 + + grid view: do not show items before the relayout + +M gthumb/gth-grid-view.c + +commit c50dfe4a94fa64a28efd3f5301252e230fce28ba +Author: Paolo Bacchilega +Date: 2012-01-30 + + Revert "fixed painting of the grid view when selecting with the mouse" + + This reverts commit d9fd3e83be31f16d8cfaca6fae7aca686a9cb426. + It looks like the bug is somewhere else, this is not the right + way to fix it. + +M gthumb/gth-grid-view.c + +commit d9fd3e83be31f16d8cfaca6fae7aca686a9cb426 +Author: Paolo Bacchilega +Date: 2012-01-30 + + fixed painting of the grid view when selecting with the mouse + + repaint all the items above the selection + +M gthumb/gth-grid-view.c + +commit 3df5db3ea05301d08ecbdce84226c4bfdf7a9990 +Author: Paolo Bacchilega +Date: 2012-01-30 + + include for setw and setfill + + as suggested by Mickaël Giroud + + [bug #668947] + +M extensions/exiv2_tools/exiv2-utils.cpp + +commit 615e8da4669a98e11da9677ab352959e1f8da047 +Author: Paolo Bacchilega +Date: 2012-01-29 + + use a constant to define the rubberband border width + +M gthumb/gth-grid-view.c + +commit 53f305d9024561325dbd57fd5b96e0adabad9e56 +Author: Paolo Bacchilega +Date: 2012-01-29 + + remove wrong optimization of the rounded box + +M gthumb/cairo-utils.c + +commit 68c8ab03100b6693f6891f5b9b6ccbdc53beb127 +Author: Paolo Bacchilega +Date: 2012-01-29 + + metadata dialog: keep the inconsinstent tags if only_modified_fields + is active + + this is the same behaiour of the edit tags dialog. + +M extensions/edit_metadata/Makefile.am +M extensions/edit_metadata/gth-edit-general-page.c +M extensions/edit_metadata/gth-edit-tags-dialog.c +A extensions/edit_metadata/utils.c +A extensions/edit_metadata/utils.h +M gthumb/gth-string-list.c +M gthumb/gth-string-list.h + +commit 1a17a63ce17452d65050e406bb2e9c2cd17339a9 +Author: Paolo Bacchilega +Date: 2012-01-29 + + edit_metadata: added some comments to make the code clearer + +M extensions/edit_metadata/gth-edit-general-page.c + +commit acc1e402fe0be95d41805e3b9cf1034c251fc0df +Author: xcsnake@free.fr +Date: 2012-01-28 + + added zlib in PKG_CHECK_MODULES for GTHUMB + +M configure.ac + +commit b1913758a5916c4b8019f4d0b0d994d02160c888 +Author: Paolo Bacchilega +Date: 2012-01-27 + + call gth_image_viewer_page_file_loaded if image is NULL + + in order to give feedback to the GthBrowser object that the file + was not loaded successfully. + +M extensions/image_viewer/gth-image-viewer-page.c + +commit 9f7422a4515c1c3450ef14cf1cfef9b07a102cac +Author: Greg Mansfield +Date: 2012-01-27 + + Opening corrupt Olympus raw file causes Segmentation fault. + +M extensions/image_viewer/gth-image-viewer-page.c + +commit a2bd99167b284a24d9e32fabf6609e9904bd1d77 +Author: Paolo Bacchilega +Date: 2012-01-26 + + Quitting slideshow sometimes causes Segmentation fault + + Based on a Greg Mansfield's patch + + [bug #668672] + +M gthumb/gth-image-preloader.c + +commit 4baf526fedf14ce6cab8f2353c1100ea8a8c2698 +Author: Greg Mansfield +Date: 2012-01-25 + + Replace deprecated g_format_size_for_display + +M extensions/facebook/dlg-export-to-facebook.c +M extensions/find_duplicates/gth-find-duplicates.c +M extensions/flicker_utils/dlg-export-to-flickr.c +M extensions/importer/gth-import-task.c +M extensions/photo_importer/dlg-photo-importer.c +M extensions/photobucket/dlg-export-to-photobucket.c +M extensions/picasaweb/dlg-export-to-picasaweb.c +M extensions/picasaweb/dlg-import-from-picasaweb.c +M extensions/webalbums/gth-web-exporter.c +M gthumb/gio-utils.c +M gthumb/gth-browser.c +M gthumb/gth-metadata-provider-file.c +M gthumb/gth-overwrite-dialog.c + +commit 05744db6124d66e57a943061664196ac1ba3378c +Author: Paolo Bacchilega +Date: 2012-01-22 + + fixed navigator for svg images + + use the original size, instead of the surface size + +M gthumb/gth-image-navigator.c + +commit 0d12cb85290e57f476ee4197a871c7d705d0f8bc +Author: Paolo Bacchilega +Date: 2012-01-22 + + High quality zoom for SVG images + + requires librsvg + + [new feature, bug#628443] + +M configure.ac +M extensions/cairo_io/Makefile.am +A extensions/cairo_io/cairo-io-svg.c +C051 extensions/cairo_io/main.c extensions/cairo_io/cairo-io-svg.h +M extensions/cairo_io/main.c +M gthumb/gth-image-viewer.c +M gthumb/gth-image.c +M gthumb/gth-image.h + +commit c3efa03add575b728b7ac72325b24c635715c48a +Author: Gianvito Cavasoli +Date: 2012-01-20 + + [l1on] Updated Italian translation + +M po/it.po + +commit 79c09902b6353a0a1b0a9b6a09afc3f3db60a574 +Author: Paolo Bacchilega +Date: 2012-01-19 + + fixed crash + + no need to set viewer_sidebar_pane and thumbnail_list when + changing the thumbnail list orientation. + +M gthumb/gth-browser.c + +commit 0617708024692f80d873b1e204f8199475aecd44 +Author: Paolo Bacchilega +Date: 2012-01-19 + + fixed loading of an image from command line + + The browser mode was wrongly set when loading an image from command + line. + Fixed blocking the location_chooser 'changed' signal callback + when calling + gth_browser_update_extra_widget. Removed redundant call to + gth_location_chooser_set_current as the location is set in + gth_browser_update_extra_widget already. + +M gthumb/gth-browser.c + +commit b7eb503d09515c8b950284edda15a5bb2ffbc73f +Author: Christian Kirbach +Date: 2012-01-16 + + Updated German translation + +M po/de.po + +commit 4fd3fdaee62a1d30e507f802be7869f3f8e85cfe +Author: Paolo Bacchilega +Date: 2012-01-15 + + use a location chooser instead of a label for the current location + + bring back the location chooser but instead of placing it above + the folder list, put it in place of the location label above the + file list. + +M extensions/search/gth-search-editor.c +M gthumb/gedit-message-area.c +M gthumb/gth-browser.c +M gthumb/gth-embedded-dialog.c +M gthumb/gth-embedded-dialog.h +M gthumb/gth-location-chooser.c +M gthumb/gth-location-chooser.h + +commit 3d4c3bda923dedb33e964a3e705cf5a1cc206da3 +Author: Paolo Bacchilega +Date: 2012-01-15 + + sync the rating value with Xmp.xmp.Rating metadata + + as suggested in comment #4 of bug #480001 + +M extensions/exiv2_tools/exiv2-utils.cpp +M extensions/exiv2_tools/exiv2-utils.h +M extensions/exiv2_tools/gth-metadata-provider-exiv2.c +M extensions/exiv2_tools/main.c + +commit c85991c3bc0677920d6fb49a3dcd26e81eaa4b77 +Author: Paolo Bacchilega +Date: 2012-01-15 + + memory leak in image tool extension's Adjust Colors + + [bug #667931] + +M extensions/file_tools/gth-file-tool-adjust-colors.c + +commit afa3c97718233c0cc05e3ffa8d965638b6a70f2a +Author: Paolo Bacchilega +Date: 2012-01-15 + + file store: remove the quadratic complexity from update_visibility + + use a hash table to find the position of a file instead of scanning + an array, as suggested by Ibragimov Rinat. + +M gthumb/gth-file-store.c + +commit 55e1b22696fafe59647ca1a8f51ee9f3a9a20963 +Author: Jiro Matsuzawa +Date: 2012-01-11 + + Updated Japanese translation + +M po/ja.po + +commit fed832dff94ec69f0e4f0e6a50d6581da7167491 +Author: Paolo Bacchilega +Date: 2012-01-08 + + allow to shrink the sidebar + + use set_position instead of set_size_request to allow the user + to shrink the sidebar. + +M gthumb/gth-browser.c + +commit 8ab2fc0a85fda1ae6a8dce51435c5c74a419d9cf +Author: Paolo Bacchilega +Date: 2012-01-08 + + histogram view: set the vexpand flag to false for in the info + +M gthumb/gth-histogram-view.c + +commit 1249194b36f82004c134c8e6d0ac8a8c076a7b2d +Author: Paolo Bacchilega +Date: 2012-01-08 + + use a GtkBox instead of the deprecated GtkVBox + +M extensions/image_viewer/gth-image-histogram.c +M extensions/image_viewer/gth-image-histogram.h +M gthumb/gth-histogram-view.c +M gthumb/gth-histogram-view.h + +commit 7588c1027fb43b6931aac80089fe993c4362f864 +Author: Paolo Bacchilega +Date: 2012-01-08 + + histogram info: ellipsize the labels if they are longer then 12 + characters + + ...or the whole sidebar gets too wide. + +M data/ui/histogram-info.ui + +commit 5d4e5ce51c841ef6b4b62742f8955f56b0ed240f +Author: Paolo Bacchilega +Date: 2012-01-08 + + change_date: fixed gsettings keys definition + + [bug #667251] + +M data/gthumb.convert +M data/org.gnome.gthumb.change-date.gschema.xml.in + +commit 3161807177003d3f82eeed4d6914eba7ccb171f2 +Author: Yuri Myasoedov +Date: 2012-01-05 + + Updated Russian translation + +M po/ru.po + +commit 7c18e7bf9c41179ef10187ca2f04339924446b7b +Author: Paolo Bacchilega +Date: 2012-01-02 + + make the 'save as' dialog modal + +M extensions/image_viewer/gth-image-viewer-page.c + +commit 966719cdf426e5b4ec908296dc61a2b1a226c4bc +Author: Paolo Bacchilega +Date: 2012-01-02 + + made the code more readable using adding a file_to_save attribute + +M extensions/image_viewer/gth-image-viewer-page.c + +commit 8dba4f53194ee662f4d1538e9584fd3e01565d3b +Author: Paolo Bacchilega +Date: 2012-01-02 + + save the application name in the Exif.Image.ProcessingSoftware tag + + the Exif.Image.Software contains the name and version of the + firmware of + the camera as described here: http://www.exiv2.org/tags.html + +M extensions/exiv2_tools/exiv2-utils.cpp + +commit b97e5c142207c4afa0544c85859bb90bb6afd2f8 +Author: Paolo Bacchilega +Date: 2012-01-02 + + save the Exif.Image.Software tag only if the content was modified + + as suggested by Greg Mansfield + +M extensions/exiv2_tools/exiv2-utils.cpp +M extensions/image_viewer/gth-image-viewer-page.c + +commit da244e7e7e597091a59a1508dbfc9c0ec1e52419 +Author: Paolo Bacchilega +Date: 2011-12-29 + + do not use the timezone variable when it's not defined + + pointed out by Pav Lucistnik + +M gthumb/glib-utils.c + +commit 350abe8516967881f16fabe32f0d87a6aaa096c9 +Author: Gianvito Cavasoli +Date: 2011-12-18 + + [l10n] Updated Italian translation + +M po/it.po + +commit 95c20d9150d0531243fbf73b2dc258ee829d8d19 +Author: Marek Černocký +Date: 2011-12-13 + + Updated Czech translation + +M po/cs.po + +commit 7653a60f01c7efbe9e9c5287d8e5214578d09b12 +Author: Paolo Bacchilega +Date: 2011-12-11 + + use a better error message when the catalog already exists + +M extensions/catalogs/gth-file-source-catalogs.c + +commit 96a3c6dae48da8147b01d075ca7fa7291e10bab0 +Author: Paolo Bacchilega +Date: 2011-12-11 + + do not allow to rename the catalog if the new name is already used + +M extensions/catalogs/gth-file-source-catalogs.c + +commit 2d72f2ffccea65461c871a5e6645b95f03a27164 +Author: Paolo Bacchilega +Date: 2011-12-11 + + fixed renaming of folders and catalogs + +M extensions/catalogs/callbacks.c +M extensions/catalogs/dlg-catalog-properties.c +M extensions/catalogs/gth-file-source-catalogs.c +M extensions/file_manager/callbacks.c +M gthumb/glib-utils.c +M gthumb/glib-utils.h +M gthumb/gth-browser.c +M gthumb/gth-file-source.c +M gthumb/gth-file-source.h +M gthumb/gth-folder-tree.c +M gthumb/gth-source-tree.c + +commit 4116d6b1a466610623e35a8c5d31ee8e71275d3c +Author: Matej Urbančič +Date: 2011-12-08 + + Updated Slovenian translation + +M po/sl.po + +commit e465dfa2fec15a8269ee87cff56b56c7392c355f +Author: Mario Blättermann +Date: 2011-12-08 + + [l10n] Updated German translation + +M po/de.po + +commit 85b93b73d6d7132f3fa8ad534fe56c442fd37505 +Author: Mario Blättermann +Date: 2011-12-08 + + [l10n] Updated German translation + +M po/de.po + +commit df52acc99979d790101233a8356c6a1092ccb30e +Author: Paolo Bacchilega +Date: 2011-12-08 + + grid view: added other keybindings + + Added select_all, unselect_all and activate_cursor_item. Renamed + set_cursro_selection as select_cursor_item and toggle_cursor_selection + as toggle_cursor_item. + +M gthumb/gth-grid-view.c +M gthumb/gth-grid-view.h + +commit bd825f15876f5ee983761ba0134fa7464910ece6 +Author: Paolo Bacchilega +Date: 2011-12-07 + + grid view: fixed focused item visibility on startup + + call the make_item_fully_visible function after the relayout + +M gthumb/gth-grid-view.c + +commit f946863688d74b5d1b6f6ddb661be72c2af60b4d +Author: Paolo Bacchilega +Date: 2011-12-07 + + queue the make_file_visible call to be sure it's called after setting + the model + +M gthumb/gth-browser.c +M gthumb/gth-file-list.c +M gthumb/gth-file-list.h + +commit 0acd98585911838bbb8055be8544f2b25445e2e5 +Author: Paolo Bacchilega +Date: 2011-12-06 + + moved some functions to avoid forward declarations + +M gthumb/gth-grid-view.c + +commit ec81acd0ee60269efde3dc5e3767ba27be526413 +Author: Daniel Mustieles +Date: 2011-12-06 + + Updated Spanish translation + +M po/es.po + +commit bd6e6911ee05bf58c18f6946512947b4ce472f2c +Author: Piotr Drąg +Date: 2011-12-05 + + Updated POTFILES.in + +M po/POTFILES.in + +commit 29930dd001a3147c600683cfc6ef9e0f62e5526c +Author: Paolo Bacchilega +Date: 2011-12-05 + + add the inconsistent tags to the suggested list + +M gthumb/gth-tags-entry.c + +commit ee86a9bd8b46e9293c31a95af44d50c20ced4dfa +Author: Paolo Bacchilega +Date: 2011-12-05 + + allow to specify a null list + +M gthumb/gth-string-list.c + +commit fe6cc08f1fcc719c9d63c978cf5063018f94f552 +Author: Paolo Bacchilega +Date: 2011-12-05 + + grid view: update the selection after inserting or deleting a row + +M gthumb/gth-grid-view.c + +commit e96eafea0fb47bc4c4e93c332ed1e22e82132c8c +Author: Paolo Bacchilega +Date: 2011-12-05 + + file sotre: declare booleans as bit fields to save some space + +M gthumb/gth-file-store.c + +commit 2067d9c6c51cc1ed288a947d939a9a5d06f1143a +Author: Paolo Bacchilega +Date: 2011-12-04 + + allow to keep the comment and tags dialogs open after saving + + [new feature] + +M extensions/edit_metadata/Makefile.am +M extensions/edit_metadata/actions.c +M extensions/edit_metadata/actions.h +M extensions/edit_metadata/callbacks.c +M extensions/edit_metadata/callbacks.h +M extensions/edit_metadata/data/ui/tag-chooser.ui +M extensions/edit_metadata/dlg-edit-metadata.c +M extensions/edit_metadata/dlg-edit-metadata.h +C052 extensions/edit_metadata/gth-edit-metadata-dialog.c +extensions/edit_metadata/gth-edit-comment-dialog.c +A extensions/edit_metadata/gth-edit-comment-dialog.h +D extensions/edit_metadata/gth-edit-comment-page.h +R085 extensions/edit_metadata/gth-edit-comment-page.c +extensions/edit_metadata/gth-edit-general-page.c +A extensions/edit_metadata/gth-edit-general-page.h +M extensions/edit_metadata/gth-edit-metadata-dialog.c +M extensions/edit_metadata/gth-edit-metadata-dialog.h +A extensions/edit_metadata/gth-edit-tags-dialog.c +A extensions/edit_metadata/gth-edit-tags-dialog.h +D extensions/edit_metadata/gth-tag-chooser-dialog.c +D extensions/edit_metadata/gth-tag-chooser-dialog.h +M extensions/edit_metadata/main.c +M extensions/exiv2_tools/Makefile.am +D extensions/exiv2_tools/gth-edit-exiv2-page.h +R080 extensions/exiv2_tools/gth-edit-exiv2-page.c +extensions/exiv2_tools/gth-edit-iptc-page.c +A extensions/exiv2_tools/gth-edit-iptc-page.h +M extensions/exiv2_tools/main.c +M gthumb/dlg-preferences-extensions.c +M gthumb/gth-browser-actions-callbacks.h +M gthumb/gth-tags-entry.c +M gthumb/gth-tags-entry.h + +commit 86698359c8519fc666ff27d6adef1176ea3d99c0 +Author: Paolo Bacchilega +Date: 2011-11-29 + + hooks: fixed crash when the first argument is a NULL pointer + +M gthumb/gth-hook.c + +commit a3fdc4321bb10ed0684b7e1cd11366135e35b187 +Author: Paolo Bacchilega +Date: 2011-11-26 + + webalbums: changed the HTML headers + + *) use XHTML 1.0 instead of 1.1 as it seems to be better supported + by the + browsers + *) removed the xml header because it prevents some browsers to display + the page correctly. + +M extensions/webalbums/data/albumthemes/Classic/image.gthtml +M extensions/webalbums/data/albumthemes/Classic/index.gthtml +M extensions/webalbums/data/albumthemes/ClassicClips/image.gthtml +M extensions/webalbums/data/albumthemes/ClassicClips/index.gthtml +M extensions/webalbums/data/albumthemes/NeatRound/image.gthtml +M extensions/webalbums/data/albumthemes/NeatRound/index.gthtml +M extensions/webalbums/data/albumthemes/Wiki/image.gthtml +M extensions/webalbums/data/albumthemes/Wiki/index.gthtml + +commit bbded358eead173cb57db0db3d7d398bf984e27e +Author: Paolo Bacchilega +Date: 2011-11-25 + + edit metadata: allow to save the metadata without closing the dialog + + [new feature] + +M extensions/edit_metadata/actions.c +M extensions/edit_metadata/dlg-edit-metadata.c +M extensions/edit_metadata/dlg-edit-metadata.h +M extensions/edit_metadata/gth-edit-comment-page.c +M extensions/edit_metadata/gth-edit-metadata-dialog.c +M gthumb/gth-file-data.c + +commit 4c887bc0d507a282974290d6c70a505a8bc71fa5 +Author: Paolo Bacchilega +Date: 2011-11-25 + + don't set the cursor automatically when focused + + this avoids an automatic scrolling to the focused item when selecting + with + the mouse. + +M gthumb/gth-grid-view.c + +commit 7f635eb8570049243e55332c1bdb12d9c624f4e9 +Author: Paolo Bacchilega +Date: 2011-11-24 + + added the tag icon to the tag entry list + +M gthumb/gth-tags-entry.c + +commit c3ac4057fb469afbb3f773c3f02e775378822310 +Author: Paolo Bacchilega +Date: 2011-11-24 + + make the tag dialog resizable + +M extensions/edit_metadata/gth-tag-chooser-dialog.c + +commit 9228add0784c768bceac8ea79611df4b5c66a7fb +Author: Paolo Bacchilega +Date: 2011-11-24 + + grid view: keep the focused item fully visible + +M gthumb/gth-grid-view.c + +commit 215bfb19e64d05a98a646633c6029c7f2bf3aa02 +Author: Paolo Bacchilega +Date: 2011-11-24 + + removed unused variables + +M gthumb/gth-grid-view.c + +commit 2cfb43951bad12e389223b9e626c5b2e4af91d54 +Author: Daniel Mustieles +Date: 2011-12-05 + + Updated Spanish translation + +M po/es.po + +commit 5b37b7bd04f19492681e109013c73b4dd318ec17 +Author: Matej Urbančič +Date: 2011-11-25 + + Updated Slovenian translation + +M po/sl.po + +commit d0f2f5c8b74ccd1f21e1b40f0213a2016a5ebeaf +Author: Paolo Bacchilega +Date: 2011-11-24 + + image viewer: implemented the checked transparency + + the checked transparency was missing since the porting to cairo + +M gthumb/gth-image-viewer.c + +commit 67aca056f568085c9e0b00c7de4fb44fbe9e7c53 +Author: Paolo Bacchilega +Date: 2011-11-24 + + reuse the GSettings object when writing metadata with exiv2 + + added a GSettings object to the private data to avoid to create + and destroy a GSettings object for each call to + gth_metadata_provider_exiv2_write + +M extensions/exiv2_tools/gth-metadata-provider-exiv2.c +M extensions/exiv2_tools/gth-metadata-provider-exiv2.h + +commit 313d7671be0374df9fd07642a2fed54d42bc6dc7 +Author: Marek Černocký +Date: 2011-11-24 + + Updated Czech translation + +M po/cs.po + +commit aba91ec75ea371e12304c7ad26cb272beb1f5f9c +Author: Paolo Bacchilega +Date: 2011-11-24 + + updated POTFILES.in and added the istructions on how to update it + +M po/POTFILES.in +M po/update-potfiles.sh + +commit 57ff462dddc462534c14860ab25907cb7aca4de7 +Author: Paolo Bacchilega +Date: 2011-11-24 + + fixed a perfomance regression due to the GSettings porting + + pass the whole file list to the 'read-metadata-ready' hook callbacks + to avoid to create and destroy a GSettings object for each file. + +M extensions/comments/main.c +M gthumb/gth-file-list.c +M gthumb/gth-file-source-vfs.c +M gthumb/gth-grid-view.c +M gthumb/gth-main-default-hooks.c +M gthumb/gth-metadata-provider.c + +commit 854dd9d511e1795c7902e0b453ae9a59b30c7c58 +Author: Piotr Drąg +Date: 2011-11-23 + + Updated POTFILES.in + +M po/POTFILES.in + +commit 61abc908742959237937275766764d1544539325 +Author: Paolo Bacchilega +Date: 2011-11-23 + + create a new window when the user select 'new window' from the + GNOME Shell + +M gthumb/main.c + +commit 8be4b130bfea3eb72e67e20b4fb862a3d52fe38a +Merge: 8b8142b c758a48 +Author: Paolo Bacchilega +Date: 2011-11-23 + + Merge branch 'reuse-active-window' + +commit 8b8142bff203da5eb9da0cd9461d595028e8460c +Merge: 5717e7a d0b2ca8 +Author: Paolo Bacchilega +Date: 2011-11-23 + + Merge branch 'grid-view' + +commit d0b2ca8806e31f1460ccee03e2903f0da84137de +Author: Paolo Bacchilega +Date: 2011-11-23 + + expand horizontally the tag chooser + +M extensions/edit_metadata/gth-edit-comment-page.c + +commit c758a48f41635fd8246f419cd3518a37a0a70a55 +Author: Paolo Bacchilega +Date: 2011-11-23 + + added 'resue active window' option + + Added option to reuse the active window when opening files from an + external application. + + [new feature] + +M data/org.gnome.gthumb.gschema.xml.in +M data/ui/preferences.ui +M gthumb/dlg-preferences.c +M gthumb/gth-file-list.c +M gthumb/gth-preferences.h +M gthumb/main.c + +commit 1de1388852e0398a917ce3f706581383b1005186 +Author: Paolo Bacchilega +Date: 2011-11-23 + + do not try to initialize clutter and other libraries more then once + +M gthumb/main.c + +commit c4e7c82c28ce7e27a75f6751fe86727b8ff91c42 +Author: Paolo Bacchilega +Date: 2011-11-22 + + check if caption_layout is null before using it + +M gthumb/gth-grid-view.c + +commit 62dd79401f79e95cb019c62912bc3e33af292f83 +Author: Paolo Bacchilega +Date: 2011-11-22 + + Fixed unref of the settings + +M gthumb/gth-browser.c + +commit 63245df5f845e0f7e053e56dbfe70fb55ee26b0d +Author: Paolo Bacchilega +Date: 2011-11-22 + + fixed video thumbnails when the size is not 128 + + scale the film holes if needed + +M gthumb/gth-grid-view.c + +commit d9ebc5fa137db27e9405f499cee5e81711fd79bd +Author: Paolo Bacchilega +Date: 2011-11-22 + + removed useless function + +M gthumb/gth-grid-view.c + +commit 7fc598fd31ac113fe322ec153c40281539f11156 +Author: Paolo Bacchilega +Date: 2011-11-22 + + fixed the size of the vertical sidebar + +M gthumb/gth-file-list.c + +commit d4fc484c499ae0991060c42d9d8d7013244afc0c +Author: Paolo Bacchilega +Date: 2011-11-22 + + misc changes to the grid view + + cache the is_video, is_image values for items; + set the thumbnail_area in update_item_size; + change the thumbnail_area after receiving the thumbnail_changed + signal. + +M gthumb/gth-grid-view.c + +commit 32dc4c9e7cd9fcc40454fa42390fc5b4ccc462f7 +Author: Paolo Bacchilega +Date: 2011-11-22 + + added a drop shadow effect to the video thumbnail as well + +M gthumb/gth-grid-view.c + +commit a91b0c0ffdd97e2df7637c103d6c95b68e0d05da +Author: Paolo Bacchilega +Date: 2011-11-22 + + grid view: fixed update of the caption area height + +M gthumb/gth-grid-view.c + +commit 4d217b310479b3e3a6a05ca784714cfbec0d1879 +Author: Paolo Bacchilega +Date: 2011-11-22 + + file store: removed the 'checked' property as it is unused + +M gthumb/gth-file-list.c +M gthumb/gth-file-store.c +M gthumb/gth-file-store.h + +commit bfc90bdd531eea39f8568da40351b18589c2e247 +Author: Paolo Bacchilega +Date: 2011-11-22 + + Added GthGridView, a custom widget to display the thumbnail list + + This new widget simplifies the code, improves the performance + and allows + more personalization of the thumbnail list. + +M data/Makefile.am +A data/filmholes.png +M extensions/catalogs/gth-organize-task.c +M extensions/facebook/dlg-export-to-facebook.c +M extensions/find_duplicates/gth-find-duplicates.c +M extensions/flicker_utils/dlg-export-to-flickr.c +M extensions/flicker_utils/dlg-import-from-flickr.c +M extensions/photo_importer/dlg-photo-importer.c +M extensions/photobucket/dlg-export-to-photobucket.c +M extensions/picasaweb/dlg-export-to-picasaweb.c +M extensions/picasaweb/dlg-import-from-picasaweb.c +M gthumb/Makefile.am +M gthumb/cairo-utils.c +M gthumb/cairo-utils.h +M gthumb/gth-browser-actions-entries.h +M gthumb/gth-browser.c +D gthumb/gth-cell-renderer-caption.c +D gthumb/gth-cell-renderer-caption.h +D gthumb/gth-cell-renderer-thumbnail.c +D gthumb/gth-cell-renderer-thumbnail.h +M gthumb/gth-file-list.c +M gthumb/gth-file-list.h +M gthumb/gth-file-store.c +M gthumb/gth-file-store.h +M gthumb/gth-file-view.c +M gthumb/gth-file-view.h +A gthumb/gth-grid-view.c +A gthumb/gth-grid-view.h +D gthumb/gth-icon-view.c +D gthumb/gth-icon-view.h +D gthumb/gth-list-view.c +D gthumb/gth-list-view.h +M gthumb/gth-marshal.list + +commit 5717e7af2a7854cec09103ab5a8e39c4a82a449e +Author: Marek Černocký +Date: 2011-11-21 + + Updated Czech translation + +M po/cs.po + +commit afeaaf6bc625fb65d1c6003359ef06a38dfac048 +Author: Jorge González +Date: 2011-11-20 + + Updated Spanish translation + +M po/es.po + +commit 17f4f3ec5ce88505286e291eb8a410f9209fff79 +Author: Greg Mansfield +Date: 2011-11-19 + + suppress the warning messages when reading image matadata with exiv2 + +M extensions/exiv2_tools/exiv2-utils.cpp + +commit 9399f26decd8bdd32d0e7c4c61621812b40a78ae +Author: Mario Blättermann +Date: 2011-11-18 + + [l10n] Updated German translation + +M po/de.po + +commit 296a1b97e0a2c307efac1b50195d19fbdab67fa6 +Author: Piotr Drąg +Date: 2011-11-17 + + Updated Polish translation + +M po/pl.po + +commit 13f41c38d4bb8ec6deb5bf5f25da69c3faed8198 +Author: Paolo Bacchilega +Date: 2011-11-17 + + removed the viewport because the empty list must not be scrollable + +M gthumb/gth-file-list.c + +commit 5ca99b2f51cbe85ba91161c40c5e9c99887a3b0b +Author: Paolo Bacchilega +Date: 2011-11-17 + + fixed function name + +M gthumb/gth-file-list.c + +commit 971e4ee30d1e5e35bb827c274c9a1599044861cb +Author: Paolo Bacchilega +Date: 2011-11-17 + + empty list: set has_window to TRUE + +M gthumb/gth-empty-list.c + +commit f4bdc3bb3299f5c234c0f3f9b2b04edb477530da +Author: Paolo Bacchilega +Date: 2011-11-17 + + image viewer: fixed zoom in/out with control+mouse wheel + +M gthumb/gth-image-viewer.c + +commit ad3b03ccce1c8ad623532399936793c6553efea0 +Author: Paolo Bacchilega +Date: 2011-11-17 + + DumbNotebook: changed the forall implementation to simplify the + remove function + +M gthumb/gth-dumb-notebook.c + +commit 489bacbc0e027c813fb6d66b07ea8dbef866fc55 +Author: Jiro Matsuzawa +Date: 2011-11-17 + + Updated Japanese translation + +M po/ja.po + +commit 77a0691418f53004cc4edafc436719190f6e5658 +Author: Paolo Bacchilega +Date: 2011-11-16 + + removed the location chooser from the main window + + it brings no additional functionality + +M gthumb/gth-browser.c + +commit afabd8201c9f68ca605a75c40d07defdba0f9418 +Author: Paolo Bacchilega +Date: 2011-11-16 + + fixed crash when destroying the widget + +M gthumb/gth-dumb-notebook.c + +commit ac41e2f09e3da1aaec198fc56e81345849ce6e3c +Author: Paolo Bacchilega +Date: 2011-11-16 + + dumb-notebook: implemented the remove virtual function, simplified + the code + +M gthumb/gth-dumb-notebook.c + +commit 380ba98431ea4ac9e8b0c2768262dd7cc806f3ab +Author: Paolo Bacchilega +Date: 2011-11-16 + + do not allow to focus the empty list + +M gthumb/gth-empty-list.c + +commit d3f3cd882320c346349731f9da74ab6d889ad971 +Author: Paolo Bacchilega +Date: 2011-11-16 + + removed the second GdkWindow because it's useless + +M gthumb/gth-empty-list.c + +commit ecc383ae7b0e4d7c0059d96a37f4f65b09740bc5 +Author: Paolo Bacchilega +Date: 2011-11-16 + + use a different margin for the properties combobox when it's on the + right side + + use the same margin of the location chooser. + +M gthumb/gth-browser.c +M gthumb/gth-multipage.c + +commit 10db5ddfa77151dbeea2984cb85e7fe9782f132a +Author: Paolo Bacchilega +Date: 2011-11-16 + + Fixed run-time warning when a child is null + +M gthumb/gth-auto-paned.c + +commit 29d6b16da02d7a44a7245cf617f04dfc82b70fb6 +Author: Paolo Bacchilega +Date: 2011-11-16 + + Allow to change the position of the file properties in browser mode + + Allow to set the file properties on the right side or below the + folder list when + in browser mode. + + [new feature] + +M data/org.gnome.gthumb.gschema.xml.in +M data/ui/preferences.ui +M gthumb/dlg-preferences.c +M gthumb/gth-browser.c +M gthumb/gth-preferences.h + +commit a444117c683704272cd598cf5e31f6619b73a0b5 +Author: Paolo Bacchilega +Date: 2011-11-15 + + removed use of gtk_hscale_new + +M gthumb/gtk-utils.c + +commit 477673277a13a4de44da5510c26bab0ef0731dfc +Author: Paolo Bacchilega +Date: 2011-11-15 + + removed a useless local code block + +M gthumb/gth-browser.c + +commit eec516c4d6ea154254cb95dae10d0a8285c018db +Author: Paolo Bacchilega +Date: 2011-11-15 + + use a specific name for the import .desktop file + +M data/gthumb-import.desktop.in.in + +commit a2e145a569e433e4f01ff405f0316ea8b88a718a +Author: Paolo Bacchilega +Date: 2011-11-15 + + show the content only after calling the set_current_page function + +M gthumb/gth-window.c + +commit a6b178b697f8a998020ce66c2039fa99ada835b7 +Author: Paolo Bacchilega +Date: 2011-11-15 + + simplified the code adding a GthAutoPaned widget + + ...that automatically set the position to half of its allocated size. + +M gthumb/Makefile.am +A gthumb/gth-auto-paned.c +A gthumb/gth-auto-paned.h +M gthumb/gth-browser.c + +commit c0ac4ba39bb4b177fa5c1c0a0159a5959324ee8a +Author: OKANO Takayoshi +Date: 2011-11-17 + + Updated Japanese translation + +M po/ja.po + +commit 2d7102183ed43d84d2fdffc58f3063d10edd51ac +Author: Paolo Bacchilega +Date: 2011-11-14 + + fixed crash when exiting from the crop tool + +M extensions/file_tools/gth-file-tool-crop.c + +commit 4ec09cf1eea68974fa8293b0726a65b445b0a030 +Author: Paolo Bacchilega +Date: 2011-11-14 + + fixed some GSettings key names + +M extensions/contact_sheet/preferences.h +M extensions/convert_format/preferences.h + +commit 4c92ef8fa263eb67c6efd18cc90de0a8abfc9f5d +Author: Daniel Mustieles +Date: 2011-11-14 + + Updated Spanish translation + +M po/es.po + +commit 41e9257ed15f540b7ea37a12e877c16fea0d3bbb +Author: Paolo Bacchilega +Date: 2011-11-14 + + Fixed crash when changing the image viewer settings + +M extensions/image_viewer/gth-image-viewer-page.c + +commit 8719f88e3b064f63b86a846e13bc329856ab7bb3 +Author: Paolo Bacchilega +Date: 2011-11-14 + + use a smaller icon in the file list header + +M gthumb/gth-browser.c + +commit 76946a71e80abd64c6e3c5c9b45b52e08a48c011 +Author: Paolo Bacchilega +Date: 2011-11-13 + + Fixed a compiler warning: not enough variable arguments to fit a + sentinel [-Wformat] + +M gthumb/gtk-utils.c + +commit fad9c24eafe75ceaff62f693bb28361d4a0329a9 +Author: Paolo Bacchilega +Date: 2011-11-13 + + removed comment-height setting + + It is unused. + +M data/gthumb.convert +M data/org.gnome.gthumb.gschema.xml.in +M gthumb/gth-preferences.h + +commit 06699e0966f7e96ab92bd0dfb6204ad7983839f3 +Author: Paolo Bacchilega +Date: 2011-11-13 + + Fixed size of the comment view in the file properties + +M gthumb/gth-file-properties.c + +commit 58e8999f0c6814a6d02146c78d26f2d3b53293b3 +Author: Yuri Myasoedov +Date: 2011-11-13 + + Updated Russian translation + +M po/ru.po + +commit 18b090d69df974e4c79cdbecade3f19ae7daa056 +Author: Paolo Bacchilega +Date: 2011-11-13 + + completed the GConf convert file + +M data/gthumb.convert + +commit 749d9cf1f1c5177ece61d73340d9311e0bc083bd +Author: Paolo Bacchilega +Date: 2011-11-13 + + Fixed properties not updated after selecting a video or audio file + + ...and play the media instead of setting it to paused if the viewer + is visible + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit b658bd6b6f0fed51dbce57cf14678d265afb9576 +Author: Paolo Bacchilega +Date: 2011-11-13 + + fixed the extension description files in POTFILES.in + +M po/POTFILES.in +M po/update-potfiles.sh + +commit bc4305e354e74af7357f6b03eb3cd26275b4e8f1 +Author: Paolo Bacchilega +Date: 2011-11-13 + + added a GConf data convertion file + +A data/gthumb.convert + +commit 2d44922fd8ebfbd0d12048e387e26f0ae0311371 +Author: Paolo Bacchilega +Date: 2011-11-13 + + use a larger size for the default window size + +M gthumb/gth-browser.c + +commit dbe25a40d7f663f3107cf334e39fc9e5a3ca907b +Author: Paolo Bacchilega +Date: 2011-11-13 + + use gtk_container_propagate_draw to fix a critical error + +M gthumb/gth-dumb-notebook.c + +commit 8e8cbc8c26ca2c76c271afbcd2ef076d63579236 +Author: Paolo Bacchilega +Date: 2011-11-13 + + Use the PICTURES special dir as the default startup location + +M gthumb/gth-preferences.c + +commit 1d5493c179dd7a2953b103a92ab08d39b32d8cdf +Author: Paolo Bacchilega +Date: 2011-11-13 + + Fixed automatic creation of the Gsettings enumeration types + + set the GTH_METADATA_ALLOW_EVERYWHERE macro out of the enumeration + definition. + +M gthumb/gth-metadata.h + +commit 67c90aaa0e52ddb22bbe4e51cbbdb990cadf5466 +Author: Paolo Bacchilega +Date: 2011-11-13 + + updated POTFILES.in + +M po/POTFILES.in + +commit 31847509d904eb39e727e09d6e0de787d6ddaa53 +Author: Paolo Bacchilega +Date: 2011-11-13 + + added .gschema.xml.in to the translatable files + +M po/update-potfiles.sh + +commit 62634dbee5a3d83fe2839bea6027de3258e3f90f +Author: Paolo Bacchilega +Date: 2011-11-13 + + skip the jpeg_utils enumerations when creating the GSettings enum + types + +M extensions/jpeg_utils/transupp-62.h +M extensions/jpeg_utils/transupp-80.h + +commit c808b319834c4cff575fd0c736d3358994baa5a2 +Author: Paolo Bacchilega +Date: 2011-11-13 + + Converted the schemas to the GSettings format + +M configure.ac +M data/Makefile.am +D data/gthumb.schemas.in +A data/org.gnome.gthumb.change-date.gschema.xml.in +A data/org.gnome.gthumb.comments.gschema.xml.in +A data/org.gnome.gthumb.contact-sheet.gschema.xml.in +A data/org.gnome.gthumb.convert-format.gschema.xml.in +A data/org.gnome.gthumb.crop.gschema.xml.in +A data/org.gnome.gthumb.facebook.gschema.xml.in +A data/org.gnome.gthumb.file-manager.gschema.xml.in +A data/org.gnome.gthumb.gschema.xml.in +A data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in +A data/org.gnome.gthumb.image-print.gschema.xml.in +A data/org.gnome.gthumb.image-viewer.gschema.xml.in +A data/org.gnome.gthumb.importer.gschema.xml.in +A data/org.gnome.gthumb.photo-importer.gschema.xml.in +A data/org.gnome.gthumb.picasaweb.gschema.xml.in +A data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in +A data/org.gnome.gthumb.rename-series.gschema.xml.in +A data/org.gnome.gthumb.resize-images.gschema.xml.in +A data/org.gnome.gthumb.resize.gschema.xml.in +A data/org.gnome.gthumb.rotate.gschema.xml.in +A data/org.gnome.gthumb.slideshow.gschema.xml.in +A data/org.gnome.gthumb.webalbums.gschema.xml.in +M extensions/change_date/data/Makefile.am +D extensions/change_date/data/gthumb_change_date.schemas.in +M extensions/comments/data/Makefile.am +D extensions/comments/data/gthumb-comments.schemas.in +M extensions/contact_sheet/data/Makefile.am +D extensions/contact_sheet/data/gthumb_contact_sheet.schemas.in +M extensions/convert_format/data/Makefile.am +D extensions/convert_format/data/gthumb_convert_format.schemas.in +M extensions/facebook/data/Makefile.am +D extensions/facebook/data/gthumb-facebook.schemas.in +M extensions/file_manager/Makefile.am +D extensions/file_manager/data/Makefile.am +D extensions/file_manager/data/gthumb-file-manager.schemas.in +M extensions/file_tools/data/Makefile.am +D extensions/file_tools/data/gthumb_crop_options.schemas.in +D extensions/file_tools/data/gthumb_resize_options.schemas.in +D extensions/file_tools/data/gthumb_rotate_options.schemas.in +M extensions/gstreamer_tools/data/Makefile.am +D extensions/gstreamer_tools/data/gthumb-gstreamer.schemas.in +M extensions/image_print/data/Makefile.am +D extensions/image_print/data/gthumb_image_print.schemas.in +M extensions/image_viewer/data/Makefile.am +D extensions/image_viewer/data/gthumb-image-viewer.schemas.in +M extensions/importer/data/Makefile.am +D extensions/importer/data/gthumb-importer.schemas.in +M extensions/photo_importer/data/Makefile.am +D extensions/photo_importer/data/gthumb_photo_importer.schemas.in +M extensions/picasaweb/data/Makefile.am +D extensions/picasaweb/data/gthumb-picasaweb.schemas.in +M extensions/pixbuf_savers/data/Makefile.am +D extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in +M extensions/rename_series/data/Makefile.am +D extensions/rename_series/data/gthumb_rename_series.schemas.in +M extensions/resize_images/data/Makefile.am +D extensions/resize_images/data/gthumb_resize_images.schemas.in +M extensions/slideshow/data/Makefile.am +D extensions/slideshow/data/gthumb-slideshow.schemas.in +M extensions/webalbums/data/Makefile.am +D extensions/webalbums/data/gthumb_webalbums.schemas.in + +commit f56a7a6278b11412c22d40f7e9e4c5d8f628b0db +Author: Paolo Bacchilega +Date: 2011-11-13 + + Ported the extensions to GSettings + +M extensions/burn_disc/gth-burn-task.c +M extensions/catalogs/actions.c +M extensions/change_date/dlg-change-date.c +M extensions/change_date/preferences.h +M extensions/comments/dlg-comments-preferences.c +M extensions/comments/main.c +M extensions/comments/preferences.h +M extensions/contact_sheet/dlg-contact-sheet.c +M extensions/contact_sheet/dlg-image-wall.c +M extensions/contact_sheet/preferences.h +M extensions/convert_format/dlg-convert-format.c +M extensions/convert_format/preferences.h +M extensions/exiv2_tools/gth-metadata-provider-exiv2.c +M extensions/facebook/dlg-export-to-facebook.c +M extensions/facebook/preferences.h +M extensions/file_manager/actions.c +M extensions/file_manager/preferences.h +M extensions/file_tools/gth-file-tool-crop.c +M extensions/file_tools/gth-file-tool-resize.c +M extensions/file_tools/gth-file-tool-rotate.c +M extensions/file_tools/preferences.h +M extensions/find_duplicates/dlg-find-duplicates.c +M extensions/find_duplicates/gth-find-duplicates.c +M extensions/flicker_utils/dlg-import-from-flickr.c +M extensions/gstreamer_tools/actions.c +M extensions/gstreamer_tools/preferences.h +M extensions/image_print/gth-image-print-job.c +M extensions/image_print/preferences.c +M extensions/image_print/preferences.h +M extensions/image_rotation/gth-transform-task.c +M extensions/image_rotation/rotation-utils.c +M extensions/image_viewer/gth-image-viewer-page.c +M extensions/image_viewer/preferences.c +M extensions/image_viewer/preferences.h +M extensions/importer/gth-import-preferences-dialog.c +M extensions/importer/gth-import-task.c +M extensions/importer/preferences.h +M extensions/importer/utils.c +M extensions/photo_importer/callbacks.c +M extensions/photo_importer/dlg-photo-importer.c +M extensions/photo_importer/preferences.h +M extensions/picasaweb/dlg-import-from-picasaweb.c +M extensions/picasaweb/preferences.h +M extensions/pixbuf_savers/gth-jpeg-saver.c +M extensions/pixbuf_savers/gth-png-saver.c +M extensions/pixbuf_savers/gth-tga-saver.c +M extensions/pixbuf_savers/gth-tiff-saver.c +M extensions/pixbuf_savers/preferences.h +M extensions/rename_series/dlg-rename-series.c +M extensions/rename_series/preferences.h +M extensions/resize_images/dlg-resize-images.c +M extensions/resize_images/preferences.h +M extensions/search/gth-search-task.c +M extensions/slideshow/actions.c +M extensions/slideshow/callbacks.c +M extensions/slideshow/preferences.c +M extensions/slideshow/preferences.h +M extensions/webalbums/dlg-web-exporter.c +M extensions/webalbums/gth-web-exporter.c +M extensions/webalbums/preferences.h + +commit fdd2c09006eab56724ba85572b486eccb6479673 +Author: Paolo Bacchilega +Date: 2011-11-13 + + removed unused utility functions + +M gthumb/gtk-utils.c +M gthumb/gtk-utils.h + +commit 30da83595a5b81c0c466f5a6fff124fe03fa8710 +Author: Paolo Bacchilega +Date: 2011-11-13 + + removed unused macros + +M gthumb/typedefs.h + +commit 2eaad77cdc058b5ae768aae6a954a3d7ab38ab57 +Author: Paolo Bacchilega +Date: 2011-11-13 + + first batch of changes to port the core to GSettings + +M gthumb/Makefile.am +M gthumb/dlg-personalize-filters.c +M gthumb/dlg-preferences-extensions.c +M gthumb/dlg-preferences.c +M gthumb/gnome-desktop-thumbnail.c +M gthumb/gth-browser-actions-callbacks.c +M gthumb/gth-browser.c +M gthumb/gth-extensions.c +M gthumb/gth-extensions.h +M gthumb/gth-file-list.c +M gthumb/gth-file-source-vfs.c +M gthumb/gth-main.c +M gthumb/gth-preferences.c +M gthumb/gth-source-tree.c +M gthumb/main-migrate-catalogs.c +M gthumb/main.c + +commit 4d73975f85b624445cfaef49a1511c5f37ff98a1 +Author: Paolo Bacchilega +Date: 2011-11-13 + + define the GSettings schemas and keys + +M gthumb/gth-preferences.h + +commit 0b1db4383c7f0e13cf0cdec53a84c2dafe40cf6c +Author: Paolo Bacchilega +Date: 2011-11-13 + + added some GSettings utility functions + +M gthumb/glib-utils.c +M gthumb/glib-utils.h + +commit af611b4d94544e2d8c6cc1d3350447681f2d70da +Author: Paolo Bacchilega +Date: 2011-11-13 + + removed GConf configuration and utilities + +M configure.ac +D gthumb/gconf-utils.c +D gthumb/gconf-utils.h + +commit 60dadc6c4c3254a60a441504e31dcf4b647262ec +Author: Paolo Bacchilega +Date: 2011-11-13 + + only use code specific to GNOME 3.0 or higher + +M configure.ac +M extensions/desktop_background/actions.c +M gthumb/gnome-desktop-thumbnail.c + +commit 0a2852a10ecf56387418c57b4ca46482fe88b19e +Author: Paolo Bacchilega +Date: 2011-11-08 + + set a minimum height for the folder tree + + This avoids the possible folder tree disappearence when the main + window + is unmaximized. + + [bug #593392] + +M gthumb/gth-browser.c + +commit dbcfe13f35736235df538d7c48a6a80c1ad80ddb +Author: Paolo Bacchilega +Date: 2011-11-08 + + removed an unused preference + +M data/gthumb.schemas.in +M gthumb/gth-browser.c +M gthumb/gth-preferences.h + +commit 81c1236cf71332b33912f513a0df43dc7a2c0d84 +Author: Paolo Bacchilega +Date: 2011-11-08 + + make the properties pane visibility fixed, save and restore the + visibility + +M data/gthumb.schemas.in +M gthumb/gth-browser.c +M gthumb/gth-preferences.h +M gthumb/gth-window.c +M gthumb/gth-window.h + +commit 63c46a7539937d7dc435cfe9b990bff49324fa32 +Author: Paolo Bacchilega +Date: 2011-11-08 + + Fixed expand flag in the rotate options + +M extensions/file_tools/data/ui/rotate-options.ui + +commit fd914ac53a1586a28fbeea373c29a908dda756d2 +Author: Paolo Bacchilega +Date: 2011-11-08 + + use a smaller icon for the 'catalog properties' and 'update search' + buttons + +M extensions/catalogs/callbacks.c +M extensions/search/callbacks.c + +commit 2fd3bae66ed0967745f8d52cf288b7868d73055a +Author: Paolo Bacchilega +Date: 2011-11-08 + + removed useless call to gth_window_set_current_page + +M gthumb/gth-browser.c + +commit 8c70bf237896fb6a1cfbf9aa54e9b4c5afe013cf +Author: Paolo Bacchilega +Date: 2011-11-08 + + Show the slideshow preferences in the viewer tab to save some + horizontal space + +M extensions/image_viewer/preferences.c +M extensions/slideshow/callbacks.c +M extensions/slideshow/data/ui/slideshow-preferences.ui +M extensions/slideshow/preferences.c +M extensions/slideshow/slideshow.extension.in.in + +commit e1d5cb475b98bfeb159cc96ea75f430a0056b825 +Author: Paolo Bacchilega +Date: 2011-11-08 + + Show the Edit button in browser mode as well + +M extensions/image_viewer/gth-image-viewer-page.c +M gthumb/gth-browser-actions-callbacks.c +M gthumb/gth-browser-actions-entries.h +M gthumb/gth-browser-ui.h +M gthumb/gth-browser.c +M gthumb/gth-browser.h + +commit f1de44ac1ced432c196eaa8acea75142321de401 +Author: Paolo Bacchilega +Date: 2011-11-08 + + Fixed label alignment in the preferences dialog + +M extensions/image_print/data/ui/print-preferences.ui +M extensions/image_viewer/data/ui/image-viewer-preferences.ui + +commit f17b4c08da9ec4cd8b6931e1a084c06d84478027 +Author: Marek Černocký +Date: 2011-11-07 + + Updated Czech translation + +M po/cs.po + +commit ccb0bec8fda6e6c1d61f772e820758e6e42f0274 +Author: Paolo Bacchilega +Date: 2011-11-07 + + Fixed the expand flag in many dialogs + +M data/ui/filter-editor.ui +M data/ui/overwrite-dialog.ui +M data/ui/personalize-filters.ui +M data/ui/sort-order.ui +M extensions/catalogs/data/ui/add-to-catalog.ui +M extensions/catalogs/data/ui/catalog-properties.ui +M extensions/catalogs/data/ui/organize-files-task.ui +M extensions/catalogs/data/ui/organize-files.ui +M extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui +M extensions/contact_sheet/data/ui/contact-sheet.ui +M extensions/contact_sheet/data/ui/image-wall.ui +M extensions/convert_format/data/ui/convert-format.ui +M extensions/edit_metadata/data/ui/edit-comment-page.ui +M extensions/exiv2_tools/data/ui/edit-exiv2-page.ui +M extensions/facebook/data/ui/export-to-facebook.ui +M extensions/facebook/data/ui/facebook-account-chooser.ui +M extensions/facebook/data/ui/facebook-account-manager.ui +M extensions/facebook/data/ui/facebook-album-properties.ui +M extensions/facebook/data/ui/facebook-ask-authorization.ui +M extensions/facebook/data/ui/facebook-complete-authorization.ui +M extensions/facebook/data/ui/facebook-export-completed.ui +M extensions/find_duplicates/data/ui/find-duplicates-dialog.ui +M extensions/find_duplicates/data/ui/find-duplicates.ui +M extensions/flicker_utils/data/ui/export-to-flickr.ui +M extensions/flicker_utils/data/ui/flicker-account-chooser.ui +M extensions/flicker_utils/data/ui/flicker-account-manager.ui +M extensions/flicker_utils/data/ui/flicker-ask-authorization.ui +M extensions/flicker_utils/data/ui/flicker-complete-authorization.ui +M extensions/flicker_utils/data/ui/flicker-export-completed.ui +M extensions/flicker_utils/data/ui/import-from-flickr.ui +M extensions/gstreamer_tools/data/ui/save-screenshot.ui +M extensions/list_tools/data/ui/ask-value.ui +M extensions/list_tools/data/ui/personalize-scripts.ui +M extensions/list_tools/data/ui/script-editor.ui +M extensions/oauth/data/ui/oauth-account-chooser.ui +M extensions/oauth/data/ui/oauth-account-manager.ui +M extensions/oauth/data/ui/oauth-ask-authorization.ui +M extensions/oauth/data/ui/oauth-complete-authorization.ui +M extensions/photo_importer/data/ui/photo-importer.ui +M extensions/photobucket/data/ui/export-to-photobucket.ui +M extensions/photobucket/data/ui/photobucket-album-properties.ui +M extensions/photobucket/data/ui/photobucket-export-completed.ui +M extensions/picasaweb/data/ui/export-to-picasaweb.ui +M extensions/picasaweb/data/ui/import-from-picasaweb.ui +M extensions/picasaweb/data/ui/picasa-web-account-chooser.ui +M extensions/picasaweb/data/ui/picasa-web-account-manager.ui +M extensions/picasaweb/data/ui/picasa-web-account-properties.ui +M extensions/picasaweb/data/ui/picasa-web-album-properties.ui +M extensions/picasaweb/data/ui/picasa-web-export-completed.ui +M extensions/rename_series/data/ui/rename-series.ui +M extensions/slideshow/data/ui/slideshow-preferences.ui +M extensions/webalbums/data/ui/web-album-exporter.ui + +commit bd8a3a5d43ddbd54b49a929f39a436070b6707f0 +Author: Paolo Bacchilega +Date: 2011-11-07 + + Fixed export to Photobucket + + Use the correct ui files. + +M extensions/oauth/oauth-account-chooser-dialog.c +M extensions/oauth/oauth-account-manager-dialog.c +M extensions/oauth/oauth-authentication.c + +commit 7b54b67264abd11ed120addf4c721ca606723976 +Author: Paolo Bacchilega +Date: 2011-11-07 + + Fixed expand flag in the print layout properties + +M extensions/image_print/data/ui/print-layout.ui + +commit 815f88f55ffa711d2aaaf232529094daa526da1f +Author: Paolo Bacchilega +Date: 2011-11-07 + + Fixed expand flag in the IPTC fields page + +M extensions/exiv2_tools/data/ui/edit-exiv2-page.ui + +commit 1788137c6c5b2c78f0ba4896794441a3acf6cbdc +Author: Paolo Bacchilega +Date: 2011-11-07 + + image viewer: hide the horizontal scrollbar in fit_width mode + +M gthumb/gth-image-navigator.c +M gthumb/gth-image-viewer.c +M gthumb/gth-image-viewer.h + +commit 36da899da8ba0f844b39e131abf91c4556c0c3d7 +Author: Paolo Bacchilega +Date: 2011-11-06 + + use the correct function to get the original image size + +M extensions/image_viewer/gth-image-viewer-page.c + +commit 037ad94e14e9becd975bdcd07521fd78bd1411a5 +Author: Paolo Bacchilega +Date: 2011-11-06 + + use a fixed offset for the shirnk_wrap maximum size + +M gthumb/gth-browser.c + +commit 288920fb6e737e33d30332929eeebff951d4aca5 +Author: Paolo Bacchilega +Date: 2011-11-06 + + update the window size earlier when the shrink_wrap mode is active + +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/image_viewer/gth-image-viewer-page.c +M gthumb/gth-browser.c +M gthumb/gth-browser.h + +commit 023eb92d5d736c4753238c432ab071abefbc0727 +Author: Paolo Bacchilega +Date: 2011-11-06 + + fixed expand flag in the import dialog + +M extensions/photo_importer/data/ui/photo-importer.ui + +commit ee2d1cc8c9dacc0874b8ed645df29037f763c4a7 +Author: Paolo Bacchilega +Date: 2011-11-06 + + browser-mode icon: use only gray shades + +M data/icons/hicolor/22x22/actions/browser-mode.png + +commit 1ba24f857d11ec8e4ece2b00dedd141469c4c9a8 +Author: Paolo Bacchilega +Date: 2011-11-06 + + restored the auto-selection of the last viewed image + +M gthumb/gth-browser-actions-callbacks.c +M gthumb/gth-browser.c +M gthumb/gth-browser.h +M gthumb/main.c + +commit 2d374d2467fc9b3ed2447ae85a21a201506f38bd +Author: Paolo Bacchilega +Date: 2011-11-06 + + make the browser-mode icon sharper + +M data/icons/hicolor/22x22/actions/browser-mode.png + +commit 9fb8fff0064863f01138417b7a7fb503b9956605 +Author: Paolo Bacchilega +Date: 2011-11-06 + + realize the widget before adding the ui to get the icons from the + icon theme + +M gthumb/gth-browser.c + +commit 473d88e091c598b49eeaf9b4629d538dce1402bb +Author: Paolo Bacchilega +Date: 2011-11-06 + + Fixed with of the icon view item + +M gthumb/gth-icon-view.c + +commit 925eddbfc120c6161e3cd3fe2fc98a1cc95979b2 +Author: Paolo Bacchilega +Date: 2011-11-06 + + Fixed infinite reloading of some images when selected in the file list + + Make \r\n equal to \n and 'end of line' equal to \n and to \r\n in + dom_str_equal to overcome the GMarkupParser bad behaviuor of + automatically convert \r into \n. + + [bug fixed] + +M gthumb/dom.c + +commit 11d0070862b3802e10969ce06f2294e75fcfb82f +Author: Paolo Bacchilega +Date: 2011-11-06 + + do not emit signals when finilizing the object + +M gthumb/gth-histogram-view.c + +commit 3bfa1279f5756fdef0ce58c5bd9f345922261da7 +Author: Paolo Bacchilega +Date: 2011-11-06 + + use gtk_scrolled_window_add_with_viewport instead of gtk_container_add + +M gthumb/gth-histogram-view.c + +commit 2ac840c2d60b2de06b86ee68476db72d545d6dd5 +Author: Paolo Bacchilega +Date: 2011-11-06 + + set a fixed size for the item and the renderers + +M gthumb/gth-icon-view.c + +commit 3cf2a184d58bcb64fca85b5c6cb1b4b1b2f6fba1 +Author: Paolo Bacchilega +Date: 2011-11-06 + + removed unused column in the file store + +M gthumb/gth-file-store.c +M gthumb/gth-file-store.h + +commit 732c04c030be01362fcd1f58fc8803b5ca20958b +Author: Paolo Bacchilega +Date: 2011-11-06 + + use the escaped text + +M gthumb/gth-cell-renderer-caption.c + +commit dc4c9d783b4238b9c86d879566c2722093b0770a +Author: Paolo Bacchilega +Date: 2011-11-05 + + updated POTFILES.in + +M po/POTFILES.in + +commit b23b574ea18250e5881ed4087e3550ac508a7ac1 +Author: Paolo Bacchilega +Date: 2011-11-05 + + Simplified the file list code adding a custom caption cell renderer + +M gthumb/Makefile.am +A gthumb/gth-cell-renderer-caption.c +A gthumb/gth-cell-renderer-caption.h +M gthumb/gth-file-list.c +M gthumb/gth-file-store.c +M gthumb/gth-file-store.h +M gthumb/gth-icon-view.c + +commit 07ee8df1f3508cfb428166d65ae00954ef2eec15 +Author: Daniel Mustieles +Date: 2011-11-04 + + Updated Spanish translation + +M po/es.po + +commit d74b7bbc2dc9ac48c5dd48d93485ffa90f80d72c +Author: Paolo Bacchilega +Date: 2011-11-04 + + Fixed crash when no file properties view is registered + +M gthumb/gth-sidebar.c + +commit cb6863340cc2cfe25fe3c610350a5d8c317ccb04 +Author: Paolo Bacchilega +Date: 2011-11-04 + + set request mode to constant size for the thumbnail cell renderer + +M gthumb/gth-cell-renderer-thumbnail.c + +commit 8a0a0c4df9cc504d76fd0fe948947c3743be180f +Author: Paolo Bacchilega +Date: 2011-11-04 + + optimized the draw of an arc when the radius is 0 or 1 + +M gthumb/cairo-utils.c + +commit f29688f8880352e21a1604512d03e864aee2afe3 +Author: Paolo Bacchilega +Date: 2011-11-04 + + Fixed crash when disattivatin the media viewer very quickly + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit e5e47c930c86597b00200b2e7da135e67be00045 +Author: Paolo Bacchilega +Date: 2011-11-04 + + histogram: fixed the size of the inner allocation + + removed an extra pixel from the width + +M gthumb/gth-histogram-view.c + +commit b5882669b64ef08e6963113f6942ca40781cc429 +Author: Paolo Bacchilega +Date: 2011-11-04 + + fixed expand flags in the print dialog + +M extensions/image_print/data/ui/print-layout.ui + +commit 3704f2b84d491c3a832d98b93a3223bf4137dc09 +Author: Paolo Bacchilega +Date: 2011-11-04 + + Fixed the histogram view appearence + +M data/ui/histogram-info.ui +M extensions/image_viewer/gth-image-histogram.c +M gthumb/gth-histogram-view.c +M gthumb/gth-multipage.c +M gthumb/gth-sidebar.c + +commit 82af5d57da2503665d9854e8958d657474984531 +Author: Paolo Bacchilega +Date: 2011-11-04 + + do not set the image if it's NULL or equal to the current image + +M extensions/image_viewer/gth-image-viewer-page.c + +commit b0596bffd1f7d9e13eed77a9fde80d0589bda85f +Author: Paolo Bacchilega +Date: 2011-11-04 + + reset the has_[audio|video] flags before loading a new file + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit 6b265ec01f0fd555a16ba01fa39f3bbe7bf3c88e +Author: Paolo Bacchilega +Date: 2011-11-03 + + added icons for zoom to fit width and height + + taken from evince + +M configure.ac +M data/icons/hicolor/16x16/actions/Makefile.am +A data/icons/hicolor/16x16/actions/zoom-fit-height.png +A data/icons/hicolor/16x16/actions/zoom-fit-width.png +A data/icons/hicolor/24x24/Makefile.am +A data/icons/hicolor/24x24/actions/Makefile.am +A data/icons/hicolor/24x24/actions/zoom-fit-height.png +A data/icons/hicolor/24x24/actions/zoom-fit-width.png + +commit 7ecd07739007158754191d2b2fd41cf2b64159c6 +Author: Paolo Bacchilega +Date: 2011-11-03 + + added an extension icon + + taken from the libpeas plugin icon + +M data/icons/hicolor/16x16/actions/Makefile.am +A data/icons/hicolor/16x16/actions/application-extension.png +M data/icons/hicolor/22x22/actions/Makefile.am +A data/icons/hicolor/22x22/actions/application-extension.png +M gthumb/dlg-preferences-extensions.c + +commit 726e4c86add337e3b4db990ab81e1c0a388e38e1 +Author: Paolo Bacchilega +Date: 2011-11-03 + + add some padding around the extension icon + +M gthumb/dlg-preferences-extensions.c + +commit 4afce328d69f2b6a4ccd0f6b1d387b58fa9a7b98 +Author: Paolo Bacchilega +Date: 2011-11-03 + + gth-file-store: removed ref_node/unref_node implementations + + These functions cause a crash and are useless. + +M gthumb/gth-file-store.c + +commit c60581a902b601d1b7b3c658b9a4d604969d99eb +Author: Paolo Bacchilega +Date: 2011-11-03 + + Set the navigator icon as visible + +M gthumb/gth-image-navigator.c + +commit e2e397df427c7cd3b4c60f020cec963a1cc1fbe7 +Author: Paolo Bacchilega +Date: 2011-11-03 + + Fixed expand flags in the tool options + +M extensions/file_tools/data/ui/adjust-colors-options.ui +M extensions/file_tools/data/ui/crop-options.ui +M extensions/file_tools/data/ui/resize-options.ui +M extensions/file_tools/data/ui/rotate-options.ui +M extensions/file_tools/data/ui/sharpen-options.ui +M extensions/red_eye_removal/data/ui/red-eye-removal-options.ui +M gthumb/gth-image-navigator.c + +commit 484484652aac1b8b387ee646cef88c55bffd3485 +Author: Paolo Bacchilega +Date: 2011-11-03 + + add a shadow to the toolbox + +M gthumb/gth-toolbox.c + +commit 5e4ae04b87aebfcbd1454fbc05d5dd064bb4e606 +Author: Paolo Bacchilega +Date: 2011-11-03 + + Fixed a memory leak when setting the file property in the thumbnail + cell renderer + +M gthumb/gth-cell-renderer-thumbnail.c + +commit 3e38fab896baa20a65f13580e29e3b31e24078b8 +Author: Paolo Bacchilega +Date: 2011-11-03 + + simplified the code in gth_cell_renderer_thumbnail_get_size + +M gthumb/gth-cell-renderer-thumbnail.c + +commit 6169d4d4a916bff0328755343c93986b38a08075 +Author: Paolo Bacchilega +Date: 2011-11-03 + + Fixed a memory leak in GthCellRendererThumbnail + +M gthumb/gth-cell-renderer-thumbnail.c + +commit b197362f1a76e01e5a91fcccfb890edb4bd7c5e2 +Author: Paolo Bacchilega +Date: 2011-11-03 + + Implemented iter_previous, ref_node and unref_node for the file_store + +M gthumb/gth-file-store.c + +commit 4587d3031933cd264c7c6705c2d9da0446a13c99 +Author: Paolo Bacchilega +Date: 2011-11-03 + + Fixed flashing of the file list when setting the thumbnails + +M gthumb/gth-file-list.c +M gthumb/gth-file-store.c +M gthumb/gth-file-store.h + +commit 4c1c81d2fb9d95f208dde6f5409f7bd185ff481c +Author: Paolo Bacchilega +Date: 2011-11-03 + + Fixed the size of the thumbnail view + +M gthumb/gth-file-list.c + +commit 3254133046cd60267b2ee3a2bd40a0f8187c15e3 +Author: Paolo Bacchilega +Date: 2011-11-02 + + make sure an icon is returned + +M gthumb/glib-utils.c + +commit 64c189dcd324414f0ad770c6a707bb8010005f47 +Author: Paolo Bacchilega +Date: 2011-11-02 + + fixed property view not displaying correctly after switchin back to + browser mode + +M gthumb/gth-browser.c + +commit f046e4ad64905d3bab2a47cad7014607b97f5180 +Author: Paolo Bacchilega +Date: 2011-11-02 + + preferences: set a missing mnemonic widget + +M data/ui/preferences.ui + +commit a2f917881d915cb6d05002310285e2ec7e312d5d +Author: Paolo Bacchilega +Date: 2011-11-02 + + fixed crash when opening the search dialog + +M gthumb/gth-location-chooser.c + +commit 35871bc4d2a50e29605f3b7e4f913799046d6cfb +Author: Paolo Bacchilega +Date: 2011-11-02 + + video viewer: use symbolic icons for the play button and the volume + control + +M extensions/gstreamer_tools/data/ui/mediabar.ui +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit 7a3d3d2198569d22d6759ac0d6a81f5eba309042 +Author: Paolo Bacchilega +Date: 2011-11-02 + + make the shrink wrap command work for the video viewer as well + +M data/gthumb.schemas.in +M extensions/file_viewer/gth-file-viewer-page.c +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/image_viewer/data/gthumb-image-viewer.schemas.in +M extensions/image_viewer/gth-image-viewer-page.c +M extensions/image_viewer/gth-image-viewer-page.h +M gthumb/gth-browser-actions-callbacks.c +M gthumb/gth-browser-actions-callbacks.h +M gthumb/gth-browser-actions-entries.h +M gthumb/gth-browser-ui.h +M gthumb/gth-browser.c +M gthumb/gth-browser.h +M gthumb/gth-preferences.h +M gthumb/gth-viewer-page.c +M gthumb/gth-viewer-page.h +M gthumb/gtk-utils.c +M gthumb/gtk-utils.h + +commit 92dd88919c3ab244b610dd90fa1e814f0ff5c890 +Author: Paolo Bacchilega +Date: 2011-11-02 + + media viewer: use white text on black background when there is no + video available + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit 222f544b191c688d58be5e06d417fae42688466e +Author: Paolo Bacchilega +Date: 2011-11-02 + + fixed expand/fill in the preferences dialog + +M data/ui/preferences.ui +M extensions/image_print/data/ui/print-preferences.ui +M extensions/image_viewer/data/ui/image-viewer-preferences.ui +M extensions/image_viewer/preferences.c +M extensions/photo_importer/data/ui/photo-importer-options.ui +M extensions/pixbuf_savers/data/ui/jpeg-options.ui +M extensions/pixbuf_savers/data/ui/png-options.ui +M extensions/pixbuf_savers/data/ui/save-options-preferences.ui +M extensions/pixbuf_savers/data/ui/tga-options.ui +M extensions/pixbuf_savers/data/ui/tiff-options.ui +M extensions/slideshow/data/ui/slideshow-preferences.ui +M gthumb/dlg-preferences.c + +commit 31c152630ff818bfc24479b3d7e1f70a46cfed8d +Author: Paolo Bacchilega +Date: 2011-11-02 + + gstreamer_tools: jump to the specified position when clicking of + the progress bar + +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit b70f385f1aef2b24c8822dedb9f1900c2755db14 +Author: Marek Černocký +Date: 2011-11-02 + + Updated Czech translation + +M po/cs.po + +commit 41766cda2020926faf103fe419acdc9ee86c06d2 +Author: Paolo Bacchilega +Date: 2011-11-01 + + gstreamer_tools: fixed widgets expansion in the mediabar + +M extensions/gstreamer_tools/data/ui/mediabar.ui +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit 94daa25a5813f9642f98d7eb07c2391ec3a917c1 +Author: Paolo Bacchilega +Date: 2011-11-01 + + set the expand flag to toolbars and window content + +M gthumb/gth-window.c + +commit 34b147bf2c6cacd06224b95a377d334c6cf3b700 +Author: Paolo Bacchilega +Date: 2011-11-01 + + no need to set the parent_class explictly + +M extensions/edit_metadata/gth-edit-comment-page.c +M extensions/facebook/facebook-user.c +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/image_viewer/gth-image-viewer-page.c +M gthumb/dom.c +M gthumb/gth-browser.c +M gthumb/gth-image-navigator.c +M gthumb/gth-image-viewer.c +M gthumb/gth-location-chooser.c +M gthumb/gth-menu-action.c +M gthumb/gth-progress-dialog.c +M gthumb/gth-request-dialog.c +M gthumb/gth-toggle-menu-action.c +M gthumb/gth-window.c +M gthumb/main.c + +commit bac0272b5e7fce1095a3c926ee82f8a6316ef7e3 +Author: Paolo Bacchilega +Date: 2011-11-01 + + use gtk_paned_new instead of gtk_[vh]paned_new + +M gthumb/gth-browser.c +M gthumb/gth-file-properties.c + +commit b0b1a720b09293d8cc05d2d6766bcd0508ec7c06 +Author: Paolo Bacchilega +Date: 2011-11-01 + + use gtk_box_new instead of gtk_[vh]box_new + +M extensions/edit_metadata/gth-edit-metadata-dialog.c +M extensions/file_manager/actions.c +M extensions/file_viewer/gth-file-viewer-page.c +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/importer/gth-import-destination-button.c +M extensions/rename_series/gth-template-editor-dialog.c +M extensions/search/callbacks.c +M gthumb/gedit-message-area.c +M gthumb/gth-browser.c +M gthumb/gth-embedded-dialog.c +M gthumb/gth-file-tool.c +M gthumb/gth-filter.c +M gthumb/gth-filterbar.c +M gthumb/gth-histogram-view.c +M gthumb/gth-info-bar.c +M gthumb/gth-menu-button.c +M gthumb/gth-progress-dialog.c +M gthumb/gth-request-dialog.c +M gthumb/gth-statusbar.c +M gthumb/gth-tags-entry.c +M gthumb/gth-test-category.c +M gthumb/gth-test-selector.c +M gthumb/gth-test-simple.c +M gthumb/gth-time-selector.c +M gthumb/gth-toggle-menu-tool-button.c +M gthumb/gth-toolbox.c +M gthumb/gth-window.c +M gthumb/gtk-utils.c + +commit c56b569c546ce831b97ba71b1591750fd81c9eb3 +Author: Paolo Bacchilega +Date: 2011-11-01 + + file store: do not free the private data + +M gthumb/gth-file-store.c + +commit 981b3f9c05c82eca0bdf923a0868e9ca579c667f +Author: Paolo Bacchilega +Date: 2011-11-01 + + use G_DEFINE_BOXED_TYPE to define boxed types + +M gthumb/glib-utils.c + +commit 71b0514508eabd35a7f08a51355221c37edf670e +Author: Paolo Bacchilega +Date: 2011-11-01 + + declare the format as constant in gth_ambumtheme_yyerror + + fixes a compiler warning + +M extensions/webalbums/albumtheme.y + +commit 66255bf0ecfbacf5f58e290b51906641ebd6c89f +Author: Paolo Bacchilega +Date: 2011-11-01 + + Use the G_DEFINE_* macros to define GObject types + +M extensions/burn_disc/gth-burn-task.c +M extensions/catalogs/gth-catalog.c +M extensions/catalogs/gth-file-source-catalogs.c +M extensions/catalogs/gth-organize-task.c +M extensions/change_date/gth-change-date-task.c +M extensions/comments/gth-comment.c +M extensions/comments/gth-metadata-provider-comment.c +M extensions/contact_sheet/gth-contact-sheet-creator.c +M extensions/contact_sheet/gth-contact-sheet-theme-dialog.c +M extensions/edit_metadata/gth-delete-metadata-task.c +M extensions/edit_metadata/gth-edit-comment-page.c +M extensions/edit_metadata/gth-edit-metadata-dialog.c +M extensions/edit_metadata/gth-edit-metadata-dialog.h +M extensions/edit_metadata/gth-tag-chooser-dialog.c +M extensions/edit_metadata/gth-tag-task.c +M extensions/exiv2_tools/gth-edit-exiv2-page.c +M extensions/exiv2_tools/gth-metadata-provider-exiv2.c +M extensions/facebook/facebook-account-chooser-dialog.c +M extensions/facebook/facebook-account-manager-dialog.c +M extensions/facebook/facebook-account.c +M extensions/facebook/facebook-album-properties-dialog.c +M extensions/facebook/facebook-album.c +M extensions/facebook/facebook-authentication.c +M extensions/facebook/facebook-connection.c +M extensions/facebook/facebook-photo.c +M extensions/facebook/facebook-service.c +M extensions/facebook/facebook-user.c +M extensions/file_manager/gth-copy-task.c +M extensions/file_manager/gth-delete-task.c +M extensions/file_manager/gth-duplicate-task.c +M extensions/file_manager/gth-reorder-task.c +M extensions/file_tools/gth-file-tool-adjust-colors.c +M extensions/file_tools/gth-file-tool-crop.c +M extensions/file_tools/gth-file-tool-desaturate.c +M extensions/file_tools/gth-file-tool-enhance.c +M extensions/file_tools/gth-file-tool-equalize.c +M extensions/file_tools/gth-file-tool-flip.c +M extensions/file_tools/gth-file-tool-mirror.c +M extensions/file_tools/gth-file-tool-negative.c +M extensions/file_tools/gth-file-tool-redo.c +M extensions/file_tools/gth-file-tool-resize.c +M extensions/file_tools/gth-file-tool-rotate-left.c +M extensions/file_tools/gth-file-tool-rotate-right.c +M extensions/file_tools/gth-file-tool-rotate.c +M extensions/file_tools/gth-file-tool-save-as.c +M extensions/file_tools/gth-file-tool-save.c +M extensions/file_tools/gth-file-tool-sharpen.c +M extensions/file_tools/gth-file-tool-undo.c +M extensions/file_tools/gth-image-line-tool.c +M extensions/file_tools/gth-image-rotator.c +M extensions/file_viewer/gth-file-viewer-page.c +M extensions/find_duplicates/gth-find-duplicates.c +M extensions/find_duplicates/gth-folder-chooser-dialog.c +M extensions/flicker_utils/flickr-account-chooser-dialog.c +M extensions/flicker_utils/flickr-account-manager-dialog.c +M extensions/flicker_utils/flickr-account.c +M extensions/flicker_utils/flickr-authentication.c +M extensions/flicker_utils/flickr-connection.c +M extensions/flicker_utils/flickr-photo.c +M extensions/flicker_utils/flickr-photoset.c +M extensions/flicker_utils/flickr-service.c +M extensions/flicker_utils/flickr-user.c +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/gstreamer_tools/gth-metadata-provider-gstreamer.c +M extensions/image_print/gth-image-print-job.c +M extensions/image_print/gth-load-image-info-task.c +M extensions/image_rotation/gth-reset-orientation-task.c +M extensions/image_rotation/gth-transform-task.c +M extensions/image_viewer/gth-image-histogram.c +M extensions/image_viewer/gth-image-viewer-page.c +M extensions/image_viewer/gth-metadata-provider-image.c +M extensions/importer/gth-import-destination-button.c +M extensions/importer/gth-import-preferences-dialog.c +M extensions/importer/gth-import-task.c +M extensions/list_tools/gth-script-editor-dialog.c +M extensions/list_tools/gth-script-file.c +M extensions/list_tools/gth-script-task.c +M extensions/list_tools/gth-script.c +M extensions/map_view/gth-map-view.c +M extensions/oauth/oauth-account-chooser-dialog.c +M extensions/oauth/oauth-account-manager-dialog.c +M extensions/oauth/oauth-account.c +M extensions/oauth/oauth-authentication.c +M extensions/oauth/oauth-connection.c +M extensions/photobucket/photobucket-account.c +M extensions/photobucket/photobucket-album-properties-dialog.c +M extensions/photobucket/photobucket-album.c +M extensions/photobucket/photobucket-photo.c +M extensions/photobucket/photobucket-service.c +M extensions/picasaweb/google-connection.c +M extensions/picasaweb/picasa-account-chooser-dialog.c +M extensions/picasaweb/picasa-account-manager-dialog.c +M extensions/picasaweb/picasa-account-properties-dialog.c +M extensions/picasaweb/picasa-album-properties-dialog.c +M extensions/picasaweb/picasa-web-album.c +M extensions/picasaweb/picasa-web-photo.c +M extensions/picasaweb/picasa-web-service.c +M extensions/picasaweb/picasa-web-user.c +M extensions/pixbuf_savers/gth-jpeg-saver.c +M extensions/pixbuf_savers/gth-png-saver.c +M extensions/pixbuf_savers/gth-tga-saver.c +M extensions/pixbuf_savers/gth-tiff-saver.c +M extensions/red_eye_removal/gth-file-tool-red-eye.c +M extensions/rename_series/gth-rename-task.c +M extensions/rename_series/gth-template-editor-dialog.c +M extensions/rename_series/gth-template-selector.c +M extensions/search/gth-search-editor-dialog.c +M extensions/search/gth-search-editor.c +M extensions/search/gth-search-task.c +M extensions/search/gth-search.c +M extensions/slideshow/gth-slideshow-preferences.c +M extensions/slideshow/gth-slideshow.c +M extensions/slideshow/gth-transition.c +M extensions/webalbums/gth-web-exporter.c +M gthumb/gth-async-task.c +M gthumb/gth-cell-renderer-thumbnail.c +M gthumb/gth-dumb-notebook.c +M gthumb/gth-duplicable.c +M gthumb/gth-duplicable.h +M gthumb/gth-embedded-dialog.c +M gthumb/gth-empty-list.c +M gthumb/gth-extensions.c +M gthumb/gth-file-chooser-dialog.c +M gthumb/gth-file-data.c +M gthumb/gth-file-list.c +M gthumb/gth-file-properties.c +M gthumb/gth-file-selection.c +M gthumb/gth-file-selection.h +M gthumb/gth-file-source-vfs.c +M gthumb/gth-file-source.c +M gthumb/gth-file-store.c +M gthumb/gth-file-tool.c +M gthumb/gth-file-view.c +M gthumb/gth-file-view.h +M gthumb/gth-filter-editor-dialog.c +M gthumb/gth-filter.c +M gthumb/gth-filterbar.c +M gthumb/gth-folder-tree.c +M gthumb/gth-histogram-view.c +M gthumb/gth-histogram.c +M gthumb/gth-icon-view.c +M gthumb/gth-image-dragger.c +M gthumb/gth-image-history.c +M gthumb/gth-image-loader.c +M gthumb/gth-image-preloader.c +M gthumb/gth-image-selector.c +M gthumb/gth-image-viewer-tool.c +M gthumb/gth-image-viewer-tool.h +M gthumb/gth-image.c +M gthumb/gth-info-bar.c +M gthumb/gth-list-view.c +M gthumb/gth-load-file-data-task.c +M gthumb/gth-main.c +M gthumb/gth-menu-button.c +M gthumb/gth-metadata-chooser.c +M gthumb/gth-metadata-provider-file.c +M gthumb/gth-metadata-provider.c +M gthumb/gth-metadata.c +M gthumb/gth-monitor.c +M gthumb/gth-multipage.c +M gthumb/gth-multipage.h +M gthumb/gth-overwrite-dialog.c +M gthumb/gth-pixbuf-list-task.c +M gthumb/gth-pixbuf-saver.c +M gthumb/gth-pixbuf-task.c +M gthumb/gth-progress-dialog.c +M gthumb/gth-request-dialog.c +M gthumb/gth-save-file-data-task.c +M gthumb/gth-screensaver.c +M gthumb/gth-sidebar.c +M gthumb/gth-sidebar.h +M gthumb/gth-source-tree.c +M gthumb/gth-statusbar.c +M gthumb/gth-string-list.c +M gthumb/gth-tags-entry.c +M gthumb/gth-task.c +M gthumb/gth-test-category.c +M gthumb/gth-test-chain.c +M gthumb/gth-test-selector.c +M gthumb/gth-test-simple.c +M gthumb/gth-test.c +M gthumb/gth-thumb-loader.c +M gthumb/gth-time-selector.c +M gthumb/gth-toggle-menu-tool-button.c +M gthumb/gth-toolbox.c +M gthumb/gth-uri-list.c +M gthumb/gth-viewer-page.c +M gthumb/gth-viewer-page.h + +commit f0b0a78a37e632f8b7e1f9eef19b73361302b05e +Author: Paolo Bacchilega +Date: 2011-10-31 + + browser: code cleanup + + use G_DEFINE_TYPE and g_type_class_add_private + +M gthumb/gth-browser.c +M gthumb/gth-browser.h + +commit 437e422267e1b505ef95dc063e2880b107476329 +Author: Paolo Bacchilega +Date: 2011-10-31 + + main: refactored the code to make it clearer + + Removed the use of ClutterInitResult. Added a GthApplication class. + Removed the use of gth_window_get_window_list in favor of + gtk_application_get_windows. + +M extensions/slideshow/actions.c +M gthumb/gth-main.c +M gthumb/gth-window.c +M gthumb/gth-window.h +M gthumb/main.c +M gthumb/main.h + +commit 3aab97f323c977d38dc1217af3f1b79e56a90c28 +Author: Paolo Bacchilega +Date: 2011-10-31 + + location chooser: update the list only after the widget is realized + + ...and cleaned the code using the G_DEFINE_TYPE macro, and removing + the GtkHBox inheritance in favor of GtkBox. + +M gthumb/gth-location-chooser.c +M gthumb/gth-location-chooser.h + +commit f2b2156baf7d564d7d6de1464dff29c12ea5c6b2 +Author: Paolo Bacchilega +Date: 2011-10-31 + + dom: use the G_DEFINE_[TYPE|INTERFACE] macros + +M extensions/comments/gth-comment.c +M extensions/facebook/facebook-account.c +M extensions/facebook/facebook-album.c +M extensions/facebook/facebook-photo.c +M extensions/facebook/facebook-user.c +M extensions/flicker_utils/flickr-account.c +M extensions/flicker_utils/flickr-photo.c +M extensions/flicker_utils/flickr-photoset.c +M extensions/flicker_utils/flickr-user.c +M extensions/list_tools/gth-script.c +M extensions/oauth/oauth-account.c +M extensions/photobucket/photobucket-account.c +M extensions/photobucket/photobucket-album.c +M extensions/photobucket/photobucket-photo.c +M extensions/picasaweb/picasa-web-album.c +M extensions/picasaweb/picasa-web-photo.c +M extensions/picasaweb/picasa-web-user.c +M extensions/search/gth-search.c +M gthumb/dom.c +M gthumb/dom.h +M gthumb/gth-filter.c +M gthumb/gth-test-category.c +M gthumb/gth-test-chain.c +M gthumb/gth-test-simple.c + +commit 08616f933a2b3a3811503c1c09d938547809f376 +Author: Paolo Bacchilega +Date: 2011-10-31 + + bookmakrs: update the bookmarks in the idle callback + + and removed bookmarks__gth_browser_update_sensitivity_cb which wasn't + used. + +M extensions/bookmarks/callbacks.c + +commit a0b6f7a071fdf581ca13a67d48cf83deac3c653a +Author: Paolo Bacchilega +Date: 2011-10-31 + + fixed indentation + +M copy-n-paste/Makefile.am + +commit be49efbb6c86db172d67b8d0810168bab57d24e9 +Author: Paolo Bacchilega +Date: 2011-10-31 + + removed win32 smclient option which was unused anyway, set default + to no + +M configure.ac + +commit 8c1695d8ce17762cf3d30646fa36b084e1936638 +Author: Paolo Bacchilega +Date: 2011-10-28 + + use png_jmpbug if libpng 1.4 is available + +M extensions/cairo_io/cairo-io-png.c + +commit 41b9ac3b45eaa7f21d251ad31ceadf5dca95bf69 +Author: Paolo Bacchilega +Date: 2011-10-27 + + link to ICE only if compiled with smclient + +M configure.ac + +commit fca8906379c9f97c07da53397a023bdc4362b4d9 Author: Paolo Bacchilega -Date: 2012-03-06 +Date: 2011-10-27 - strip the tags when setting the list from a text value + removed useless argument to open_browser_window -M gthumb/gth-tags-entry.c +M gthumb/main.c -commit 843c35d62cd8d614f4ea0f71fd03875f23142eec +commit 44eef75f42eafeb039816e6a86485d167463ec6f Author: Paolo Bacchilega -Date: 2012-03-06 +Date: 2011-10-27 - GthTestCategory: fixed possible crashes + call gtk_clutter_init as soon as possible - *) do not connect to the "tags-changed" signal more than once; - *) reset the tag store when the control is destroyed. +M gthumb/main.c -M gthumb/gth-test-category.c +commit e15abd30e8c665274d8f6ef3bd0a089faa4cf160 +Author: Paolo Bacchilega +Date: 2011-10-27 + + set the application in the browser constructor + +M gthumb/gth-browser.c +M gthumb/main.c +M gthumb/main.h -commit 853856842514ea5d4ea1c806760921f9852fc788 +commit 997d0ca8f2d86ad66aaa4e13bd5efc5ed879fcf9 Author: Paolo Bacchilega -Date: 2012-03-06 +Date: 2011-10-27 - fixed test for embedded title and description + fixed compilation without a session manager - use the GthTestSimple object with data-type STRING instead of a - GthTestCategory. +M configure.ac +M copy-n-paste/Makefile.am +M gthumb/gth-main.c +M gthumb/main.c -M gthumb/gth-main-default-tests.c +commit 814228ec9f41a1d2b4e3bee15ea0ccf2f626c17f +Author: Paolo Bacchilega +Date: 2011-10-27 + + fixed function name + +M extensions/importer/gth-import-destination-button.c -commit b5b9201df244a48af9ac60af4f6b60004ee5b1b4 +commit 910274071a8c144d227b07fa701ed3cfc78cee36 Author: Paolo Bacchilega -Date: 2012-02-19 +Date: 2011-10-27 - Fixed renaming in viewer mode + Refactored the code of the image viewer widget - [bug 670392] + Removed useless functions and signals. The image navigator is now a + custom container that hides or shows the scrollbars during the + size_allocate + function. Added some local utility functions and renamed some + variables + to make the code clearer. -M extensions/file_manager/actions.c +M extensions/image_viewer/gth-image-viewer-page.c +M gthumb/gth-image-dragger.c +M gthumb/gth-image-navigator.c +M gthumb/gth-image-navigator.h +M gthumb/gth-image-viewer.c +M gthumb/gth-image-viewer.h -commit f51e3c8f05b3ecce08de639dfd4ac88454465922 +commit 12d6763b2378e7309d0f4b94ab4d1d1b35938634 Author: Paolo Bacchilega -Date: 2012-02-19 +Date: 2011-10-27 - call the gth-browser-file-list-key-press hook only if the list widget - is realized + use load_location as first_location can be a file as well M gthumb/gth-browser.c -commit ce038b4b23da4735ba521eea4ee36e77625daa82 -Author: Daniel Nylander -Date: 2012-02-14 +commit 1427c06947eadb5504df542377b42d67bf57dc2c +Author: Paolo Bacchilega +Date: 2011-10-27 - Updated Swedish translation + use the state-flags-changes signal instead of the deprecated + state-change -M po/sv.po +M extensions/importer/gth-import-destination-button.c -commit c1a674a4009bb562bff2443e82e9db18be77cdd5 +commit 1aeed99383026a201bf859dbb457325d1ee3067d Author: Paolo Bacchilega -Date: 2012-02-05 - - do not show duplicate entries in the sidebar and bookmarks menu +Date: 2011-10-26 - [bug #669367] + resize_images: update the height according to the ratio -M gthumb/gth-file-source-vfs.c +M extensions/resize_images/dlg-resize-images.c -commit cb37198ab1817791a49b14666412fdd56c1466a6 +commit 9f29a69b8171c2dac9d214f912d3e23245ac3222 Author: Paolo Bacchilega -Date: 2012-01-30 - - include for setw and setfill - - as suggested by Mickaël Giroud +Date: 2011-10-25 - [bug #668947] + call gtk_ui_manager_ensure_update after switch browser/viewer UI -M extensions/exiv2_tools/exiv2-utils.cpp +M gthumb/gth-browser.c -commit bc1ec9fe0ebc8f28ab12053c90ef51e1ceca4660 -Author: xcsnake@free.fr -Date: 2012-01-28 +commit 8414499de1445cb5cda1628a8b98656f60a5810e +Author: Paolo Bacchilega +Date: 2011-10-25 - added zlib in PKG_CHECK_MODULES for GTHUMB + construct the button content if it's invalid or the is-important + property changes -M configure.ac +M gthumb/gth-toggle-menu-tool-button.c -commit 1b9b028f9bbce476df83eb42774e69bbeb540f2b +commit 929ebd450bb0b681738a63c37082271cad656004 Author: Paolo Bacchilega -Date: 2012-01-23 +Date: 2011-10-25 - updated for version 2.14.2 + moved the fullscreen tool button in the fixed ui definition -M NEWS -M configure.ac + for the same reason of the previuos commit + +M gthumb/gth-browser-ui.h -commit 53c0ea1eb6fa9bcba196b8c05e946655b9ed421b +commit 9de3a6789bb6473fdefebc6e7a065e24f1984e92 Author: Paolo Bacchilega -Date: 2012-01-19 +Date: 2011-10-25 - fixed crash + edit_metadata: moved the toolbar button in the fixed ui info - no need to set viewer_sidebar_pane and thumbnail_list when - changing the thumbnail list orientation. + no need to have a separate browser ui info to add and remove when + switching between browser mode and viewer mode as the browser toolbar + is not displayed in viewer mode anyway. -M gthumb/gth-browser.c +M extensions/edit_metadata/callbacks.c -commit 8414365179b31c470015b01680bd4ca656f422ad -Author: Christian Kirbach -Date: 2012-01-16 +commit 180340f9ab5b880970f15ce11a62f8701ff6b560 +Author: Paolo Bacchilega +Date: 2011-10-25 - Updated German translation + load the initial location only after calling the + 'gth-browser-construct-idle-callback' hook -M po/de.po +M gthumb/gth-browser-actions-callbacks.c +M gthumb/gth-browser.c +M gthumb/gth-browser.h +M gthumb/main.c -commit 59ef625efa30e0c77aa5e31dde621aa424bd9e3e +commit 854a6a8c964d672d37e3a81fb860ec38128d33d3 Author: Paolo Bacchilega -Date: 2012-01-15 - - memory leak in image tool extension's Adjust Colors +Date: 2011-10-25 - [bug #667931] + list_tools: disconnect the signal handler only if it was set -M extensions/file_tools/gth-file-tool-adjust-colors.c +M extensions/list_tools/callbacks.c -commit 110c48737173d05f44898a5177ce984cb9a28ccd +commit c19171a19d1362c752a49e64ca78d1f08ac6d4bd Author: Paolo Bacchilega -Date: 2012-01-08 +Date: 2011-10-25 - change date: fixed names of the gconf keys + list_tools: update the menu items sensitivity just before showing + the menu -M extensions/change_date/data/gthumb_change_date.schemas.in +M extensions/list_tools/callbacks.c +M extensions/list_tools/callbacks.h +M extensions/list_tools/main.c -commit 11941d1b46c9d1cf438419cb044e1a8b6b5051b2 +commit e8fc229947405bd618522bf6033a1e9d925711d5 Author: Paolo Bacchilega -Date: 2011-12-11 +Date: 2011-10-25 - use a better error message when the catalog already exists + postpone the creation of the menus in the export and list tool buttons -M extensions/catalogs/gth-file-source-catalogs.c +M extensions/export_tools/callbacks.c +M extensions/list_tools/callbacks.c +M gthumb/gth-toggle-menu-action.c +M gthumb/gth-toggle-menu-action.h -commit 1abd8e40d97386fe1374841ad299fdb6c53b4894 +commit ffa604705156abc3d2a1e0deb08004b224ef28e5 Author: Paolo Bacchilega -Date: 2011-12-11 +Date: 2011-10-25 - do not allow to rename the catalog if the new name is already used + reduced indentation -M extensions/catalogs/gth-file-source-catalogs.c +M gthumb/gth-toggle-menu-tool-button.h -commit 81196e47096ee8d62fe3a663d78bb964c0281a03 +commit 835727014f6915efcc9ba1895f4a6445bcce1616 Author: Paolo Bacchilega -Date: 2011-12-11 +Date: 2011-10-22 - fixed renaming of folders and catalogs + Use custom actions for the navigation tool buttons -M extensions/catalogs/callbacks.c -M extensions/catalogs/dlg-catalog-properties.c -M extensions/catalogs/gth-file-source-catalogs.c -M extensions/file_manager/callbacks.c -M gthumb/glib-utils.c -M gthumb/glib-utils.h +M gthumb/Makefile.am +M gthumb/gth-browser-ui.h M gthumb/gth-browser.c -M gthumb/gth-file-source.c -M gthumb/gth-file-source.h -M gthumb/gth-folder-tree.c -M gthumb/gth-source-tree.c +A gthumb/gth-menu-action.c +A gthumb/gth-menu-action.h -commit 9e3dbeb0dfeff8147ea247dbd2eb1313d8c0c81c +commit 6f3435566d4c0d8ffbbef4824b15407b00093ddf Author: Paolo Bacchilega -Date: 2011-12-04 +Date: 2011-10-22 - updated for version 2.14.1 + set the appearance properties on the actions and not on the widgets -M NEWS -M configure.ac +M extensions/23hq/callbacks.c +M extensions/change_date/callbacks.c +M extensions/edit_metadata/callbacks.c +M extensions/facebook/callbacks.c +M extensions/flicker/callbacks.c +M extensions/image_print/callbacks.c +M extensions/image_rotation/callbacks.c +M extensions/photobucket/callbacks.c +M extensions/picasaweb/callbacks.c +M extensions/search/callbacks.c +M gthumb/gth-browser-actions-entries.h +M gthumb/gth-browser.c +M gthumb/gth-window-actions-entries.h +M gthumb/gtk-utils.c +M gthumb/gtk-utils.h -commit 3c430032245cd109594aedd57ab1905db6e368eb +commit c9c9c2d68d56318d90ca946b854b7cdea55d68c3 Author: Paolo Bacchilega -Date: 2011-11-29 +Date: 2011-10-22 - hooks: fixed crash when the first argument is a NULL pointer + added a GthToggleMenuAction to add menu buttons to the toolbar -M gthumb/gth-hook.c +M extensions/export_tools/callbacks.c +M extensions/list_tools/callbacks.c +M gthumb/Makefile.am +M gthumb/gth-browser-ui.h +A gthumb/gth-toggle-menu-action.c +A gthumb/gth-toggle-menu-action.h +M gthumb/gth-toggle-menu-tool-button.c -commit 9c47aee833aa1534320828ba72dbf360aa8a6159 -Author: Jorge González -Date: 2011-12-03 +commit a988d2cd93ddc7fcb50e56e0a4f237e179434d1d +Author: Paolo Bacchilega +Date: 2011-10-21 - Updated Spanish translation + center the thumbnail caption horinzontally -M po/es.po +M gthumb/gth-icon-view.c -commit 1641b51ec4eb367819a6f14f0466f6a487a00e30 -Author: Piotr Drąg -Date: 2011-11-17 +commit 7c3080c7d698d62132e7552d6704461a015087a8 +Author: Paolo Bacchilega +Date: 2011-10-21 - Updated Polish translation + removed wrong argument from the painter -M po/pl.po +M extensions/slideshow/gth-slideshow.c -commit c65fdd3ef55cf878964e6607a8f7d1dd2377d20e +commit 70f1dfa3d4b921398403052365e24cafb180f642 Author: Paolo Bacchilega -Date: 2011-11-13 +Date: 2011-10-21 - Fixed names of the contact sheet Gconf keys + use a gtk_clutter_texture instead of a clutter_texture -M extensions/contact_sheet/data/gthumb_contact_sheet.schemas.in +M extensions/slideshow/gth-slideshow.c -commit 09408c4c3554936dc6169e9048ce02672ae121ca +commit 079f04dd8cbf3a81846de24d8974477b839ef744 Author: Paolo Bacchilega -Date: 2011-11-07 +Date: 2011-10-21 - Fixed export to Photobucket + Revert "slideshow: removed use of GTK_CLUTTER_TEXTURE" - Use the correct ui files. + This reverts commit a17a41560acf312095c69cc740e9e66cd3056001. -M extensions/oauth/oauth-account-chooser-dialog.c -M extensions/oauth/oauth-account-manager-dialog.c -M extensions/oauth/oauth-authentication.c +M extensions/slideshow/gth-slideshow.c -commit 213d5a396f81f8fd9d3bf6e14a2d551510c44cd2 +commit 8fcd9470cabc776a04cedc46a4d43370d966bf56 Author: Paolo Bacchilega -Date: 2011-11-06 - - Fixed infinite reloading of some images when selected in the file list - - Make \r\n equal to \n and 'end of line' equal to \n and to \r\n in - dom_str_equal to overcome the GMarkupParser bad behaviuor of - automatically convert \r into \n. +Date: 2011-10-21 - [bug fixed] + fixed drawing of the image frame -M gthumb/dom.c +M gthumb/gth-image-viewer.c -commit 7d7db3f2769a6cdaf24ef70e12b4a68c0599f241 +commit 85574be1b45f1009bb64bef27610dbd983210e11 Author: Paolo Bacchilega -Date: 2011-11-04 +Date: 2011-10-21 - optimized the draw of an arc when the radius is 0 or 1 + align the thumbnail to the top -M gthumb/cairo-utils.c +M gthumb/gth-icon-view.c -commit a1649b7e769d6a9c511e9017421b95296c249284 +commit ee5ec4789d4d99cc2ff9d4ef054379ecc7b1b925 Author: Paolo Bacchilega -Date: 2011-11-04 +Date: 2011-10-21 - Fixed crash when disattivatin the media viewer very quickly + use gtk_cell_area_box_pack_start to specify the fixed property -M extensions/gstreamer_tools/gth-media-viewer-page.c + the fixed property should speed-up the cell rendering -commit de3bd7c3018a581e59177fb3a5d4f74d9a8d62e9 +M gthumb/gth-icon-view.c + +commit cbdeaa98b33bc7e8d10c4e32e1df33e4c35e43ab Author: Paolo Bacchilega -Date: 2011-11-04 +Date: 2011-10-21 - Fixed crash when no file properties view is registered + fixed rendering of the empty list -M gthumb/gth-sidebar.c + hinerit from a GtkScrollwedWindow to draw the border correctly + +M gthumb/gth-empty-list.c +M gthumb/gth-empty-list.h -commit b323772867ae2cea9cfd252a1553256a56565c60 +commit ad2e1212975a092bed85db7b4664f9986f7ef22c Author: Paolo Bacchilega -Date: 2011-11-04 +Date: 2011-10-21 - do not set the image if it's NULL or equal to the current image + fixed thumbnail rendering -M extensions/image_viewer/gth-image-viewer-page.c +M gthumb/gth-cell-renderer-thumbnail.c +M gthumb/gtk-utils.c +M gthumb/pixbuf-utils.c +M gthumb/pixbuf-utils.h -commit 26ea579d3b129a2785852fa786a9b4eae4ff1c6f +commit d14eb7582c831bbf35fd3b2d5e859567d901be04 Author: Paolo Bacchilega -Date: 2011-11-04 +Date: 2011-10-21 - reset the has_[audio|video] flags before loading a new file + slideshow: removed use of GTK_CLUTTER_TEXTURE -M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/slideshow/gth-slideshow.c -commit fbc2237a14cc13fe4ad68fbbb9b56aa37c60d1eb +commit 80d4f78d5fdf9bd02143ffccd425e6ea5c0e9cbe Author: Paolo Bacchilega -Date: 2011-11-03 - - Make sure to unref the original pixbuf +Date: 2011-10-20 - pixbuf can point to the colorized pixbuf, added another variable - than always points to the original pixbuf. Initialize file and - thumbnail to NULL. + fixed resize of the file list -M gthumb/gth-cell-renderer-thumbnail.c +M gthumb/gth-file-list.c -commit e56ff6badcc3c480388b0f2ae5825f6e2aabbe05 +commit a6c86ef3046ab76af22ee2915347ce4166dcae74 Author: Paolo Bacchilega -Date: 2011-11-03 +Date: 2011-10-20 - Fixed a memory leak in GthCellRendererThumbnail + removed useless call to gtk_widget_show -M gthumb/gth-cell-renderer-thumbnail.c +M gthumb/gth-browser.c -commit 8b1ecdc17cc7b6b34c4808913c8d7903305d4831 -Author: Marek Černocký -Date: 2011-11-02 +commit f8b1c513377b5fdb54c0cf76996770e934a88edf +Author: Paolo Bacchilega +Date: 2011-10-20 - Updated Czech translation + set the icon theme search path only when the window is realized -M po/cs.po +M gthumb/gth-browser.c +M gthumb/gth-main.c -commit 388e2bfbbf9c57092e2d756d4c80d28351e0c8d3 -Author: Takeshi AIHANA -Date: 2011-10-27 +commit 0c5858d52d57149af2446961ccf7c538f46f9b62 +Author: Paolo Bacchilega +Date: 2011-10-18 - Updated Japanese translation. + use the style_updated signal instead of style_set -M po/ja.po +M gthumb/gth-image-viewer.c +M gthumb/gth-toggle-menu-tool-button.c -commit cdb6c4e391e06bde449b7330af7ec0ba4f965ceb +commit 62952d7e9adf62ee1f48c0b70713eeaf5829e4fa Author: Paolo Bacchilega -Date: 2011-10-26 +Date: 2011-10-18 - updated for version 2.14.0 + map_view: removed show-scale property which is not present anymore -M NEWS -M configure.ac +M extensions/map_view/gth-map-view.c -commit 717c7aa022421f78ea103622fcf403492766f9a2 +commit faff30b0996c5d72a7ea2dc3f22a6f977c67713f Author: Paolo Bacchilega -Date: 2011-10-26 +Date: 2011-10-18 - resize_images: update the height according to the ratio + updated required version for some libraries -M extensions/resize_images/dlg-resize-images.c +M configure.ac -commit 137ad027cc9dfca81e0201d293283e61a1db2664 +commit 8da0434c332bc622e65ac4e429363db109d0186b Author: Paolo Bacchilega Date: 2011-10-25 @@ -390,7 +4447,7 @@ M extensions/exiv2_tools/exiv2-utils.h M extensions/exiv2_tools/gth-metadata-provider-exiv2.c -commit dd1440a41153e9d8027865ca2543e734e8ac5ba1 +commit 12fddadb1536c928c9a84024011d308ab8ebc42b Author: Paolo Bacchilega Date: 2011-10-25 @@ -405,7 +4462,7 @@ M extensions/resize_images/dlg-resize-images.c M extensions/resize_images/resize_images.extension.in.in -commit 0dbe4c3aee6768a7919fc7ee8773f682ee653473 +commit 2757b9d462cee633ac0fce9a771035d30acdb01f Author: Paolo Bacchilega Date: 2011-10-25 @@ -413,7 +4470,7 @@ M git.mk -commit 4f2ca08b8c588c22ee7819c0f5d80699ec03ef7c +commit 2d7a8f502ce4985b3a89f0be47d24432e7377201 Author: Paolo Bacchilega Date: 2011-10-25 @@ -423,7 +4480,259 @@ M extensions/resize_images/dlg-resize-images.c -commit f60523aa71d94a19799efadad8f7a12e0a12517b +commit c290daaec85328ae9d89d581177313abee44b53a +Author: Paolo Bacchilega +Date: 2011-10-16 + + ported to libchamplain 0.12 + +M configure.ac +M extensions/map_view/gth-map-view.c + +commit b51620a7a9c6d9cbe93014b2f63249935fee576c +Author: Paolo Bacchilega +Date: 2011-10-16 + + removed a cairo_destroy call + +M gthumb/gth-cell-renderer-thumbnail.c + +commit 7876c7529cb45e0c4227ed5cb1e6764e9aa2f3e6 +Author: Paolo Bacchilega +Date: 2011-10-16 + + fixed many compiler errors + +M extensions/file_tools/gth-image-line-tool.c +M extensions/file_tools/gth-image-rotator.c +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/image_print/gth-image-print-job.c +M gthumb/gedit-message-area.c +M gthumb/gth-cell-renderer-thumbnail.c +M gthumb/gth-empty-list.c +M gthumb/gth-histogram-view.c +M gthumb/gth-icon-view.c +M gthumb/gth-image-viewer.c +M gthumb/gth-image-viewer.h +M gthumb/gtk-utils.c +M gthumb/main.c + +commit 4541184508ef484cd2396305679894c80fc625c7 +Author: Paolo Bacchilega +Date: 2011-10-16 + + Ported from libunique to GtkApplication + +M configure.ac +M gthumb/main.c + +commit 99c10fbb08f22a54e1f947384f723471b1507868 +Author: Paolo Bacchilega +Date: 2011-10-16 + + removed the use of GtkStyle and other deprecated functions + +M extensions/file_manager/callbacks.c +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/slideshow/gth-slideshow.c +M gthumb/gth-cell-renderer-thumbnail.c +M gthumb/gth-empty-list.c +M gthumb/gth-folder-tree.c +M gthumb/gth-histogram-view.c +M gthumb/gth-image-dragger.c +M gthumb/gth-image-navigator.c +M gthumb/gth-image-selector.c +M gthumb/gth-image-viewer.c +M gthumb/gth-menu-button.c +M gthumb/gth-time-selector.c +M gthumb/gth-toggle-menu-tool-button.c +M gthumb/gth-window.c +M gthumb/gtk-utils.c +M gthumb/gtk-utils.h + +commit c335ead2257725ce9e3e1a881cc3f00f745b1d65 +Author: Paolo Bacchilega +Date: 2011-10-16 + + fixed the style of the main window + +M gthumb/gth-window.c + +commit eb198ffba4db30ef3508ba43b37ae46b7c8b331e +Author: Paolo Bacchilega +Date: 2011-10-16 + + removed use of gdk_cursor_ref/unref + +M extensions/burn_disc/gth-burn-task.c +M extensions/file_tools/gth-image-line-tool.c +M extensions/file_tools/gth-image-rotator.c +M extensions/gstreamer_tools/gth-media-viewer-page.c +M gthumb/gth-image-dragger.c +M gthumb/gth-image-navigator.c +M gthumb/gth-image-selector.c +M gthumb/gth-image-viewer.c + +commit 6201e6bb32a7c110883c53b6697f59e676480c72 +Author: Paolo Bacchilega +Date: 2011-10-16 + + removed direct access to xthickness + +M gthumb/gth-file-list.c + +commit b4f6d00cc8159b8d74d715bee658f5e4056052ab +Author: Paolo Bacchilega +Date: 2011-10-16 + + fixed compiler warnings + +M extensions/jpeg_utils/jpegtran.c +M gthumb/gth-histogram-view.c + +commit 28373050e3ea681dfc7c0512bfbbc955daf50845 +Author: Paolo Bacchilega +Date: 2011-10-16 + + use the draw signal to paint widgets and other changes + +M extensions/contact_sheet/gth-contact-sheet-theme-dialog.c +M extensions/gstreamer_tools/gth-media-viewer-page.c +M extensions/image_print/gth-image-print-job.c +M extensions/image_viewer/gth-image-viewer-page.c +M gthumb/gedit-message-area.c +M gthumb/gth-browser.c +M gthumb/gth-cell-renderer-thumbnail.c +M gthumb/gth-dumb-notebook.c +M gthumb/gth-empty-list.c +M gthumb/gth-file-list.c +M gthumb/gth-folder-tree.c +M gthumb/gth-histogram-view.c +M gthumb/gth-icon-view.c +M gthumb/gth-image-dragger.c +M gthumb/gth-image-navigator.c +M gthumb/gth-image-selector.c +M gthumb/gth-image-viewer-tool.c +M gthumb/gth-image-viewer-tool.h +M gthumb/gth-image-viewer.c +M gthumb/gth-image-viewer.h +M gthumb/gth-time-selector.c +M gthumb/gth-toggle-menu-tool-button.c + +commit 3c8cdb72a61b98883b7248df4c21d61643dbca06 +Author: Paolo Bacchilega +Date: 2011-10-16 + + removed use of the GTK_DIALOG_NO_SEPARATOR flag + +M extensions/burn_disc/gth-burn-task.c + +commit 2b83825462194dd1b62e76021b12176a3e76825a +Author: Paolo Bacchilega +Date: 2011-10-16 + + initialize some constanst to remove some compiler warnings + +M extensions/catalogs/gth-organize-task.c +M extensions/contact_sheet/dlg-contact-sheet.c +M extensions/contact_sheet/dlg-image-wall.c +M extensions/gstreamer_tools/gth-media-viewer-page.c + +commit bd47cf9429e62a83318f09971bdd88fc11493343 +Author: Paolo Bacchilega +Date: 2011-10-16 + + added the _KEY prefix to the GDK key constants + +M extensions/edit_metadata/callbacks.c +M extensions/file_manager/callbacks.c +M extensions/image_rotation/callbacks.c +M extensions/list_tools/gth-script.c +M extensions/slideshow/gth-slideshow.c +M gthumb/gth-icon-view.c +M gthumb/gth-image-navigator.c +M gthumb/gth-image-viewer.c +M gthumb/gth-time-selector.c + +commit 9dfbc0946aa6538544c1c1fc486123fa6e3edb7b +Author: Paolo Bacchilega +Date: 2011-10-16 + + fixed indentation broken by the previous commit + +M extensions/contact_sheet/gth-contact-sheet-creator.c +M extensions/contact_sheet/gth-contact-sheet-theme.c +M extensions/contact_sheet/gth-contact-sheet-theme.h +M extensions/file_tools/cairo-rotate.c +M extensions/file_tools/cairo-rotate.h +M extensions/file_tools/gth-file-tool-crop.c +M extensions/file_tools/gth-file-tool-rotate.c +M extensions/file_tools/gth-image-line-tool.c +M extensions/file_tools/gth-image-rotator.c +M extensions/file_tools/gth-image-rotator.h +M gthumb/cairo-utils.c +M gthumb/cairo-utils.h +M gthumb/gth-cell-renderer-thumbnail.c +M gthumb/gth-image-navigator.c +M gthumb/gth-image-selector.c +M gthumb/gth-image-selector.h +M gthumb/gth-image-viewer.c +M gthumb/gth-image-viewer.h +M gthumb/gth-menu-button.c +M gthumb/gth-time-selector.c +M gthumb/gth-toggle-menu-tool-button.c +M gthumb/gtk-utils.c + +commit 47c212c72d2cefc68772ed9bc95348ab50fb651b +Author: Paolo Bacchilega +Date: 2011-10-16 + + replace GdkRectanle with cairo_rectangle_int_t + +M extensions/contact_sheet/gth-contact-sheet-creator.c +M extensions/contact_sheet/gth-contact-sheet-theme.c +M extensions/contact_sheet/gth-contact-sheet-theme.h +M extensions/file_tools/cairo-rotate.c +M extensions/file_tools/cairo-rotate.h +M extensions/file_tools/gth-file-tool-crop.c +M extensions/file_tools/gth-file-tool-rotate.c +M extensions/file_tools/gth-image-line-tool.c +M extensions/file_tools/gth-image-rotator.c +M extensions/file_tools/gth-image-rotator.h +M gthumb/cairo-utils.c +M gthumb/cairo-utils.h +M gthumb/gth-cell-renderer-thumbnail.c +M gthumb/gth-image-navigator.c +M gthumb/gth-image-selector.c +M gthumb/gth-image-selector.h +M gthumb/gth-image-viewer.c +M gthumb/gth-image-viewer.h +M gthumb/gth-menu-button.c +M gthumb/gth-time-selector.c +M gthumb/gth-toggle-menu-tool-button.c +M gthumb/gtk-utils.c + +commit 89fdc10cd56ceba5230149d94bdad0450556f876 +Author: Paolo Bacchilega +Date: 2011-10-16 + + updated session management code from libegg + +M copy-n-paste/eggdesktopfile.c +M copy-n-paste/eggdesktopfile.h +M copy-n-paste/eggsmclient-private.h +M copy-n-paste/eggsmclient-xsmp.c +M copy-n-paste/eggsmclient.c + +commit 91bbfdbcf15a6bb5dbd89eae0494c2ceed3f60aa +Author: Paolo Bacchilega +Date: 2011-10-16 + + require Gtk+ version 3.2 or greater + +M configure.ac + +commit 7beed1327a0f17d6497d7bdc4c89a40fa20087d3 Author: Kristjan SCHMIDT Date: 2011-10-24 @@ -432,49 +4741,73 @@ M po/LINGUAS A po/eo.po -commit da32f84f56689ab649947b3cb9e0e5e54bdb9f3c -Author: Claude Paroz -Date: 2011-10-22 +commit 4c634157a5be06641deaf0d7c7189fb95d274512 +Author: Daniel Mustieles +Date: 2011-10-24 - [help] Updated French translation + Updated Spanish translation -M help/fr/fr.po +M help/es/es.po + +commit f391fe1c6d313f95eb5090109c7fa7f8a43323db +Author: Daniel Mustieles +Date: 2011-10-24 + + Updated Spanish translation -commit fa1519e9f147ac0c7328037bbe64a3fdcda5433e +M po/es.po + +commit f950b9c85522c43c242b4fd4bf11ccf75fc0fa63 Author: Matej Urbančič -Date: 2011-10-22 +Date: 2011-10-23 Updated Slovenian translation M po/sl.po -commit 616bccacd7cac5b0e070af2f0cb7b3fdf43857a3 +commit 99b065d7b22e5b799adf9f35f5954877418054ee +Author: Claude Paroz +Date: 2011-10-22 + + [help] Updated French translation + +M help/fr/fr.po + +commit 4d17a387ec4d512d81847292bd659aad2f4be5fc Author: Mario Blättermann Date: 2011-10-21 [l10n] Removed unused screenshots D help/de/figures/comment.png +D help/de/figures/nav-button.png D help/de/figures/preferences.png -commit 738bd330fdb29399fac6f44814fc81cc79709e11 +commit ac3df7b27fa22ceaba0265bc29e0965008714808 Author: Mario Blättermann Date: 2011-10-21 [l10n] Removed screenshot, added new one -D help/de/figures/nav-button.png -A help/de/figures/specific-filter.png +D help/de/figures/specfic-filter.png -commit 996cf50dc0e8f4360346d5c90c324edc9bfd09b4 +commit 2aa63d062d37cb05fa5e790e372db618398a48dd Author: Mario Blättermann Date: 2011-10-21 - [l10n] Removed screenshot + [l10n] Updated German doc translation -D help/de/figures/specfic-filter.png +M help/de/de.po + +commit 87eedbfb758c01b84b3c52059cb7cd64f47d5e4d +Author: Mario Blättermann +Date: 2011-10-21 -commit e686b5d4545ddfbb4500d9fc58d7c9799f3e87fc + [l10n] Added new screenshot + +A help/de/figures/specific-filter.png + +commit d30a8b17232721828f27a1160bae18e7630d8984 Author: Mario Blättermann Date: 2011-10-21 @@ -482,7 +4815,7 @@ M help/de/de.po -commit 7510563a4c4cec8fd1fca7e9d3920e7fd30f3286 +commit c71445da16f1f7ea2686d765404fd31ae12d64ec Author: Mario Blättermann Date: 2011-10-21 @@ -490,7 +4823,7 @@ M help/de/de.po -commit 7eb2cd16f794d6b4aba70fce87dded9427e751a8 +commit b0c12a2baf22dc3883d71feed7efc5fbe2d13019 Author: Claude Paroz Date: 2011-10-20 @@ -498,7 +4831,15 @@ M po/fr.po -commit 2e3ab7fed57207de613d2b2787923f4e45f7b34c +commit 922a88b5e694b047027adfc3ff2db4403edc254d +Author: Christian Kirbach +Date: 2011-10-17 + + [doc] Fix typo in import.page + +M help/C/import.page + +commit acbb60c55729fa29d1a6d9ec355cc6742cd36240 Author: Mario Blättermann Date: 2011-10-17 @@ -506,7 +4847,7 @@ M help/de/de.po -commit 515333b14f928c45807b71f85f193597f23239ed +commit 29b2efc55d2b7eaba0b9098be907413df7f35ab5 Author: Mario Blättermann Date: 2011-10-17 @@ -514,7 +4855,7 @@ M po/de.po -commit ab81cac3b9b82b4005d1120a32ef9966687e55b1 +commit 47acc880e26c497181c22b2377e2605664e248a3 Author: Claude Paroz Date: 2011-10-17 diff -Nru gthumb-2.14.3/config.h.in gthumb-3.0.0/config.h.in --- gthumb-2.14.3/config.h.in 2012-03-25 18:34:29.000000000 +0000 +++ gthumb-3.0.0/config.h.in 2012-04-23 18:15:36.000000000 +0000 @@ -16,6 +16,9 @@ /* Gettext package */ #undef GETTEXT_PACKAGE +/* gThumb API version */ +#undef GTHUMB_API_VERSION + /* Define if libc defines an altzone variable */ #undef HAVE_ALTZONE @@ -37,10 +40,6 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT -/* Define to 1 if gthumb is intended to be used with GNOME Desktop 3.0 or - higher */ -#undef HAVE_GNOME_3 - /* Have gnome-keyring */ #undef HAVE_GNOME_KEYRING @@ -65,6 +64,9 @@ /* Define to 1 if you have the `m' library (-lm). */ #undef HAVE_LIBM +/* Define to 1 if librsvg support is included */ +#undef HAVE_LIBRSVG + /* Have libsoup-gnome */ #undef HAVE_LIBSOUP_GNOME @@ -144,6 +146,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Use a session menager */ +#undef USE_SMCLIENT + /* Version number of package */ #undef VERSION diff -Nru gthumb-2.14.3/configure gthumb-3.0.0/configure --- gthumb-2.14.3/configure 2012-03-25 18:34:17.000000000 +0000 +++ gthumb-3.0.0/configure 2012-04-23 18:09:41.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gthumb 2.14.3. +# Generated by GNU Autoconf 2.68 for gthumb 3.0.0. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='gthumb' PACKAGE_TARNAME='gthumb' -PACKAGE_VERSION='2.14.3' -PACKAGE_STRING='gthumb 2.14.3' +PACKAGE_VERSION='3.0.0' +PACKAGE_STRING='gthumb 3.0.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb' PACKAGE_URL='' @@ -644,6 +644,10 @@ LIBSOUP_GNOME_CFLAGS GNOME_KEYRING_LIBS GNOME_KEYRING_CFLAGS +ENABLE_LIBRSVG_FALSE +ENABLE_LIBRSVG_TRUE +LIBRSVG_LIBS +LIBRSVG_CFLAGS LIBOPENRAW_LIBS LIBOPENRAW_CFLAGS TIFF_LIBS @@ -658,11 +662,6 @@ OS_WIN32_TRUE PLATFORM_WIN32_FALSE PLATFORM_WIN32_TRUE -GCONF_SCHEMAS_INSTALL_FALSE -GCONF_SCHEMAS_INSTALL_TRUE -GCONF_SCHEMA_FILE_DIR -GCONF_SCHEMA_CONFIG_SOURCE -GCONFTOOL MKINSTALLDIRS POSUB POFILES @@ -727,10 +726,6 @@ ENABLE_EXIV2_TRUE EXIV2_LIBS EXIV2_CFLAGS -ENABLE_UNIQUE_FALSE -ENABLE_UNIQUE_TRUE -UNIQUE_LIBS -UNIQUE_CFLAGS M_LIBS GTHUMB_LIBS GTHUMB_CFLAGS @@ -742,6 +737,10 @@ RUN_IN_PLACE_TRUE GTHUMB_EXTENSION_IN_RULE GTHUMB_EXTENSION_RULE +GSETTINGS_RULES +GLIB_COMPILE_SCHEMAS +gsettingsschemadir +GSETTINGS_DISABLE_SCHEMAS_COMPILE WARN_CXXFLAGS WARN_CFLAGS DISABLE_DEPRECATED @@ -903,24 +902,21 @@ enable_iso_c enable_cxx_warnings enable_iso_cxx +enable_schemas_compile enable_deprecated enable_debug enable_gseal enable_run_in_place enable_test_suite -enable_unique enable_exiv2 enable_clutter enable_gstreamer enable_libchamplain -enable_gnome_3 enable_nls -with_gconf_source -with_gconf_schema_file_dir -enable_schemas_install enable_jpeg enable_tiff enable_libopenraw +enable_librsvg enable_gnome_keyring enable_libsoup enable_libbrasero @@ -946,8 +942,6 @@ GTK_LIBS GTHUMB_CFLAGS GTHUMB_LIBS -UNIQUE_CFLAGS -UNIQUE_LIBS EXIV2_CFLAGS EXIV2_LIBS CLUTTER_CFLAGS @@ -958,6 +952,8 @@ LIBCHAMPLAIN_LIBS LIBOPENRAW_CFLAGS LIBOPENRAW_LIBS +LIBRSVG_CFLAGS +LIBRSVG_LIBS GNOME_KEYRING_CFLAGS GNOME_KEYRING_LIBS LIBSOUP_GNOME_CFLAGS @@ -1510,7 +1506,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gthumb 2.14.3 to adapt to many kinds of systems. +\`configure' configures gthumb 3.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1580,7 +1576,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gthumb 2.14.3:";; + short | recursive ) echo "Configuration of gthumb 3.0.0:";; esac cat <<\_ACEOF @@ -1607,26 +1603,25 @@ Turn on compiler warnings. --enable-iso-cxx Try to warn if code is not ISO C++ + --disable-schemas-compile + Disable regeneration of gschemas.compiled on install --disable-deprecated do not use deprecated API --enable-debug enable compilation of debugging messages --enable-gseal check use of direct access to object fields --enable-run-in-place load ui data and extensions from the source tree --enable-test-suite enable the compilation of the test suite - --disable-unique do not compile code that uses the libunique library --disable-exiv2 do not compile code that uses the exiv2 library --disable-clutter do not compile code that uses the clutter library --disable-gstreamer do not compile code that uses the gstreamer library --enable-libchamplain compile code that uses the libchamplain library (crashes frequently) - --disable-gnome-3 do not compile code specific to GNOME Desktop - version 3.0 or higher --disable-nls do not use Native Language Support - --disable-schemas-install - Disable the schemas installation --disable-jpeg do not compile code that uses the libjpeg library --disable-tiff do not compile code that uses the libtiff library --enable-libopenraw use the libopenraw library to read raw files [default=no] + --disable-librsvg do not compile code that uses the librsvg library + [default=yes] --disable-gnome-keyring do not compile code that uses the gnome-keyring library --disable-libsoup do not compile code that uses the libsoup library @@ -1644,12 +1639,8 @@ --with-omf-dir=DIR path to OMF files --with-help-formats=FORMATS list of formats - --with-gconf-source=sourceaddress - Config database for installing schema files. - --with-gconf-schema-file-dir=dir - Directory for installing schema files. - --with-smclient-backend=no|xsmp|win32 - Setting smclient backend (default:auto) + --with-smclient=no|auto|xsmp + Setting smclient backend (default:no) Some influential environment variables: CC C compiler command @@ -1673,9 +1664,6 @@ GTHUMB_CFLAGS C compiler flags for GTHUMB, overriding pkg-config GTHUMB_LIBS linker flags for GTHUMB, overriding pkg-config - UNIQUE_CFLAGS - C compiler flags for UNIQUE, overriding pkg-config - UNIQUE_LIBS linker flags for UNIQUE, overriding pkg-config EXIV2_CFLAGS C compiler flags for EXIV2, overriding pkg-config EXIV2_LIBS linker flags for EXIV2, overriding pkg-config @@ -1695,6 +1683,10 @@ C compiler flags for LIBOPENRAW, overriding pkg-config LIBOPENRAW_LIBS linker flags for LIBOPENRAW, overriding pkg-config + LIBRSVG_CFLAGS + C compiler flags for LIBRSVG, overriding pkg-config + LIBRSVG_LIBS + linker flags for LIBRSVG, overriding pkg-config GNOME_KEYRING_CFLAGS C compiler flags for GNOME_KEYRING, overriding pkg-config GNOME_KEYRING_LIBS @@ -1782,7 +1774,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gthumb configure 2.14.3 +gthumb configure 3.0.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2272,7 +2264,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gthumb $as_me 2.14.3, which was +It was created by gthumb $as_me 3.0.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3087,7 +3079,7 @@ # Define the identity of the package. PACKAGE='gthumb' - VERSION='2.14.3' + VERSION='3.0.0' cat >>confdefs.h <<_ACEOF @@ -3214,7 +3206,12 @@ -GTHUMB_API_VERSION=2.14 +GTHUMB_API_VERSION=3.0 + + +cat >>confdefs.h <<_ACEOF +#define GTHUMB_API_VERSION "$GTHUMB_API_VERSION" +_ACEOF if test -z "$enable_maintainer_mode"; then @@ -17065,7 +17062,7 @@ DISABLE_DEPRECATED="" if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" + DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" for DOMAIN in $DOMAINS; do DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" done @@ -17243,27 +17240,258 @@ + # Check whether --enable-schemas-compile was given. +if test "${enable_schemas_compile+set}" = set; then : + enableval=$enable_schemas_compile; case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;; + esac +fi + + + + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.16 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + gsettingsschemadir=${datadir}/glib-2.0/schemas + + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + # Extract the first word of "glib-compile-schemas", so it can be a program name with args. +set dummy glib-compile-schemas; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GLIB_COMPILE_SCHEMAS in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS +if test -n "$GLIB_COMPILE_SCHEMAS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5 +$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi + + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5 + else + : + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" $^ > $@.tmp && mv $@.tmp $@ +endif +' + + + + + + + + GTHUMB_EXTENSION_RULE='%.extension: %.extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -GTHUMB_EXTENSION_IN_RULE='%.extension.in: %.extension.in.in $(extension_LTLIBRARIES) ; sed -e "s|%LIBRARY%|`. ./$(extension_LTLIBRARIES) && echo $$dlname`|" -e "s|%VERSION%|$(VERSION)|" $< > $@' +GTHUMB_EXTENSION_IN_RULE='%.extension.in: %.extension.in.in $(extension_LTLIBRARIES) ; sed -e "s|%LIBRARY%|`. ./$(extension_LTLIBRARIES) && echo $$dlname`|" -e "s|%VERSION%|$(VERSION)|" -e "s|%GTHUMB_API_VERSION%|$(GTHUMB_API_VERSION)|" $< > $@' GLIB_REQUIRED=2.28.0 -GTK_REQUIRED=2.24.0 -GCONF_REQUIRED=2.6.0 -EXIV2_REQUIRED=0.18 +GTK_REQUIRED=3.2.0 +EXIV2_REQUIRED=0.21 CLUTTER_REQUIRED=1.0.0 -CLUTTER_GTK_REQUIRED=0.10.0 +CLUTTER_GTK_REQUIRED=1.0.0 GSTREAMER_REQUIRED=0.10 OPENRAW_REQUIRED=0.0.8 -UNIQUE_REQUIRED=1.1.2 -LIBSOUP_REQUIRED=2.26 -GNOME_KEYRING_REQUIRED=2.28 -LIBBRASERO_REQUIRED=2.28 -LIBCHAMPLAIN_REQUIRED=0.8.0 +LIBSOUP_REQUIRED=2.36 +GNOME_KEYRING_REQUIRED=3.2.0 +LIBBRASERO_REQUIRED=3.2.0 +LIBCHAMPLAIN_REQUIRED=0.12.0 +LIBRSVG_REQUIRED=2.34.0 CFLAGS=${CFLAGS-:""} @@ -17371,12 +17599,12 @@ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null` + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17388,12 +17616,12 @@ pkg_cv_GTK_LIBS="$GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null` + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17414,14 +17642,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= $GTK_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met: + as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_REQUIRED) were not met: $GTK_PKG_ERRORS @@ -17470,22 +17698,18 @@ gthread-2.0 gmodule-2.0 gio-unix-2.0 - gtk+-2.0 >= \$GTK_REQUIRED - gconf-2.0 >= \$GCONF_REQUIRED + gtk+-3.0 >= \$GTK_REQUIRED libpng zlib - ice \""; } >&5 ($PKG_CONFIG --exists --print-errors " glib-2.0 >= $GLIB_REQUIRED gthread-2.0 gmodule-2.0 gio-unix-2.0 - gtk+-2.0 >= $GTK_REQUIRED - gconf-2.0 >= $GCONF_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED libpng zlib - ice ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -17495,11 +17719,9 @@ gthread-2.0 gmodule-2.0 gio-unix-2.0 - gtk+-2.0 >= $GTK_REQUIRED - gconf-2.0 >= $GCONF_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED libpng zlib - ice " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -17517,22 +17739,18 @@ gthread-2.0 gmodule-2.0 gio-unix-2.0 - gtk+-2.0 >= \$GTK_REQUIRED - gconf-2.0 >= \$GCONF_REQUIRED + gtk+-3.0 >= \$GTK_REQUIRED libpng zlib - ice \""; } >&5 ($PKG_CONFIG --exists --print-errors " glib-2.0 >= $GLIB_REQUIRED gthread-2.0 gmodule-2.0 gio-unix-2.0 - gtk+-2.0 >= $GTK_REQUIRED - gconf-2.0 >= $GCONF_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED libpng zlib - ice ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -17542,11 +17760,9 @@ gthread-2.0 gmodule-2.0 gio-unix-2.0 - gtk+-2.0 >= $GTK_REQUIRED - gconf-2.0 >= $GCONF_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED libpng zlib - ice " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -17573,11 +17789,9 @@ gthread-2.0 gmodule-2.0 gio-unix-2.0 - gtk+-2.0 >= $GTK_REQUIRED - gconf-2.0 >= $GCONF_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED libpng zlib - ice " 2>&1` else GTHUMB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " @@ -17585,11 +17799,9 @@ gthread-2.0 gmodule-2.0 gio-unix-2.0 - gtk+-2.0 >= $GTK_REQUIRED - gconf-2.0 >= $GCONF_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED libpng zlib - ice " 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -17600,11 +17812,9 @@ gthread-2.0 gmodule-2.0 gio-unix-2.0 - gtk+-2.0 >= $GTK_REQUIRED - gconf-2.0 >= $GCONF_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED libpng zlib - ice ) were not met: $GTHUMB_PKG_ERRORS @@ -17778,99 +17988,6 @@ -# Check whether --enable-unique was given. -if test "${enable_unique+set}" = set; then : - enableval=$enable_unique; -else - enable_unique=yes -fi - - -if test x$enable_unique = xyes ; then - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQUE" >&5 -$as_echo_n "checking for UNIQUE... " >&6; } - -if test -n "$UNIQUE_CFLAGS"; then - pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "unique-1.0 >= $UNIQUE_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_UNIQUE_CFLAGS=`$PKG_CONFIG --cflags "unique-1.0 >= $UNIQUE_REQUIRED" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$UNIQUE_LIBS"; then - pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0 >= \$UNIQUE_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "unique-1.0 >= $UNIQUE_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_UNIQUE_LIBS=`$PKG_CONFIG --libs "unique-1.0 >= $UNIQUE_REQUIRED" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - UNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "unique-1.0 >= $UNIQUE_REQUIRED" 2>&1` - else - UNIQUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "unique-1.0 >= $UNIQUE_REQUIRED" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$UNIQUE_PKG_ERRORS" >&5 - - enable_unique=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - enable_unique=no -else - UNIQUE_CFLAGS=$pkg_cv_UNIQUE_CFLAGS - UNIQUE_LIBS=$pkg_cv_UNIQUE_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - enable_unique=yes -fi -fi - - - if test "x$enable_unique" = xyes; then - ENABLE_UNIQUE_TRUE= - ENABLE_UNIQUE_FALSE='#' -else - ENABLE_UNIQUE_TRUE='#' - ENABLE_UNIQUE_FALSE= -fi - - - # Check whether --enable-exiv2 was given. if test "${enable_exiv2+set}" = set; then : enableval=$enable_exiv2; @@ -17988,14 +18105,14 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 >= \$CLUTTER_REQUIRED - clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED\""; } >&5 + clutter-gtk-1.0 >= \$CLUTTER_GTK_REQUIRED\""; } >&5 ($PKG_CONFIG --exists --print-errors "clutter-1.0 >= $CLUTTER_REQUIRED - clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED") 2>&5 + clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CLUTTER_CFLAGS=`$PKG_CONFIG --cflags "clutter-1.0 >= $CLUTTER_REQUIRED - clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED" 2>/dev/null` + clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18008,14 +18125,14 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0 >= \$CLUTTER_REQUIRED - clutter-gtk-0.10 >= \$CLUTTER_GTK_REQUIRED\""; } >&5 + clutter-gtk-1.0 >= \$CLUTTER_GTK_REQUIRED\""; } >&5 ($PKG_CONFIG --exists --print-errors "clutter-1.0 >= $CLUTTER_REQUIRED - clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED") 2>&5 + clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_CLUTTER_LIBS=`$PKG_CONFIG --libs "clutter-1.0 >= $CLUTTER_REQUIRED - clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED" 2>/dev/null` + clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18037,10 +18154,10 @@ fi if test $_pkg_short_errors_supported = yes; then CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "clutter-1.0 >= $CLUTTER_REQUIRED - clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED" 2>&1` + clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED" 2>&1` else CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "clutter-1.0 >= $CLUTTER_REQUIRED - clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED" 2>&1` + clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$CLUTTER_PKG_ERRORS" >&5 @@ -18198,15 +18315,15 @@ pkg_cv_LIBCHAMPLAIN_CFLAGS="$LIBCHAMPLAIN_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.8 >= \$LIBCHAMPLAIN_REQUIRED - champlain-gtk-0.8 >= \$LIBCHAMPLAIN_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED - champlain-gtk-0.8 >= $LIBCHAMPLAIN_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.12 >= \$LIBCHAMPLAIN_REQUIRED + champlain-gtk-0.12 >= \$LIBCHAMPLAIN_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "champlain-0.12 >= $LIBCHAMPLAIN_REQUIRED + champlain-gtk-0.12 >= $LIBCHAMPLAIN_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED - champlain-gtk-0.8 >= $LIBCHAMPLAIN_REQUIRED" 2>/dev/null` + pkg_cv_LIBCHAMPLAIN_CFLAGS=`$PKG_CONFIG --cflags "champlain-0.12 >= $LIBCHAMPLAIN_REQUIRED + champlain-gtk-0.12 >= $LIBCHAMPLAIN_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18218,15 +18335,15 @@ pkg_cv_LIBCHAMPLAIN_LIBS="$LIBCHAMPLAIN_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.8 >= \$LIBCHAMPLAIN_REQUIRED - champlain-gtk-0.8 >= \$LIBCHAMPLAIN_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED - champlain-gtk-0.8 >= $LIBCHAMPLAIN_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"champlain-0.12 >= \$LIBCHAMPLAIN_REQUIRED + champlain-gtk-0.12 >= \$LIBCHAMPLAIN_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "champlain-0.12 >= $LIBCHAMPLAIN_REQUIRED + champlain-gtk-0.12 >= $LIBCHAMPLAIN_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED - champlain-gtk-0.8 >= $LIBCHAMPLAIN_REQUIRED" 2>/dev/null` + pkg_cv_LIBCHAMPLAIN_LIBS=`$PKG_CONFIG --libs "champlain-0.12 >= $LIBCHAMPLAIN_REQUIRED + champlain-gtk-0.12 >= $LIBCHAMPLAIN_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -18247,11 +18364,11 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED - champlain-gtk-0.8 >= $LIBCHAMPLAIN_REQUIRED" 2>&1` + LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "champlain-0.12 >= $LIBCHAMPLAIN_REQUIRED + champlain-gtk-0.12 >= $LIBCHAMPLAIN_REQUIRED" 2>&1` else - LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED - champlain-gtk-0.8 >= $LIBCHAMPLAIN_REQUIRED" 2>&1` + LIBCHAMPLAIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "champlain-0.12 >= $LIBCHAMPLAIN_REQUIRED + champlain-gtk-0.12 >= $LIBCHAMPLAIN_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBCHAMPLAIN_PKG_ERRORS" >&5 @@ -18287,21 +18404,6 @@ -# Check whether --enable-gnome-3 was given. -if test "${enable_gnome_3+set}" = set; then : - enableval=$enable_gnome_3; -else - enable_gnome_3=yes -fi - - -if test x$enable_gnome_3 = xyes ; then - -$as_echo "#define HAVE_GNOME_3 1" >>confdefs.h - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } @@ -19610,102 +19712,6 @@ fi -# Extract the first word of "gconftool-2", so it can be a program name with args. -set dummy gconftool-2; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GCONFTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GCONFTOOL in - [\\/]* | ?:[\\/]*) - ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no" - ;; -esac -fi -GCONFTOOL=$ac_cv_path_GCONFTOOL -if test -n "$GCONFTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5 -$as_echo "$GCONFTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -if test x"$GCONFTOOL" = xno; then - as_fn_error $? "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 -fi - - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - - -# Check whether --with-gconf-source was given. -if test "${with_gconf_source+set}" = set; then : - withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" -fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 -$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } - - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' - fi - - -# Check whether --with-gconf-schema-file-dir was given. -if test "${with_gconf_schema_file_dir+set}" = set; then : - withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" -fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 -$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } - - # Check whether --enable-schemas-install was given. -if test "${enable_schemas_install+set}" = set; then : - enableval=$enable_schemas_install; case ${enableval} in - yes|no) ;; - *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; - esac -fi - - if test "$enable_schemas_install" != no; then - GCONF_SCHEMAS_INSTALL_TRUE= - GCONF_SCHEMAS_INSTALL_FALSE='#' -else - GCONF_SCHEMAS_INSTALL_TRUE='#' - GCONF_SCHEMAS_INSTALL_FALSE= -fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for some Win32 platform" >&5 $as_echo_n "checking for some Win32 platform... " >&6; } case "$host" in @@ -20218,6 +20224,104 @@ $as_echo "$enable_libopenraw" >&6; } +# Check whether --enable-librsvg was given. +if test "${enable_librsvg+set}" = set; then : + enableval=$enable_librsvg; +else + enable_librsvg=yes +fi + + +if test x$enable_librsvg = xyes ; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBRSVG" >&5 +$as_echo_n "checking for LIBRSVG... " >&6; } + +if test -n "$LIBRSVG_CFLAGS"; then + pkg_cv_LIBRSVG_CFLAGS="$LIBRSVG_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= \$LIBRSVG_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= $LIBRSVG_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBRSVG_CFLAGS=`$PKG_CONFIG --cflags "librsvg-2.0 >= $LIBRSVG_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBRSVG_LIBS"; then + pkg_cv_LIBRSVG_LIBS="$LIBRSVG_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= \$LIBRSVG_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= $LIBRSVG_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBRSVG_LIBS=`$PKG_CONFIG --libs "librsvg-2.0 >= $LIBRSVG_REQUIRED" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBRSVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "librsvg-2.0 >= $LIBRSVG_REQUIRED" 2>&1` + else + LIBRSVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "librsvg-2.0 >= $LIBRSVG_REQUIRED" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBRSVG_PKG_ERRORS" >&5 + + enable_librsvg=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_librsvg=no +else + LIBRSVG_CFLAGS=$pkg_cv_LIBRSVG_CFLAGS + LIBRSVG_LIBS=$pkg_cv_LIBRSVG_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_librsvg=yes +fi + if test "x$enable_librsvg" = "xyes"; then + +$as_echo "#define HAVE_LIBRSVG 1" >>confdefs.h + + fi +fi + + + if test "x$enable_librsvg" = xyes; then + ENABLE_LIBRSVG_TRUE= + ENABLE_LIBRSVG_FALSE='#' +else + ENABLE_LIBRSVG_TRUE='#' + ENABLE_LIBRSVG_FALSE= +fi + + + # Check whether --enable-gnome-keyring was given. if test "${enable_gnome_keyring+set}" = set; then : enableval=$enable_gnome_keyring; @@ -20562,12 +20666,12 @@ pkg_cv_LIBBRASERO_CFLAGS="$LIBBRASERO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbrasero-burn >= \$LIBBRASERO_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libbrasero-burn >= $LIBBRASERO_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbrasero-burn3 >= \$LIBBRASERO_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libbrasero-burn3 >= $LIBBRASERO_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBBRASERO_CFLAGS=`$PKG_CONFIG --cflags "libbrasero-burn >= $LIBBRASERO_REQUIRED" 2>/dev/null` + pkg_cv_LIBBRASERO_CFLAGS=`$PKG_CONFIG --cflags "libbrasero-burn3 >= $LIBBRASERO_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20579,12 +20683,12 @@ pkg_cv_LIBBRASERO_LIBS="$LIBBRASERO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbrasero-burn >= \$LIBBRASERO_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libbrasero-burn >= $LIBBRASERO_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbrasero-burn3 >= \$LIBBRASERO_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libbrasero-burn3 >= $LIBBRASERO_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBBRASERO_LIBS=`$PKG_CONFIG --libs "libbrasero-burn >= $LIBBRASERO_REQUIRED" 2>/dev/null` + pkg_cv_LIBBRASERO_LIBS=`$PKG_CONFIG --libs "libbrasero-burn3 >= $LIBBRASERO_REQUIRED" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -20605,9 +20709,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBBRASERO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbrasero-burn >= $LIBBRASERO_REQUIRED" 2>&1` + LIBBRASERO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbrasero-burn3 >= $LIBBRASERO_REQUIRED" 2>&1` else - LIBBRASERO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbrasero-burn >= $LIBBRASERO_REQUIRED" 2>&1` + LIBBRASERO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbrasero-burn3 >= $LIBBRASERO_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBBRASERO_PKG_ERRORS" >&5 @@ -20917,14 +21021,17 @@ if test "${with_smclient+set}" = set; then : withval=$with_smclient; else + with_smclient=no +fi + + +if test "$with_smclient" == "auto"; then case "$GDK_TARGET" in x11) with_smclient=xsmp ;; - win32) with_smclient=$GDK_TARGET ;; *) with_smclient=no ;; - esac + esac fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_smclient" >&5 $as_echo "$with_smclient" >&6; } @@ -20934,7 +21041,7 @@ case "$with_smclient" in - xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;; + xsmp) SMCLIENT_PKGS="sm >= 1.0.0 ice" ;; *) SMCLIENT_PKGS="" ;; esac @@ -21031,6 +21138,9 @@ fi + +$as_echo "#define USE_SMCLIENT 1" >>confdefs.h + fi if test "$with_smclient" != "no"; then @@ -21059,7 +21169,7 @@ -ac_config_files="$ac_config_files Makefile copy-n-paste/Makefile data/Makefile data/gthumb.desktop.in data/gthumb-${GTHUMB_API_VERSION}.pc:data/gthumb.pc.in data/gthumb-import.desktop.in data/icons/Makefile data/icons/hicolor/Makefile data/icons/hicolor/16x16/Makefile data/icons/hicolor/16x16/actions/Makefile data/icons/hicolor/16x16/apps/Makefile data/icons/hicolor/22x22/Makefile data/icons/hicolor/22x22/actions/Makefile data/icons/hicolor/22x22/apps/Makefile data/icons/hicolor/32x32/Makefile data/icons/hicolor/32x32/apps/Makefile data/icons/hicolor/48x48/Makefile data/icons/hicolor/48x48/actions/Makefile data/icons/hicolor/48x48/apps/Makefile data/icons/hicolor/scalable/Makefile data/icons/hicolor/scalable/actions/Makefile data/icons/hicolor/scalable/apps/Makefile data/ui/Makefile help/Makefile m4/Makefile extensions/Makefile extensions/23hq/Makefile extensions/bookmarks/Makefile extensions/bookmarks/data/Makefile extensions/bookmarks/data/ui/Makefile extensions/burn_disc/Makefile extensions/burn_disc/data/Makefile extensions/burn_disc/data/ui/Makefile extensions/cairo_io/Makefile extensions/catalogs/Makefile extensions/catalogs/data/Makefile extensions/catalogs/data/ui/Makefile extensions/change_date/Makefile extensions/change_date/data/Makefile extensions/change_date/data/ui/Makefile extensions/comments/Makefile extensions/comments/data/Makefile extensions/comments/data/ui/Makefile extensions/contact_sheet/Makefile extensions/contact_sheet/data/Makefile extensions/contact_sheet/data/contact_sheet_themes/Makefile extensions/contact_sheet/data/ui/Makefile extensions/convert_format/Makefile extensions/convert_format/data/Makefile extensions/convert_format/data/ui/Makefile extensions/desktop_background/Makefile extensions/edit_metadata/Makefile extensions/edit_metadata/data/Makefile extensions/edit_metadata/data/ui/Makefile extensions/exiv2_tools/Makefile extensions/exiv2_tools/data/Makefile extensions/exiv2_tools/data/ui/Makefile extensions/export_tools/Makefile extensions/facebook/Makefile extensions/facebook/data/Makefile extensions/facebook/data/ui/Makefile extensions/file_manager/Makefile extensions/file_manager/data/Makefile extensions/file_tools/Makefile extensions/file_tools/data/Makefile extensions/file_tools/data/ui/Makefile extensions/file_viewer/Makefile extensions/find_duplicates/Makefile extensions/find_duplicates/data/Makefile extensions/find_duplicates/data/ui/Makefile extensions/flicker_utils/Makefile extensions/flicker_utils/data/Makefile extensions/flicker_utils/data/ui/Makefile extensions/flicker/Makefile extensions/gstreamer_tools/Makefile extensions/gstreamer_tools/data/Makefile extensions/gstreamer_tools/data/ui/Makefile extensions/gstreamer_utils/Makefile extensions/image_print/Makefile extensions/image_print/data/Makefile extensions/image_print/data/ui/Makefile extensions/image_rotation/Makefile extensions/image_viewer/Makefile extensions/image_viewer/data/Makefile extensions/image_viewer/data/ui/Makefile extensions/importer/Makefile extensions/importer/data/Makefile extensions/importer/data/ui/Makefile extensions/jpeg_utils/Makefile extensions/list_tools/Makefile extensions/list_tools/data/Makefile extensions/list_tools/data/ui/Makefile extensions/map_view/Makefile extensions/oauth/Makefile extensions/oauth/data/Makefile extensions/oauth/data/ui/Makefile extensions/photo_importer/Makefile extensions/photo_importer/data/Makefile extensions/photo_importer/data/ui/Makefile extensions/photobucket/Makefile extensions/photobucket/data/Makefile extensions/photobucket/data/ui/Makefile extensions/picasaweb/Makefile extensions/picasaweb/data/Makefile extensions/picasaweb/data/ui/Makefile extensions/pixbuf_savers/Makefile extensions/pixbuf_savers/data/Makefile extensions/pixbuf_savers/data/ui/Makefile extensions/raw_files/Makefile extensions/red_eye_removal/Makefile extensions/red_eye_removal/data/Makefile extensions/red_eye_removal/data/ui/Makefile extensions/rename_series/Makefile extensions/rename_series/data/Makefile extensions/rename_series/data/ui/Makefile extensions/resize_images/Makefile extensions/resize_images/data/Makefile extensions/resize_images/data/ui/Makefile extensions/search/Makefile extensions/search/data/Makefile extensions/search/data/ui/Makefile extensions/slideshow/Makefile extensions/slideshow/data/Makefile extensions/slideshow/data/ui/Makefile extensions/webalbums/Makefile extensions/webalbums/data/Makefile extensions/webalbums/data/albumthemes/Makefile extensions/webalbums/data/albumthemes/Classic/Makefile extensions/webalbums/data/albumthemes/ClassicClips/Makefile extensions/webalbums/data/albumthemes/NeatRound/Makefile extensions/webalbums/data/albumthemes/Wiki/Makefile extensions/webalbums/data/ui/Makefile gthumb/Makefile po/Makefile.in tests/Makefile" +ac_config_files="$ac_config_files Makefile copy-n-paste/Makefile data/Makefile data/gthumb.desktop.in data/gthumb-${GTHUMB_API_VERSION}.pc:data/gthumb.pc.in data/gthumb-import.desktop.in data/icons/Makefile data/icons/hicolor/Makefile data/icons/hicolor/16x16/Makefile data/icons/hicolor/16x16/actions/Makefile data/icons/hicolor/16x16/apps/Makefile data/icons/hicolor/22x22/Makefile data/icons/hicolor/22x22/actions/Makefile data/icons/hicolor/22x22/apps/Makefile data/icons/hicolor/24x24/Makefile data/icons/hicolor/24x24/actions/Makefile data/icons/hicolor/32x32/Makefile data/icons/hicolor/32x32/apps/Makefile data/icons/hicolor/48x48/Makefile data/icons/hicolor/48x48/actions/Makefile data/icons/hicolor/48x48/apps/Makefile data/icons/hicolor/scalable/Makefile data/icons/hicolor/scalable/actions/Makefile data/icons/hicolor/scalable/apps/Makefile data/ui/Makefile help/Makefile m4/Makefile extensions/Makefile extensions/23hq/Makefile extensions/bookmarks/Makefile extensions/bookmarks/data/Makefile extensions/bookmarks/data/ui/Makefile extensions/burn_disc/Makefile extensions/burn_disc/data/Makefile extensions/burn_disc/data/ui/Makefile extensions/cairo_io/Makefile extensions/catalogs/Makefile extensions/catalogs/data/Makefile extensions/catalogs/data/ui/Makefile extensions/change_date/Makefile extensions/change_date/data/Makefile extensions/change_date/data/ui/Makefile extensions/comments/Makefile extensions/comments/data/Makefile extensions/comments/data/ui/Makefile extensions/contact_sheet/Makefile extensions/contact_sheet/data/Makefile extensions/contact_sheet/data/contact_sheet_themes/Makefile extensions/contact_sheet/data/ui/Makefile extensions/convert_format/Makefile extensions/convert_format/data/Makefile extensions/convert_format/data/ui/Makefile extensions/desktop_background/Makefile extensions/edit_metadata/Makefile extensions/edit_metadata/data/Makefile extensions/edit_metadata/data/ui/Makefile extensions/exiv2_tools/Makefile extensions/exiv2_tools/data/Makefile extensions/exiv2_tools/data/ui/Makefile extensions/export_tools/Makefile extensions/facebook/Makefile extensions/facebook/data/Makefile extensions/facebook/data/ui/Makefile extensions/file_manager/Makefile extensions/file_tools/Makefile extensions/file_tools/data/Makefile extensions/file_tools/data/ui/Makefile extensions/file_viewer/Makefile extensions/find_duplicates/Makefile extensions/find_duplicates/data/Makefile extensions/find_duplicates/data/ui/Makefile extensions/flicker_utils/Makefile extensions/flicker_utils/data/Makefile extensions/flicker_utils/data/ui/Makefile extensions/flicker/Makefile extensions/gstreamer_tools/Makefile extensions/gstreamer_tools/data/Makefile extensions/gstreamer_tools/data/ui/Makefile extensions/gstreamer_utils/Makefile extensions/image_print/Makefile extensions/image_print/data/Makefile extensions/image_print/data/ui/Makefile extensions/image_rotation/Makefile extensions/image_viewer/Makefile extensions/image_viewer/data/Makefile extensions/image_viewer/data/ui/Makefile extensions/importer/Makefile extensions/importer/data/Makefile extensions/importer/data/ui/Makefile extensions/jpeg_utils/Makefile extensions/list_tools/Makefile extensions/list_tools/data/Makefile extensions/list_tools/data/ui/Makefile extensions/map_view/Makefile extensions/oauth/Makefile extensions/oauth/data/Makefile extensions/oauth/data/ui/Makefile extensions/photo_importer/Makefile extensions/photo_importer/data/Makefile extensions/photo_importer/data/ui/Makefile extensions/photobucket/Makefile extensions/photobucket/data/Makefile extensions/photobucket/data/ui/Makefile extensions/picasaweb/Makefile extensions/picasaweb/data/Makefile extensions/picasaweb/data/ui/Makefile extensions/pixbuf_savers/Makefile extensions/pixbuf_savers/data/Makefile extensions/pixbuf_savers/data/ui/Makefile extensions/raw_files/Makefile extensions/red_eye_removal/Makefile extensions/red_eye_removal/data/Makefile extensions/red_eye_removal/data/ui/Makefile extensions/rename_series/Makefile extensions/rename_series/data/Makefile extensions/rename_series/data/ui/Makefile extensions/resize_images/Makefile extensions/resize_images/data/Makefile extensions/resize_images/data/ui/Makefile extensions/search/Makefile extensions/search/data/Makefile extensions/search/data/ui/Makefile extensions/selections/Makefile extensions/slideshow/Makefile extensions/slideshow/data/Makefile extensions/slideshow/data/ui/Makefile extensions/webalbums/Makefile extensions/webalbums/data/Makefile extensions/webalbums/data/albumthemes/Makefile extensions/webalbums/data/albumthemes/Classic/Makefile extensions/webalbums/data/albumthemes/ClassicClips/Makefile extensions/webalbums/data/albumthemes/NeatRound/Makefile extensions/webalbums/data/albumthemes/Wiki/Makefile extensions/webalbums/data/ui/Makefile gthumb/Makefile po/Makefile.in tests/Makefile" cat >confcache <<\_ACEOF @@ -21216,10 +21326,6 @@ as_fn_error $? "conditional \"BUILD_TEST_SUITE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_UNIQUE_TRUE}" && test -z "${ENABLE_UNIQUE_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_UNIQUE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${ENABLE_EXIV2_TRUE}" && test -z "${ENABLE_EXIV2_FALSE}"; then as_fn_error $? "conditional \"ENABLE_EXIV2\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21240,10 +21346,6 @@ ac_config_commands="$ac_config_commands po/stamp-it" -if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then - as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then as_fn_error $? "conditional \"PLATFORM_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21260,6 +21362,10 @@ as_fn_error $? "conditional \"HAVE_LIBJPEG_80\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_LIBRSVG_TRUE}" && test -z "${ENABLE_LIBRSVG_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_LIBRSVG\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_WEB_SERVICES_TRUE}" && test -z "${ENABLE_WEB_SERVICES_FALSE}"; then as_fn_error $? "conditional \"ENABLE_WEB_SERVICES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21693,7 +21799,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gthumb $as_me 2.14.3, which was +This file was extended by gthumb $as_me 3.0.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21759,7 +21865,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gthumb config.status 2.14.3 +gthumb config.status 3.0.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -22282,6 +22388,8 @@ "data/icons/hicolor/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/22x22/Makefile" ;; "data/icons/hicolor/22x22/actions/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/22x22/actions/Makefile" ;; "data/icons/hicolor/22x22/apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/22x22/apps/Makefile" ;; + "data/icons/hicolor/24x24/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/24x24/Makefile" ;; + "data/icons/hicolor/24x24/actions/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/24x24/actions/Makefile" ;; "data/icons/hicolor/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/32x32/Makefile" ;; "data/icons/hicolor/32x32/apps/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/32x32/apps/Makefile" ;; "data/icons/hicolor/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/hicolor/48x48/Makefile" ;; @@ -22330,7 +22438,6 @@ "extensions/facebook/data/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/facebook/data/Makefile" ;; "extensions/facebook/data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/facebook/data/ui/Makefile" ;; "extensions/file_manager/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/file_manager/Makefile" ;; - "extensions/file_manager/data/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/file_manager/data/Makefile" ;; "extensions/file_tools/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/file_tools/Makefile" ;; "extensions/file_tools/data/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/file_tools/data/Makefile" ;; "extensions/file_tools/data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/file_tools/data/ui/Makefile" ;; @@ -22389,6 +22496,7 @@ "extensions/search/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/search/Makefile" ;; "extensions/search/data/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/search/data/Makefile" ;; "extensions/search/data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/search/data/ui/Makefile" ;; + "extensions/selections/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/selections/Makefile" ;; "extensions/slideshow/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/slideshow/Makefile" ;; "extensions/slideshow/data/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/slideshow/data/Makefile" ;; "extensions/slideshow/data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/slideshow/data/ui/Makefile" ;; @@ -23963,7 +24071,6 @@ Debug : $ENABLE_DEBUG Run in place : ${enable_run_in_place} Build tests : $ENABLE_TEST_SUITE - Use libunique : ${enable_unique} Exiv2 support : ${enable_exiv2} JPEG tools : ${enable_jpeg} TIFF tools : ${enable_tiff} @@ -23976,5 +24083,5 @@ Web albums : ${enable_web_albums} SM client support : ${with_smclient} Map support : ${enable_libchamplain} - GNOME 3 support : ${enable_gnome_3} + SVG support : ${enable_librsvg} " diff -Nru gthumb-2.14.3/configure.ac gthumb-3.0.0/configure.ac --- gthumb-2.14.3/configure.ac 2012-03-25 10:05:58.000000000 +0000 +++ gthumb-3.0.0/configure.ac 2012-04-23 18:09:29.000000000 +0000 @@ -1,13 +1,24 @@ +m4_define([gthumb_major_version], [3]) +m4_define([gthumb_minor_version], [0]) +m4_define([gthumb_micro_version], [0]) +m4_define([gthumb_version], + [gthumb_major_version.gthumb_minor_version.gthumb_micro_version]) +m4_define([gthumb_api_version], + [gthumb_major_version.gthumb_minor_version]) + AC_PREREQ(2.63) -AC_INIT([gthumb],[2.14.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb]) +AC_INIT([gthumb], [gthumb_version], + [http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb], + [gthumb]) AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([configure.ac]) -GTHUMB_API_VERSION=2.14 +GTHUMB_API_VERSION=gthumb_api_version AC_SUBST([GTHUMB_API_VERSION]) +AC_DEFINE_UNQUOTED([GTHUMB_API_VERSION],["$GTHUMB_API_VERSION"],[gThumb API version]) if test -z "$enable_maintainer_mode"; then enable_maintainer_mode=yes @@ -42,21 +53,21 @@ GNOME_MAINTAINER_MODE_DEFINES GNOME_COMPILE_WARNINGS([maximum]) GNOME_CXX_WARNINGS +GLIB_GSETTINGS GTHUMB_EXTENSION_RULES GLIB_REQUIRED=2.28.0 -GTK_REQUIRED=2.24.0 -GCONF_REQUIRED=2.6.0 -EXIV2_REQUIRED=0.18 +GTK_REQUIRED=3.2.0 +EXIV2_REQUIRED=0.21 CLUTTER_REQUIRED=1.0.0 -CLUTTER_GTK_REQUIRED=0.10.0 +CLUTTER_GTK_REQUIRED=1.0.0 GSTREAMER_REQUIRED=0.10 OPENRAW_REQUIRED=0.0.8 -UNIQUE_REQUIRED=1.1.2 -LIBSOUP_REQUIRED=2.26 -GNOME_KEYRING_REQUIRED=2.28 -LIBBRASERO_REQUIRED=2.28 -LIBCHAMPLAIN_REQUIRED=0.8.0 +LIBSOUP_REQUIRED=2.36 +GNOME_KEYRING_REQUIRED=3.2.0 +LIBBRASERO_REQUIRED=3.2.0 +LIBCHAMPLAIN_REQUIRED=0.12.0 +LIBRSVG_REQUIRED=2.34.0 dnl =========================================================================== @@ -125,7 +136,7 @@ dnl =========================================================================== -PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= $GTK_REQUIRED]) +PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_REQUIRED]) AC_SUBST([GTK_CFLAGS]) AC_SUBST([GTK_LIBS]) @@ -134,11 +145,9 @@ gthread-2.0 gmodule-2.0 gio-unix-2.0 - gtk+-2.0 >= $GTK_REQUIRED - gconf-2.0 >= $GCONF_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED libpng zlib - ice ]) AC_SUBST(GTHUMB_LIBS) AC_SUBST(GTHUMB_CFLAGS) @@ -160,22 +169,6 @@ dnl =========================================================================== -AC_ARG_ENABLE([unique], - [AS_HELP_STRING([--disable-unique],[do not compile code that uses the libunique library])],, - [enable_unique=yes]) - -if test x$enable_unique = xyes ; then - PKG_CHECK_MODULES(UNIQUE, - unique-1.0 >= $UNIQUE_REQUIRED, - [enable_unique=yes], - [enable_unique=no]) -fi -AC_SUBST(UNIQUE_LIBS) -AC_SUBST(UNIQUE_CFLAGS) -AM_CONDITIONAL(ENABLE_UNIQUE, test "x$enable_unique" = xyes) - -dnl =========================================================================== - AC_ARG_ENABLE([exiv2], [AS_HELP_STRING([--disable-exiv2],[do not compile code that uses the exiv2 library])],, [enable_exiv2=yes]) @@ -202,7 +195,7 @@ if test x$enable_clutter = xyes ; then PKG_CHECK_MODULES(CLUTTER, [clutter-1.0 >= $CLUTTER_REQUIRED - clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED], + clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED], [enable_clutter=yes], [enable_clutter=no]) fi @@ -240,8 +233,8 @@ if test x$enable_libchamplain = xyes ; then PKG_CHECK_MODULES(LIBCHAMPLAIN, - [champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED - champlain-gtk-0.8 >= $LIBCHAMPLAIN_REQUIRED], + [champlain-0.12 >= $LIBCHAMPLAIN_REQUIRED + champlain-gtk-0.12 >= $LIBCHAMPLAIN_REQUIRED], [enable_libchamplain=yes], [enable_libchamplain=no]) fi @@ -255,16 +248,6 @@ dnl =========================================================================== -AC_ARG_ENABLE([gnome-3], - [AS_HELP_STRING([--disable-gnome-3],[do not compile code specific to GNOME Desktop version 3.0 or higher])],, - [enable_gnome_3=yes]) - -if test x$enable_gnome_3 = xyes ; then - AC_DEFINE(HAVE_GNOME_3, 1, [Define to 1 if gthumb is intended to be used with GNOME Desktop 3.0 or higher]) -fi - -dnl =========================================================================== - IT_PROG_INTLTOOL([0.35.0]) GETTEXT_PACKAGE=gthumb AC_SUBST([GETTEXT_PACKAGE]) @@ -279,14 +262,6 @@ dnl =========================================================================== -AC_PATH_PROG(GCONFTOOL, gconftool-2, no) -if test x"$GCONFTOOL" = xno; then - AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) -fi -AM_GCONF_SOURCE_2 - -dnl =========================================================================== - AC_MSG_CHECKING([for some Win32 platform]) case "$host" in *-*-cygwin*|*-*-mingw*) @@ -465,6 +440,25 @@ dnl =========================================================================== +AC_ARG_ENABLE([librsvg], + [AS_HELP_STRING([--disable-librsvg],[do not compile code that uses the librsvg library [default=yes]])],, + [enable_librsvg=yes]) + +if test x$enable_librsvg = xyes ; then + PKG_CHECK_MODULES(LIBRSVG, + librsvg-2.0 >= $LIBRSVG_REQUIRED, + [enable_librsvg=yes], + [enable_librsvg=no]) + if test "x$enable_librsvg" = "xyes"; then + AC_DEFINE(HAVE_LIBRSVG, 1, [Define to 1 if librsvg support is included]) + fi +fi +AC_SUBST(LIBRSVG_LIBS) +AC_SUBST(LIBRSVG_CFLAGS) +AM_CONDITIONAL(ENABLE_LIBRSVG, test "x$enable_librsvg" = xyes) + +dnl =========================================================================== + AC_ARG_ENABLE([gnome-keyring], [AS_HELP_STRING([--disable-gnome-keyring],[do not compile code that uses the gnome-keyring library])],, [enable_gnome_keyring=yes]) @@ -509,7 +503,7 @@ if test x$enable_libbrasero = xyes ; then PKG_CHECK_MODULES(LIBBRASERO, - [libbrasero-burn >= $LIBBRASERO_REQUIRED], + [libbrasero-burn3 >= $LIBBRASERO_REQUIRED], [AC_DEFINE(HAVE_LIBBRASERO, 1, [Have libbrasero]) enable_libbrasero=yes], [enable_libbrasero=no]) @@ -545,14 +539,16 @@ AC_MSG_CHECKING([which smclient backend to use]) AC_ARG_WITH([smclient], - [AS_HELP_STRING([--with-smclient-backend=no|xsmp|win32], - [Setting smclient backend (default:auto)])], - [], - [case "$GDK_TARGET" in + [AS_HELP_STRING([--with-smclient=no|auto|xsmp], + [Setting smclient backend (default:no)])],, + [with_smclient=no]) + +if test "$with_smclient" == "auto"; then + case "$GDK_TARGET" in x11) with_smclient=xsmp ;; - win32) with_smclient=$GDK_TARGET ;; *) with_smclient=no ;; - esac]) + esac +fi AC_MSG_RESULT([$with_smclient]) @@ -560,13 +556,14 @@ AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled]) case "$with_smclient" in - xsmp) SMCLIENT_PKGS="sm >= 1.0.0" ;; + xsmp) SMCLIENT_PKGS="sm >= 1.0.0 ice" ;; *) SMCLIENT_PKGS="" ;; esac PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS]) AC_SUBST([SMCLIENT_CFLAGS]) AC_SUBST([SMCLIENT_LIBS]) + AC_DEFINE(USE_SMCLIENT, 1, [Use a session menager]) fi AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"]) @@ -590,6 +587,8 @@ data/icons/hicolor/22x22/Makefile data/icons/hicolor/22x22/actions/Makefile data/icons/hicolor/22x22/apps/Makefile +data/icons/hicolor/24x24/Makefile +data/icons/hicolor/24x24/actions/Makefile data/icons/hicolor/32x32/Makefile data/icons/hicolor/32x32/apps/Makefile data/icons/hicolor/48x48/Makefile @@ -638,7 +637,6 @@ extensions/facebook/data/Makefile extensions/facebook/data/ui/Makefile extensions/file_manager/Makefile -extensions/file_manager/data/Makefile extensions/file_tools/Makefile extensions/file_tools/data/Makefile extensions/file_tools/data/ui/Makefile @@ -697,6 +695,7 @@ extensions/search/Makefile extensions/search/data/Makefile extensions/search/data/ui/Makefile +extensions/selections/Makefile extensions/slideshow/Makefile extensions/slideshow/data/Makefile extensions/slideshow/data/ui/Makefile @@ -725,7 +724,6 @@ Debug : $ENABLE_DEBUG Run in place : ${enable_run_in_place} Build tests : $ENABLE_TEST_SUITE - Use libunique : ${enable_unique} Exiv2 support : ${enable_exiv2} JPEG tools : ${enable_jpeg} TIFF tools : ${enable_tiff} @@ -738,5 +736,5 @@ Web albums : ${enable_web_albums} SM client support : ${with_smclient} Map support : ${enable_libchamplain} - GNOME 3 support : ${enable_gnome_3} + SVG support : ${enable_librsvg} " diff -Nru gthumb-2.14.3/copy-n-paste/eggdesktopfile.c gthumb-3.0.0/copy-n-paste/eggdesktopfile.c --- gthumb-2.14.3/copy-n-paste/eggdesktopfile.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/copy-n-paste/eggdesktopfile.c 2012-02-19 15:01:31.000000000 +0000 @@ -16,8 +16,9 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; see the file COPYING.LIB. - * If not, see . + * License along with this library; see the file COPYING.LIB. If not, + * write to the Free Software Foundation, Inc., 59 Temple Place - + * Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H @@ -184,6 +185,9 @@ { g_set_error (error, EGG_DESKTOP_FILE_ERROR, EGG_DESKTOP_FILE_ERROR_INVALID, + /* translators: 'Version' is from a desktop file, and + * should not be translated. '%s' would probably be a + * version number. */ _("Unrecognized desktop file Version '%s'"), version); g_free (version); g_key_file_free (key_file); @@ -200,8 +204,11 @@ else desktop_file->source = g_strdup (source); - desktop_file->name = g_key_file_get_string (key_file, EGG_DESKTOP_FILE_GROUP, - EGG_DESKTOP_FILE_KEY_NAME, error); + desktop_file->name = g_key_file_get_locale_string (key_file, + EGG_DESKTOP_FILE_GROUP, + EGG_DESKTOP_FILE_KEY_NAME, + NULL, + error); if (!desktop_file->name) { egg_desktop_file_free (desktop_file); @@ -430,6 +437,16 @@ error); } +int +egg_desktop_file_get_integer (EggDesktopFile *desktop_file, + const char *key, + GError **error) +{ + return g_key_file_get_integer (desktop_file->key_file, + EGG_DESKTOP_FILE_GROUP, key, + error); +} + char ** egg_desktop_file_get_string_list (EggDesktopFile *desktop_file, const char *key, @@ -1273,8 +1290,8 @@ out: if (env) { - g_strfreev ((char **)env->pdata); - g_ptr_array_free (env, FALSE); + g_ptr_array_foreach (env, (GFunc)g_free, NULL); + g_ptr_array_free (env, TRUE); } free_document_list (translated_documents); @@ -1369,6 +1386,8 @@ { g_set_error (error, EGG_DESKTOP_FILE_ERROR, EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE, + /* translators: The 'Type=Link' string is found in a + * desktop file, and should not be translated. */ _("Can't pass document URIs to a 'Type=Link' desktop entry")); return FALSE; } @@ -1385,6 +1404,8 @@ free_document_list (documents); break; + case EGG_DESKTOP_FILE_TYPE_UNRECOGNIZED: + case EGG_DESKTOP_FILE_TYPE_DIRECTORY: default: g_set_error (error, EGG_DESKTOP_FILE_ERROR, EGG_DESKTOP_FILE_ERROR_NOT_LAUNCHABLE, @@ -1407,23 +1428,9 @@ G_LOCK_DEFINE_STATIC (egg_desktop_file); static EggDesktopFile *egg_desktop_file; -/** - * egg_set_desktop_file: - * @desktop_file_path: path to the application's desktop file - * - * Creates an #EggDesktopFile for the application from the data at - * @desktop_file_path. This will also call g_set_application_name() - * with the localized application name from the desktop file, and - * gtk_window_set_default_icon_name() or - * gtk_window_set_default_icon_from_file() with the application's - * icon. Other code may use additional information from the desktop - * file. - * - * Note that for thread safety reasons, this function can only - * be called once. - **/ -void -egg_set_desktop_file (const char *desktop_file_path) +static void +egg_set_desktop_file_internal (const char *desktop_file_path, + gboolean set_defaults) { GError *error = NULL; @@ -1439,7 +1446,7 @@ g_error_free (error); } - if (egg_desktop_file) { + if (set_defaults && egg_desktop_file != NULL) { /* Set localized application name and default window icon */ if (egg_desktop_file->name) g_set_application_name (egg_desktop_file->name); @@ -1456,6 +1463,51 @@ } /** + * egg_set_desktop_file: + * @desktop_file_path: path to the application's desktop file + * + * Creates an #EggDesktopFile for the application from the data at + * @desktop_file_path. This will also call g_set_application_name() + * with the localized application name from the desktop file, and + * gtk_window_set_default_icon_name() or + * gtk_window_set_default_icon_from_file() with the application's + * icon. Other code may use additional information from the desktop + * file. + * See egg_set_desktop_file_without_defaults() for a variant of this + * function that does not set the application name and default window + * icon. + * + * Note that for thread safety reasons, this function can only + * be called once, and is mutually exclusive with calling + * egg_set_desktop_file_without_defaults(). + **/ +void +egg_set_desktop_file (const char *desktop_file_path) +{ + egg_set_desktop_file_internal (desktop_file_path, TRUE); +} + +/** + * egg_set_desktop_file_without_defaults: + * @desktop_file_path: path to the application's desktop file + * + * Creates an #EggDesktopFile for the application from the data at + * @desktop_file_path. + * See egg_set_desktop_file() for a variant of this function that + * sets the application name and default window icon from the information + * in the desktop file. + * + * Note that for thread safety reasons, this function can only + * be called once, and is mutually exclusive with calling + * egg_set_desktop_file(). + **/ +void +egg_set_desktop_file_without_defaults (const char *desktop_file_path) +{ + egg_set_desktop_file_internal (desktop_file_path, FALSE); +} + +/** * egg_get_desktop_file: * * Gets the application's #EggDesktopFile, as set by diff -Nru gthumb-2.14.3/copy-n-paste/eggdesktopfile.h gthumb-3.0.0/copy-n-paste/eggdesktopfile.h --- gthumb-2.14.3/copy-n-paste/eggdesktopfile.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/copy-n-paste/eggdesktopfile.h 2012-02-19 15:01:31.000000000 +0000 @@ -12,8 +12,9 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; see the file COPYING.LIB. - * If not, see . + * License along with this library; see the file COPYING.LIB. If not, + * write to the Free Software Foundation, Inc., 59 Temple Place - + * Suite 330, Boston, MA 02111-1307, USA. */ #ifndef __EGG_DESKTOP_FILE_H__ @@ -126,6 +127,9 @@ double egg_desktop_file_get_numeric (EggDesktopFile *desktop_file, const char *key, GError **error); +int egg_desktop_file_get_integer (EggDesktopFile *desktop_file, + const char *key, + GError **error); char **egg_desktop_file_get_string_list (EggDesktopFile *desktop_file, const char *key, gsize *length, @@ -149,8 +153,9 @@ } EggDesktopFileError; /* Global application desktop file */ -void egg_set_desktop_file (const char *desktop_file_path); -EggDesktopFile *egg_get_desktop_file (void); +void egg_set_desktop_file (const char *desktop_file_path); +void egg_set_desktop_file_without_defaults (const char *desktop_file_path); +EggDesktopFile *egg_get_desktop_file (void); G_END_DECLS diff -Nru gthumb-2.14.3/copy-n-paste/eggsmclient.c gthumb-3.0.0/copy-n-paste/eggsmclient.c --- gthumb-2.14.3/copy-n-paste/eggsmclient.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/copy-n-paste/eggsmclient.c 2012-02-19 15:01:31.000000000 +0000 @@ -202,7 +202,8 @@ * use the same client id. */ g_unsetenv ("DESKTOP_AUTOSTART_ID"); - if (EGG_SM_CLIENT_GET_CLASS (client)->startup) + if (global_client_mode != EGG_SM_CLIENT_MODE_DISABLED && + EGG_SM_CLIENT_GET_CLASS (client)->startup) EGG_SM_CLIENT_GET_CLASS (client)->startup (client, sm_client_id); return TRUE; } @@ -265,9 +266,9 @@ * Sets the "mode" of #EggSMClient as follows: * * %EGG_SM_CLIENT_MODE_DISABLED: Session management is completely - * disabled. The application will not even connect to the session - * manager. (egg_sm_client_get() will still return an #EggSMClient, - * but it will just be a dummy object.) + * disabled, until the mode is changed again. The application will + * not even connect to the session manager. (egg_sm_client_get() + * will still return an #EggSMClient object.) * * %EGG_SM_CLIENT_MODE_NO_RESTART: The application will connect to * the session manager (and thus will receive notification when the @@ -277,12 +278,27 @@ * %EGG_SM_CLIENT_MODE_NORMAL: The default. #EggSMCLient will * function normally. * - * This must be called before the application's main loop begins. + * This must be called before the application's main loop begins and + * before any call to egg_sm_client_get(), unless the mode was set + * earlier to %EGG_SM_CLIENT_MODE_DISABLED and this call enables + * session management. Note that option parsing will call + * egg_sm_client_get(). **/ void egg_sm_client_set_mode (EggSMClientMode mode) { + EggSMClientMode old_mode = global_client_mode; + + g_return_if_fail (global_client == NULL || global_client_mode == EGG_SM_CLIENT_MODE_DISABLED); + g_return_if_fail (!(global_client != NULL && mode == EGG_SM_CLIENT_MODE_DISABLED)); + global_client_mode = mode; + + if (global_client != NULL && old_mode == EGG_SM_CLIENT_MODE_DISABLED) + { + if (EGG_SM_CLIENT_GET_CLASS (global_client)->startup) + EGG_SM_CLIENT_GET_CLASS (global_client)->startup (global_client, sm_client_id); + } } /** @@ -317,8 +333,7 @@ { if (!global_client) { - if (global_client_mode != EGG_SM_CLIENT_MODE_DISABLED && - !sm_client_disable) + if (!sm_client_disable) { #if defined (GDK_WINDOWING_WIN32) global_client = egg_sm_client_win32_new (); diff -Nru gthumb-2.14.3/copy-n-paste/eggsmclient-private.h gthumb-3.0.0/copy-n-paste/eggsmclient-private.h --- gthumb-2.14.3/copy-n-paste/eggsmclient-private.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/copy-n-paste/eggsmclient-private.h 2012-02-19 15:01:31.000000000 +0000 @@ -20,7 +20,13 @@ #ifndef __EGG_SM_CLIENT_PRIVATE_H__ #define __EGG_SM_CLIENT_PRIVATE_H__ -#include +#include + +#if !GTK_CHECK_VERSION(2,91,7) && !GTK_CHECK_VERSION(3,0,0) +/* GTK+ 3 includes this automatically */ +#include +#endif + #include "eggsmclient.h" G_BEGIN_DECLS diff -Nru gthumb-2.14.3/copy-n-paste/eggsmclient-xsmp.c gthumb-3.0.0/copy-n-paste/eggsmclient-xsmp.c --- gthumb-2.14.3/copy-n-paste/eggsmclient-xsmp.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/copy-n-paste/eggsmclient-xsmp.c 2012-02-19 15:01:31.000000000 +0000 @@ -193,6 +193,11 @@ EggSMClient * egg_sm_client_xsmp_new (void) { +#if GTK_CHECK_VERSION(3,0,0) + if (!GDK_IS_X11_DISPLAY_MANAGER (gdk_display_manager_get ())) + return NULL; +#endif + if (!g_getenv ("SESSION_MANAGER")) return NULL; @@ -368,7 +373,11 @@ free (ret_client_id); gdk_threads_enter (); +#if !GTK_CHECK_VERSION(2,23,3) && !GTK_CHECK_VERSION(3,0,0) + gdk_set_sm_client_id (xsmp->client_id); +#else gdk_x11_set_sm_client_id (xsmp->client_id); +#endif gdk_threads_leave (); g_debug ("Got client ID \"%s\"", xsmp->client_id); @@ -1053,13 +1062,13 @@ if (client_id) { - g_ptr_array_add (cmd, "--sm-client-id"); + g_ptr_array_add (cmd, (char *)"--sm-client-id"); g_ptr_array_add (cmd, (char *)client_id); } if (state_file) { - g_ptr_array_add (cmd, "--sm-client-state-file"); + g_ptr_array_add (cmd, (char *)"--sm-client-state-file"); g_ptr_array_add (cmd, (char *)state_file); } @@ -1142,7 +1151,7 @@ prop = g_new (SmProp, 1); prop->name = (char *)name; - prop->type = SmLISTofARRAY8; + prop->type = (char *)SmLISTofARRAY8; vals = g_array_new (FALSE, FALSE, sizeof (SmPropValue)); @@ -1176,7 +1185,7 @@ prop = g_new (SmProp, 1); prop->name = (char *)name; - prop->type = SmLISTofARRAY8; + prop->type = (char *)SmLISTofARRAY8; vals = g_array_new (FALSE, FALSE, sizeof (SmPropValue)); @@ -1206,7 +1215,7 @@ prop = g_new (SmProp, 1); prop->name = (char *)name; - prop->type = SmARRAY8; + prop->type = (char *)SmARRAY8; prop->num_vals = 1; prop->vals = g_new (SmPropValue, 1); @@ -1231,7 +1240,7 @@ prop = g_new (SmProp, 1); prop->name = (char *)name; - prop->type = SmCARD8; + prop->type = (char *)SmCARD8; prop->num_vals = 1; prop->vals = g_new (SmPropValue, 2); diff -Nru gthumb-2.14.3/copy-n-paste/Makefile.am gthumb-3.0.0/copy-n-paste/Makefile.am --- gthumb-2.14.3/copy-n-paste/Makefile.am 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/copy-n-paste/Makefile.am 2012-02-19 15:01:31.000000000 +0000 @@ -1,18 +1,25 @@ noinst_LTLIBRARIES = libeggsmclient.la -libeggsmclient_la_LIBADD = $(SMCLIENT_LIBS) \ - $(GTK_LIBS) +libeggsmclient_la_LIBADD = \ + $(SMCLIENT_LIBS) \ + $(GTK_LIBS) -libeggsmclient_la_CFLAGS = -DG_LOG_DOMAIN=\""EggSMClient"\" \ - -DEGG_SM_CLIENT_BACKEND_XSMP \ - $(SMCLIENT_CFLAGS) \ - $(GTK_CFLAGS) +libeggsmclient_la_CFLAGS = \ + -DG_LOG_DOMAIN=\""EggSMClient"\" \ + -DEGG_SM_CLIENT_BACKEND_XSMP \ + $(SMCLIENT_CFLAGS) \ + $(GTK_CFLAGS) -libeggsmclient_la_SOURCES = eggdesktopfile.h \ - eggdesktopfile.c \ - eggsmclient.h \ - eggsmclient.c \ - eggsmclient-private.h \ - eggsmclient-xsmp.c +libeggsmclient_la_SOURCES = \ + eggdesktopfile.h \ + eggdesktopfile.c + +if WITH_SMCLIENT +libeggsmclient_la_SOURCES += \ + eggsmclient.h \ + eggsmclient.c \ + eggsmclient-private.h \ + eggsmclient-xsmp.c +endif -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/copy-n-paste/Makefile.in gthumb-3.0.0/copy-n-paste/Makefile.in --- gthumb-2.14.3/copy-n-paste/Makefile.in 2012-03-25 18:34:06.000000000 +0000 +++ gthumb-3.0.0/copy-n-paste/Makefile.in 2012-04-23 18:09:42.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,6 +51,12 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@WITH_SMCLIENT_TRUE@am__append_1 = \ +@WITH_SMCLIENT_TRUE@ eggsmclient.h \ +@WITH_SMCLIENT_TRUE@ eggsmclient.c \ +@WITH_SMCLIENT_TRUE@ eggsmclient-private.h \ +@WITH_SMCLIENT_TRUE@ eggsmclient-xsmp.c + subdir = copy-n-paste DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -52,9 +75,13 @@ am__DEPENDENCIES_1 = libeggsmclient_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +am__libeggsmclient_la_SOURCES_DIST = eggdesktopfile.h eggdesktopfile.c \ + eggsmclient.h eggsmclient.c eggsmclient-private.h \ + eggsmclient-xsmp.c +@WITH_SMCLIENT_TRUE@am__objects_1 = libeggsmclient_la-eggsmclient.lo \ +@WITH_SMCLIENT_TRUE@ libeggsmclient_la-eggsmclient-xsmp.lo am_libeggsmclient_la_OBJECTS = libeggsmclient_la-eggdesktopfile.lo \ - libeggsmclient_la-eggsmclient.lo \ - libeggsmclient_la-eggsmclient-xsmp.lo + $(am__objects_1) libeggsmclient_la_OBJECTS = $(am_libeggsmclient_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -90,7 +117,12 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libeggsmclient_la_SOURCES) -DIST_SOURCES = $(libeggsmclient_la_SOURCES) +DIST_SOURCES = $(am__libeggsmclient_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -138,10 +170,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -149,6 +179,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -188,6 +219,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -236,8 +269,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -268,6 +299,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -299,21 +331,18 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libeggsmclient.la -libeggsmclient_la_LIBADD = $(SMCLIENT_LIBS) \ - $(GTK_LIBS) - -libeggsmclient_la_CFLAGS = -DG_LOG_DOMAIN=\""EggSMClient"\" \ - -DEGG_SM_CLIENT_BACKEND_XSMP \ - $(SMCLIENT_CFLAGS) \ - $(GTK_CFLAGS) - -libeggsmclient_la_SOURCES = eggdesktopfile.h \ - eggdesktopfile.c \ - eggsmclient.h \ - eggsmclient.c \ - eggsmclient-private.h \ - eggsmclient-xsmp.c +libeggsmclient_la_LIBADD = \ + $(SMCLIENT_LIBS) \ + $(GTK_LIBS) + +libeggsmclient_la_CFLAGS = \ + -DG_LOG_DOMAIN=\""EggSMClient"\" \ + -DEGG_SM_CLIENT_BACKEND_XSMP \ + $(SMCLIENT_CFLAGS) \ + $(GTK_CFLAGS) +libeggsmclient_la_SOURCES = eggdesktopfile.h eggdesktopfile.c \ + $(am__append_1) all: all-am .SUFFIXES: Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/filmholes.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/filmholes.png differ diff -Nru gthumb-2.14.3/data/gthumb-2.14.pc gthumb-3.0.0/data/gthumb-2.14.pc --- gthumb-2.14.3/data/gthumb-2.14.pc 2012-03-25 18:34:24.000000000 +0000 +++ gthumb-3.0.0/data/gthumb-2.14.pc 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -prefix=/usr/local -exec_prefix=${prefix} -libdir=${exec_prefix}/lib/gthumb -includedir=${prefix}/include/gthumb-2.14 -extensionsdir=${exec_prefix}/lib/gthumb/extensions -datarootdir=${prefix}/share -datadir=${datarootdir} - -Name: gthumb -Description: Image viewer and browser -Version: 2.14.3 -Requires: gtk+-2.0 -Libs: -L${libdir} -Cflags: -I${includedir} diff -Nru gthumb-2.14.3/data/gthumb-3.0.pc gthumb-3.0.0/data/gthumb-3.0.pc --- gthumb-2.14.3/data/gthumb-3.0.pc 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/gthumb-3.0.pc 2012-04-23 18:15:31.000000000 +0000 @@ -0,0 +1,14 @@ +prefix=/usr/local +exec_prefix=${prefix} +libdir=${exec_prefix}/lib/gthumb +includedir=${prefix}/include/gthumb-3.0 +extensionsdir=${exec_prefix}/lib/gthumb/extensions +datarootdir=${prefix}/share +datadir=${datarootdir} + +Name: gthumb +Description: Image viewer and browser +Version: 3.0.0 +Requires: gtk+-3.0 +Libs: -L${libdir} +Cflags: -I${includedir} diff -Nru gthumb-2.14.3/data/gthumb.convert gthumb-3.0.0/data/gthumb.convert --- gthumb-2.14.3/data/gthumb.convert 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/gthumb.convert 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,218 @@ +[org.gnome.gthumb.browser] +go-to-last-location = /apps/gthumb/general/go_to_last_location +use-startup-location = /apps/gthumb/general/use_startup_location +startup-location = /apps/gthumb/general/startup_location +startup-current-file = /apps/gthumb/general/startup_current_file +general-filter = /apps/gthumb/browser/general_filter +show-hidden-files = /apps/gthumb/browser/show_hidden_files +show-thumbnails = /apps/gthumb/browser/show_thumbnails +fast-file-type = /apps/gthumb/browser/fast_file_type +save-thumbnails = /apps/gthumb/browser/save_thumbnails +thumbnail-size = /apps/gthumb/browser/thumbnail_size +thumbnail-limit = /apps/gthumb/browser/thumbnail_limit +thumbnail-caption = /apps/gthumb/browser/thumbnail_caption +sort-type = /apps/gthumb/browser/sort_type +sort-inverse = /apps/gthumb/browser/sort_inverse +toolbar-style = /apps/gthumb/ui/toolbar_style +window-width = /apps/gthumb/ui/window_width +window-height = /apps/gthumb/ui/window_height +image-pane-visible = /apps/gthumb/ui/image_pane_visible +toolbar-visible = /apps/gthumb/ui/toolbar_visible +statusbar-visible = /apps/gthumb/ui/statusbar_visible +filterbar-visible = /apps/gthumb/ui/filterbar_visible +sidebar-visible = /apps/gthumb/ui/sidebar_visible +thumbnail-list-visible = /apps/gthumb/ui/thumbnail_list_visible +viewer-thumbnails-orientation = /apps/gthumb/ui/viewer_thumbnails_orientation + +[org.gnome.gthumb.contact-sheet.contact-sheet] +header = /apps/gthumb/ext/contact_sheet/header +footer = /apps/gthumb/ext/contact_sheet/footer +destination = /apps/gthumb/ext/contact_sheet/destination +template = /apps/gthumb/ext/contact_sheet/template +mime-type = /apps/gthumb/ext/contact_sheet/mime_type +html-image-map = /apps/gthumb/ext/contact_sheet/html_image_map +theme = /apps/gthumb/ext/contact_sheet/theme +images-per-page = /apps/gthumb/ext/contact_sheet/images_per_page +single-page = /apps/gthumb/ext/contact_sheet/single_page +columns = /apps/gthumb/ext/contact_sheet/columns +sort-type = /apps/gthumb/ext/contact_sheet/sort_type +sort-inverse = /apps/gthumb/ext/contact_sheet/sort_inverse +same-size = /apps/gthumb/ext/contact_sheet/same_size +thumbnail-size = /apps/gthumb/ext/contact_sheet/thumbnail_size +squared-thumbnail = /apps/gthumb/ext/contact_sheet/squared_thumbnail +thumbnail-caption = /apps/gthumb/ext/contact_sheet/thumbnail_caption + +[org.gnome.gthumb.contact-sheet.image-wall] +destination = /apps/gthumb/ext/image_wall/destination +template = /apps/gthumb/ext/image_wall/template +mime-type = /apps/gthumb/ext/image_wall/mime_type +images-per-page = /apps/gthumb/ext/image_wall/images_per_page +single-page = /apps/gthumb/ext/image_wall/single_page +columns = /apps/gthumb/ext/image_wall/columns +sort-type = /apps/gthumb/ext/image_wall/sort_type +sort-inverse = /apps/gthumb/ext/image_wall/sort_inverse +thumbnail-size = /apps/gthumb/ext/image_wall/thumbnail_size + +[org.gnome.gthumb.convert-format] +mime-type = /apps/gthumb/ext/convert_format/mime_type + +[org.gnome.gthumb.comments] +synchronize = /apps/gthumb/ext/comments/synchronize + +[org.gnome.gthumb.crop] +grid-type = /apps/gthumb/ext/crop/grid_type +aspect-ratio = /apps/gthumb/ext/crop/aspect_ratio +aspect-ratio-invert = /apps/gthumb/ext/crop/aspect_ratio_invert +aspect-ratio-width = /apps/gthumb/ext/crop/aspect_ratio_width +aspect-ratio-height = /apps/gthumb/ext/crop/aspect_ratio_height +bind-dimensions = /apps/gthumb/ext/crop/bind_dimensions +bind-factor = /apps/gthumb/ext/crop/bind_factor + +[org.gnome.gthumb.data-migration] +catalogs-2-10 = /apps/gthumb/data_migration/catalogs_2_10 + +[org.gnome.gthumb.dialogs.messages] +cannot-move-to-trash = /apps/gthumb/dialogs/messages/cannot_move_to_trash +save-modified-image = /apps/gthumb/dialogs/messages/save_modified_image +confirm-deletion = /apps/gthumb/dialogs/messages/confirm_deletion + +[org.gnome.gthumb.dialogs.add-to-catalog] +view = /apps/gthumb/general/add_to_catalog/view + +[org.gnome.gthumb.facebook] +max-resolution = /apps/gthumb/ext/facebook/max_resolution + +[org.gnome.gthumb.file-manager] +last-folder = /apps/gthumb/ext/file_manager/copy_move/last_folder +view-destination = /apps/gthumb/ext/file_manager/copy_move/view_destination + +[org.gnome.gthumb.general] +active-extensions = /apps/gthumb/general/active_extensions +store-metadata-in-files = /apps/gthumb/general/store_metadata_in_files + +[org.gnome.gthumb.gstreamer-tools] +screenshot-location = /apps/gthumb/ext/gstreamer/screenshot_location + +[org.gnome.gthumb.image-print] +caption = /apps/gthumb/ext/image_print/caption +font-name = /apps/gthumb/ext/image_print/font_name +header-font-name = /apps/gthumb/ext/image_print/header_font_name +footer-font-name = /apps/gthumb/ext/image_print/footer_font_name +header = /apps/gthumb/ext/image_print/header +footer = /apps/gthumb/ext/image_print/footer +n-rows = /apps/gthumb/ext/image_print/n_rows +n-columns = /apps/gthumb/ext/image_print/n_columns +unit = /apps/gthumb/ext/image_print/unit + +[org.gnome.gthumb.image-viewer] +zoom-quality = /apps/gthumb/viewer/zoom_quality +zoom-change = /apps/gthumb/viewer/zoom_change +transparency-type = /apps/gthumb/viewer/transparency_type +reset-scrollbars = /apps/gthumb/viewer/reset_scrollbars +check-type = /apps/gthumb/viewer/check_type +check-size = /apps/gthumb/viewer/check_siz +black-background = /apps/gthumb/viewer/black_background + +[org.gnome.gthumb.importer] +destination = /apps/gthumb/ext/importer/destination +subfolder-type = /apps/gthumb/ext/importer/subfolder_type +subfolder-format = /apps/gthumb/ext/importer/subfolder_format +subfolder-single = /apps/gthumb/ext/importer/subfolder_single +subfolder-custom-format = /apps/gthumb/ext/importer/subfolder_custom_format +warn-delete-unsupported = /apps/gthumb/ext/importer/warn_delete_unsupported + +[org.gnome.gthumb.photo-importer] +delete-from-device = /apps/gthumb/ext/photo_importer/delete_from_device +adjust-orientation = /apps/gthumb/ext/photo_importer/adjust_orientation + +[org.gnome.gthumb.picasaweb] +synchronize = /apps/gthumb/ext/picasaweb/synchronize + +[org.gnome.gthumb.pixbuf-savers.jpeg] +default-ext = /apps/gthumb/save_options/jpeg/default_ext +quality = /apps/gthumb/save_options/jpeg/quality +smoothing = /apps/gthumb/save_options/jpeg/smoothing +optimize = /apps/gthumb/save_options/jpeg/optimize +progressive = /apps/gthumb/save_options/jpeg/progressive + +[org.gnome.gthumb.pixbuf-savers.png] +compression-level = /apps/gthumb/save_options/png/compression_level + +[org.gnome.gthumb.pixbuf-savers.tga] +rle-compression = /apps/gthumb/save_options/tga/rle_compression + +[org.gnome.gthumb.pixbuf-savers.tiff] +default-ext = /apps/gthumb/save_options/tiff/default_ext +compression = /apps/gthumb/save_options/tiff/compression +horizontal-resolution = /apps/gthumb/save_options/tiff/horizontal_resolution +vertical-resolution = /apps/gthumb/save_options/tiff/vertical_resolution + +[org.gnome.gthumb.rename-series] +template = /apps/gthumb/ext/rename_series/template +start-at = /apps/gthumb/ext/rename_series/start_at +sort-by = /apps/gthumb/ext/rename_series/sort_by +reverse-order = /apps/gthumb/ext/rename_series/reverse_order +change-case = /apps/gthumb/ext/rename_series/change_case + +[org.gnome.gthumb.resize] +unit = /apps/gthumb/ext/resize/unit +width = /apps/gthumb/ext/resize/width +height = /apps/gthumb/ext/resize/height +aspect-ratio-width = /apps/gthumb/ext/resize/aspect_ratio_width +aspect-ratio-height = /apps/gthumb/ext/resize/aspect_ratio_height +aspect-ratio = /apps/gthumb/ext/resize/aspect_ratio +aspect-ratio-invert = /apps/gthumb/ext/resize/aspect_ratio_invert +high-quality = /apps/gthumb/ext/resize/high_quality + +[org.gnome.gthumb.resize-images] +width = /apps/gthumb/ext/resize_images/width +height = /apps/gthumb/ext/resize_images/height +unit = /apps/gthumb/ext/resize_images/unit +keep-aspect-ratio = /apps/gthumb/ext/resize_images/keep_aspect_ratio +allow-swap-width-height = /apps/gthumb/ext/resize_images/allow_swap_width_height +mime-type = /apps/gthumb/ext/resize_images/mime_type + +[org.gnome.gthumb.rotate] +resize = /apps/gthumb/ext/rotate/resize +keep-aspect-ratio = /apps/gthumb/ext/rotate/keep_aspect_ratio +grid-type = /apps/gthumb/ext/rotate/grid_type +background-color = /apps/gthumb/ext/rotate/background_color + +[org.gnome.gthumb.slideshow] +change-delay = /apps/gthumb/ext/slideshow/change_delay +wrap-around = /apps/gthumb/ext/slideshow/wrap_around +automatic = /apps/gthumb/ext/slideshow/automatic +transition = /apps/gthumb/ext/slideshow/transition +random-order = /apps/gthumb/ext/slideshow/random-order + +[org.gnome.gthumb.webalbums] +index-file = /apps/gthumb/ext/webalbums/index_file +destination = /apps/gthumb/ext/webalbums/destination +copy-images = /apps/gthumb/ext/webalbums/copy_images +resize-images = /apps/gthumb/ext/webalbums/resize_images +resize-width = /apps/gthumb/ext/webalbums/resize_width +resize-height = /apps/gthumb/ext/webalbums/resize_height +images-per-index = /apps/gthumb/ext/webalbums/images_per_index +single-index = /apps/gthumb/ext/webalbums/single_index +columns = /apps/gthumb/ext/webalbums/columns +adapt-to-width = /apps/gthumb/ext/webalbums/adapt_to_width +sort-type = /apps/gthumb/ext/webalbums/sort_type +sort-inverse = /apps/gthumb/ext/webalbums/sort_inverse +header = /apps/gthumb/ext/webalbums/header +footer = /apps/gthumb/ext/webalbums/footer +image-page-header = /apps/gthumb/ext/webalbums/image_page_header +image-page-footer = /apps/gthumb/ext/webalbums/image_page_footer +theme = /apps/gthumb/ext/webalbums/theme +enable-thumbnail-caption = /apps/gthumb/ext/webalbums/enable_thumbnail_caption +thumbnail-caption = /apps/gthumb/ext/webalbums/thumbnail_caption +enable-image-description = /apps/gthumb/ext/webalbums/enable_image_description +enable-image-attributes = /apps/gthumb/ext/webalbums/enable_image_attributes +image-attributes = /apps/gthumb/ext/webalbums/image_attributes + +[org.gnome.gthumb.webalbums.directories] +previews = /apps/gthumb/ext/webalbums/directories/previews +thumbnails = /apps/gthumb/ext/webalbums/directories/thumbnails +images = /apps/gthumb/ext/webalbums/directories/images +html-images = /apps/gthumb/ext/webalbums/directories/html_images +html-indexes = /apps/gthumb/ext/webalbums/directories/html_indexes +theme-files = /apps/gthumb/ext/webalbums/directories/theme_files diff -Nru gthumb-2.14.3/data/gthumb-import.desktop.in.in gthumb-3.0.0/data/gthumb-import.desktop.in.in --- gthumb-2.14.3/data/gthumb-import.desktop.in.in 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/gthumb-import.desktop.in.in 2012-02-19 15:01:31.000000000 +0000 @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=gThumb +_Name=Import with gThumb _GenericName=Photo Import Tool _X-GNOME-FullName=gThumb Photo Import Tool _Comment=Import the photos on your camera card diff -Nru gthumb-2.14.3/data/gthumb.pc.in gthumb-3.0.0/data/gthumb.pc.in --- gthumb-2.14.3/data/gthumb.pc.in 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/gthumb.pc.in 2012-03-24 18:17:27.000000000 +0000 @@ -9,6 +9,6 @@ Name: gthumb Description: Image viewer and browser Version: @VERSION@ -Requires: gtk+-2.0 +Requires: gtk+-3.0 Libs: -L${libdir} @GTHUMB_IMPLIB@ Cflags: -I${includedir} diff -Nru gthumb-2.14.3/data/gthumb.schemas.in gthumb-3.0.0/data/gthumb.schemas.in --- gthumb-2.14.3/data/gthumb.schemas.in 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/data/gthumb.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,561 +0,0 @@ - - - - - - - /schemas/apps/gthumb/general/go_to_last_location - /apps/gthumb/general/go_to_last_location - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/general/use_startup_location - /apps/gthumb/general/use_startup_location - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/general/startup_location - /apps/gthumb/general/startup_location - gthumb - string - file://~ - - - - - - - - - /schemas/apps/gthumb/general/startup_current_file - /apps/gthumb/general/startup_current_file - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/general/active_extensions - /apps/gthumb/general/active_extensions - gthumb - list - string - [default] - - - - - - - - - /schemas/apps/gthumb/general/store_metadata_in_files - /apps/gthumb/general/store_metadata_in_files - gthumb - bool - true - - - - - - - - - - - /schemas/apps/gthumb/data_migration/catalogs_2_10 - /apps/gthumb/data_migration/catalogs_2_10 - gthumb - bool - false - - - - - - - - - - /schemas/apps/gthumb/browser/general_filter - /apps/gthumb/browser/general_filter - gthumb - string - file::type::is_media - - - - - - - - - /schemas/apps/gthumb/browser/show_hidden_files - /apps/gthumb/browser/show_hidden_files - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/browser/show_thumbnails - /apps/gthumb/browser/show_thumbnails - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/browser/fast_file_type - /apps/gthumb/browser/fast_file_type - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/browser/save_thumbnails - /apps/gthumb/browser/save_thumbnails - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/browser/thumbnail_size - /apps/gthumb/browser/thumbnail_size - gthumb - int - 128 - - - - - - - - - /schemas/apps/gthumb/browser/thumbnail_limit - /apps/gthumb/browser/thumbnail_limit - gthumb - int - 0 - - - Images over this size (in bytes) will not be thumbnailed. Use - 0 if you want to generate thumbnails for all images. - - - - - - /schemas/apps/gthumb/browser/thumbnail_caption - /apps/gthumb/browser/thumbnail_caption - gthumb - string - comment::note,comment::time - - - - - - - - - /schemas/apps/gthumb/browser/sort_type - /apps/gthumb/browser/sort_type - gthumb - string - file::mtime - - - - - - - - /schemas/apps/gthumb/browser/sort_inverse - /apps/gthumb/browser/sort_inverse - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/browser/view_as - /apps/gthumb/browser/view_as - gthumb - string - thumbnails - - - Possible values are: list, thumbnails. - - - - - - - - /schemas/apps/gthumb/viewer/zoom_quality - /apps/gthumb/viewer/zoom_quality - gthumb - string - high - - - Possible values are: high, low. - - - - - - /schemas/apps/gthumb/viewer/zoom_change - /apps/gthumb/viewer/zoom_change - gthumb - string - keep_prev - - - Possible values are: actual_size, fit, keep_prev, - fit_if_larger, fit_width_if_larger. - - - - - - /schemas/apps/gthumb/viewer/transparency_type - /apps/gthumb/viewer/transparency_type - gthumb - string - none - - - Possible values are: white, black, checked, none. - - - - - - /schemas/apps/gthumb/viewer/reset_scrollbars - /apps/gthumb/viewer/reset_scrollbars - gthumb - bool - true - - - Whether to reset the scrollbar positions after changing image - - - - - - /schemas/apps/gthumb/viewer/check_type - /apps/gthumb/viewer/check_type - gthumb - string - midtone - - - Possible values are: light, midtone, dark. - - - - - - /schemas/apps/gthumb/viewer/check_size - /apps/gthumb/viewer/check_size - gthumb - string - medium - - - Possible values are: small, medium, large. - - - - - - /schemas/apps/gthumb/viewer/black_background - /apps/gthumb/viewer/black_background - gthumb - bool - false - - - Whether to always use a black background. - - - - - - - - /schemas/apps/gthumb/ui/toolbar_style - /apps/gthumb/ui/toolbar_style - gthumb - string - system - - - Possible values are: system, text_below, text_beside, text_only, icons_only. - - - - - - /schemas/apps/gthumb/ui/window_width - /apps/gthumb/ui/window_width - gthumb - int - 0 - - - - - - - - - /schemas/apps/gthumb/ui/window_height - /apps/gthumb/ui/window_height - gthumb - int - 0 - - - - - - - - - /schemas/apps/gthumb/ui/image_pane_visible - /apps/gthumb/ui/image_pane_visible - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ui/toolbar_visible - /apps/gthumb/ui/toolbar_visible - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ui/statusbar_visible - /apps/gthumb/ui/statusbar_visible - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ui/filterbar_visible - /apps/gthumb/ui/filterbar_visible - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ui/sidebar_visible - /apps/gthumb/ui/sidebar_visible - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ui/thumbnail_list_visible - /apps/gthumb/ui/thumbnail_list_visible - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ui/sidebar_width - /apps/gthumb/ui/sidebar_width - gthumb - int - 250 - - - - - - - - - /schemas/apps/gthumb/ui/properties_height - /apps/gthumb/ui/properties_height - gthumb - int - 250 - - - - - - - - - /schemas/apps/gthumb/ui/comment_height - /apps/gthumb/ui/comment_height - gthumb - int - 128 - - - - - - - - - /schemas/apps/gthumb/ui/viewer_thumbnails_orientation - /apps/gthumb/ui/viewer_thumbnails_orientation - gthumb - string - horizontal - - - - - - - - - - - /schemas/apps/gthumb/dialogs/messages/cannot_move_to_trash - /apps/gthumb/dialogs/messages/cannot_move_to_trash - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/dialogs/messages/save_modified_image - /apps/gthumb/dialogs/messages/save_modified_image - gthumb - bool - true - - - - - - - - /schemas/apps/gthumb/dialogs/messages/confirm_deletion - /apps/gthumb/dialogs/messages/confirm_deletion - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/dialogs/add_to_catalog/view - /apps/gthumb/general/add_to_catalog/view - gthumb - bool - false - - - - - - - - Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/16x16/actions/application-extension.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/16x16/actions/application-extension.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/16x16/actions/file-catalog.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/16x16/actions/file-catalog.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/16x16/actions/file-library.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/16x16/actions/file-library.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/16x16/actions/file-search.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/16x16/actions/file-search.png differ diff -Nru gthumb-2.14.3/data/icons/hicolor/16x16/actions/Makefile.am gthumb-3.0.0/data/icons/hicolor/16x16/actions/Makefile.am --- gthumb-2.14.3/data/icons/hicolor/16x16/actions/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/16x16/actions/Makefile.am 2012-03-04 15:22:15.000000000 +0000 @@ -13,7 +13,12 @@ histogram-linear.png \ histogram-logarithmic.png \ image-navigator.png \ + application-extension.png \ map.png \ + selection.png \ + selection1.png \ + selection2.png \ + selection3.png \ site-facebook.png \ site-flickr.png \ site-photobucket.png \ @@ -31,7 +36,9 @@ tool-rotate.png \ tool-rotate-270.png \ tool-rotate-90.png \ - tool-sharpen.png + tool-sharpen.png \ + zoom-fit-height.png \ + zoom-fit-width.png EXTRA_DIST = $(icons_DATA) diff -Nru gthumb-2.14.3/data/icons/hicolor/16x16/actions/Makefile.in gthumb-3.0.0/data/icons/hicolor/16x16/actions/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/16x16/actions/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/16x16/actions/Makefile.in 2012-04-23 18:09:42.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -303,7 +325,12 @@ histogram-linear.png \ histogram-logarithmic.png \ image-navigator.png \ + application-extension.png \ map.png \ + selection.png \ + selection1.png \ + selection2.png \ + selection3.png \ site-facebook.png \ site-flickr.png \ site-photobucket.png \ @@ -321,7 +348,9 @@ tool-rotate.png \ tool-rotate-270.png \ tool-rotate-90.png \ - tool-sharpen.png + tool-sharpen.png \ + zoom-fit-height.png \ + zoom-fit-width.png EXTRA_DIST = $(icons_DATA) all: all-am @@ -365,8 +394,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/16x16/actions/selection1.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/16x16/actions/selection1.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/16x16/actions/selection2.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/16x16/actions/selection2.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/16x16/actions/selection3.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/16x16/actions/selection3.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/16x16/actions/selection.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/16x16/actions/selection.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/16x16/actions/zoom-fit-height.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/16x16/actions/zoom-fit-height.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/16x16/actions/zoom-fit-width.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/16x16/actions/zoom-fit-width.png differ diff -Nru gthumb-2.14.3/data/icons/hicolor/16x16/apps/Makefile.in gthumb-3.0.0/data/icons/hicolor/16x16/apps/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/16x16/apps/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/16x16/apps/Makefile.in 2012-04-23 18:09:42.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -345,8 +367,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/data/icons/hicolor/16x16/Makefile.in gthumb-3.0.0/data/icons/hicolor/16x16/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/16x16/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/16x16/Makefile.in 2012-04-23 18:09:42.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/22x22/actions/application-extension.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/22x22/actions/application-extension.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/22x22/actions/browser-mode.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/22x22/actions/browser-mode.png differ diff -Nru gthumb-2.14.3/data/icons/hicolor/22x22/actions/Makefile.am gthumb-3.0.0/data/icons/hicolor/22x22/actions/Makefile.am --- gthumb-2.14.3/data/icons/hicolor/22x22/actions/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/22x22/actions/Makefile.am 2012-02-19 15:01:31.000000000 +0000 @@ -4,23 +4,24 @@ iconsdir = $(themedir)/$(size)/$(context) -icons_DATA = \ - browser-mode.png \ - file-catalog.png \ - file-library.png \ - file-search.png \ - histogram.png \ - palette.png \ - share.png \ - tag.png \ - tool-adjust-colors.png \ - tool-crop.png \ - tool-desaturate.png \ - tool-enhance.png \ - tool-red-eye.png \ - tool-resize.png \ - tool-rotate.png \ - tool-sharpen.png \ +icons_DATA = \ + application-extension.png \ + browser-mode.png \ + file-catalog.png \ + file-library.png \ + file-search.png \ + histogram.png \ + palette.png \ + share.png \ + tag.png \ + tool-adjust-colors.png \ + tool-crop.png \ + tool-desaturate.png \ + tool-enhance.png \ + tool-red-eye.png \ + tool-resize.png \ + tool-rotate.png \ + tool-sharpen.png \ zoom-fit-width.png EXTRA_DIST = $(icons_DATA) diff -Nru gthumb-2.14.3/data/icons/hicolor/22x22/actions/Makefile.in gthumb-3.0.0/data/icons/hicolor/22x22/actions/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/22x22/actions/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/22x22/actions/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -295,22 +317,23 @@ context = actions iconsdir = $(themedir)/$(size)/$(context) icons_DATA = \ - browser-mode.png \ - file-catalog.png \ - file-library.png \ - file-search.png \ - histogram.png \ - palette.png \ - share.png \ - tag.png \ - tool-adjust-colors.png \ - tool-crop.png \ - tool-desaturate.png \ - tool-enhance.png \ - tool-red-eye.png \ - tool-resize.png \ - tool-rotate.png \ - tool-sharpen.png \ + application-extension.png \ + browser-mode.png \ + file-catalog.png \ + file-library.png \ + file-search.png \ + histogram.png \ + palette.png \ + share.png \ + tag.png \ + tool-adjust-colors.png \ + tool-crop.png \ + tool-desaturate.png \ + tool-enhance.png \ + tool-red-eye.png \ + tool-resize.png \ + tool-rotate.png \ + tool-sharpen.png \ zoom-fit-width.png EXTRA_DIST = $(icons_DATA) @@ -355,8 +378,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/data/icons/hicolor/22x22/apps/Makefile.in gthumb-3.0.0/data/icons/hicolor/22x22/apps/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/22x22/apps/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/22x22/apps/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -345,8 +367,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/data/icons/hicolor/22x22/Makefile.in gthumb-3.0.0/data/icons/hicolor/22x22/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/22x22/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/22x22/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/data/icons/hicolor/24x24/actions/Makefile.am gthumb-3.0.0/data/icons/hicolor/24x24/actions/Makefile.am --- gthumb-2.14.3/data/icons/hicolor/24x24/actions/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/24x24/actions/Makefile.am 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,13 @@ +themedir = $(pkgdatadir)/icons/hicolor +size = 24x24 +context = actions + +iconsdir = $(themedir)/$(size)/$(context) + +icons_DATA = \ + zoom-fit-height.png \ + zoom-fit-width.png + +EXTRA_DIST = $(icons_DATA) + +-include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/data/icons/hicolor/24x24/actions/Makefile.in gthumb-3.0.0/data/icons/hicolor/24x24/actions/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/24x24/actions/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/24x24/actions/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -0,0 +1,543 @@ +# Makefile.in generated by automake 1.11.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +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 = data/icons/hicolor/24x24/actions +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.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)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +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_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +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 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(iconsdir)" +DATA = $(icons_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BISON = @BISON@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ +CLUTTER_LIBS = @CLUTTER_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DLLTOOL = @DLLTOOL@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +EXIV2_CFLAGS = @EXIV2_CFLAGS@ +EXIV2_LIBS = @EXIV2_LIBS@ +EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ +FGREP = @FGREP@ +FLEX = @FLEX@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ +GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ +GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ +GTHUMB_CFLAGS = @GTHUMB_CFLAGS@ +GTHUMB_EXTENSION_IN_RULE = @GTHUMB_EXTENSION_IN_RULE@ +GTHUMB_EXTENSION_RULE = @GTHUMB_EXTENSION_RULE@ +GTHUMB_IMPLIB = @GTHUMB_IMPLIB@ +GTHUMB_LIBS = @GTHUMB_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +JPEG_LIBS = @JPEG_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBRASERO_CFLAGS = @LIBBRASERO_CFLAGS@ +LIBBRASERO_LIBS = @LIBBRASERO_LIBS@ +LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ +LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ +LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ +LIBS = @LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ +LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +M_LIBS = @M_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +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@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ +SMCLIENT_LIBS = @SMCLIENT_LIBS@ +STRIP = @STRIP@ +TIFF_LIBS = @TIFF_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_CXXFLAGS = @WARN_CXXFLAGS@ +XGETTEXT = @XGETTEXT@ +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_CXX = @ac_ct_CXX@ +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@ +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@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +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@ +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@ +themedir = $(pkgdatadir)/icons/hicolor +size = 24x24 +context = actions +iconsdir = $(themedir)/$(size)/$(context) +icons_DATA = \ + zoom-fit-height.png \ + zoom-fit-width.png + +EXTRA_DIST = $(icons_DATA) +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 data/icons/hicolor/24x24/actions/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign data/icons/hicolor/24x24/actions/Makefile +.PRECIOUS: 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 +install-iconsDATA: $(icons_DATA) + @$(NORMAL_INSTALL) + @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \ + done + +uninstall-iconsDATA: + @$(NORMAL_UNINSTALL) + @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +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: + for dir in "$(DESTDIR)$(iconsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +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-iconsDATA + +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: uninstall-iconsDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + 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-iconsDATA 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 \ + uninstall uninstall-am uninstall-iconsDATA + + +-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: Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/24x24/actions/zoom-fit-height.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/24x24/actions/zoom-fit-height.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/24x24/actions/zoom-fit-width.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/24x24/actions/zoom-fit-width.png differ diff -Nru gthumb-2.14.3/data/icons/hicolor/24x24/Makefile.am gthumb-3.0.0/data/icons/hicolor/24x24/Makefile.am --- gthumb-2.14.3/data/icons/hicolor/24x24/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/24x24/Makefile.am 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,3 @@ +SUBDIRS = actions + +-include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/data/icons/hicolor/24x24/Makefile.in gthumb-3.0.0/data/icons/hicolor/24x24/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/24x24/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/24x24/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -0,0 +1,679 @@ +# Makefile.in generated by automake 1.11.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +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 = data/icons/hicolor/24x24 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.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)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +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_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BISON = @BISON@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ +CLUTTER_LIBS = @CLUTTER_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DLLTOOL = @DLLTOOL@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +EXIV2_CFLAGS = @EXIV2_CFLAGS@ +EXIV2_LIBS = @EXIV2_LIBS@ +EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ +FGREP = @FGREP@ +FLEX = @FLEX@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ +GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ +GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ +GTHUMB_CFLAGS = @GTHUMB_CFLAGS@ +GTHUMB_EXTENSION_IN_RULE = @GTHUMB_EXTENSION_IN_RULE@ +GTHUMB_EXTENSION_RULE = @GTHUMB_EXTENSION_RULE@ +GTHUMB_IMPLIB = @GTHUMB_IMPLIB@ +GTHUMB_LIBS = @GTHUMB_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +JPEG_LIBS = @JPEG_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBRASERO_CFLAGS = @LIBBRASERO_CFLAGS@ +LIBBRASERO_LIBS = @LIBBRASERO_LIBS@ +LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ +LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ +LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ +LIBS = @LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ +LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +M_LIBS = @M_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +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@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ +SMCLIENT_LIBS = @SMCLIENT_LIBS@ +STRIP = @STRIP@ +TIFF_LIBS = @TIFF_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_CXXFLAGS = @WARN_CXXFLAGS@ +XGETTEXT = @XGETTEXT@ +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_CXX = @ac_ct_CXX@ +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@ +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@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +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@ +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@ +SUBDIRS = actions +all: all-recursive + +.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 data/icons/hicolor/24x24/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign data/icons/hicolor/24x24/Makefile +.PRECIOUS: 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 + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +$(RECURSIVE_CLEAN_TARGETS): + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done +ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +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 + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +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-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-tags 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am + + +-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 -Nru gthumb-2.14.3/data/icons/hicolor/32x32/apps/Makefile.in gthumb-3.0.0/data/icons/hicolor/32x32/apps/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/32x32/apps/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/32x32/apps/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -345,8 +367,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/data/icons/hicolor/32x32/Makefile.in gthumb-3.0.0/data/icons/hicolor/32x32/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/32x32/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/32x32/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/48x48/actions/file-catalog.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/48x48/actions/file-catalog.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/48x48/actions/file-library.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/48x48/actions/file-library.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/48x48/actions/file-search.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/48x48/actions/file-search.png differ diff -Nru gthumb-2.14.3/data/icons/hicolor/48x48/actions/Makefile.am gthumb-3.0.0/data/icons/hicolor/48x48/actions/Makefile.am --- gthumb-2.14.3/data/icons/hicolor/48x48/actions/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/48x48/actions/Makefile.am 2012-03-04 15:22:15.000000000 +0000 @@ -9,7 +9,11 @@ file-catalog.png \ file-library.png \ file-search.png \ - palette.png + palette.png \ + selection.png \ + selection1.png \ + selection2.png \ + selection3.png EXTRA_DIST = $(icons_DATA) diff -Nru gthumb-2.14.3/data/icons/hicolor/48x48/actions/Makefile.in gthumb-3.0.0/data/icons/hicolor/48x48/actions/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/48x48/actions/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/48x48/actions/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -299,7 +321,11 @@ file-catalog.png \ file-library.png \ file-search.png \ - palette.png + palette.png \ + selection.png \ + selection1.png \ + selection2.png \ + selection3.png EXTRA_DIST = $(icons_DATA) all: all-am @@ -343,8 +369,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/48x48/actions/selection1.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/48x48/actions/selection1.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/48x48/actions/selection2.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/48x48/actions/selection2.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/48x48/actions/selection3.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/48x48/actions/selection3.png differ Binary files /tmp/3sJVQHImLc/gthumb-2.14.3/data/icons/hicolor/48x48/actions/selection.png and /tmp/4iVoYt4OaX/gthumb-3.0.0/data/icons/hicolor/48x48/actions/selection.png differ diff -Nru gthumb-2.14.3/data/icons/hicolor/48x48/apps/Makefile.in gthumb-3.0.0/data/icons/hicolor/48x48/apps/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/48x48/apps/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/48x48/apps/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -345,8 +367,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/data/icons/hicolor/48x48/Makefile.in gthumb-3.0.0/data/icons/hicolor/48x48/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/48x48/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/48x48/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/data/icons/hicolor/Makefile.am gthumb-3.0.0/data/icons/hicolor/Makefile.am --- gthumb-2.14.3/data/icons/hicolor/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/Makefile.am 2012-03-05 21:31:55.000000000 +0000 @@ -1,4 +1,4 @@ -SUBDIRS = 16x16 22x22 32x32 48x48 scalable +SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor diff -Nru gthumb-2.14.3/data/icons/hicolor/Makefile.in gthumb-3.0.0/data/icons/hicolor/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -300,7 +322,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = 16x16 22x22 32x32 48x48 scalable +SUBDIRS = 16x16 22x22 24x24 32x32 48x48 scalable gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor all: all-recursive @@ -509,13 +531,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/data/icons/hicolor/scalable/actions/file-catalog.svg gthumb-3.0.0/data/icons/hicolor/scalable/actions/file-catalog.svg --- gthumb-2.14.3/data/icons/hicolor/scalable/actions/file-catalog.svg 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/scalable/actions/file-catalog.svg 2012-02-19 15:01:31.000000000 +0000 @@ -14,7 +14,7 @@ height="447.10452" id="svg2" version="1.1" - inkscape:version="0.47pre4 r22446" + inkscape:version="0.48.2 r9819" sodipodi:docname="file-catalog.svg" inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/48x48/actions/file-library.png" inkscape:export-xdpi="9.0582848" @@ -22,6 +22,29 @@ + + + + + + + + - - - + gradientTransform="matrix(0.9551007,0,0,0.89688565,5.2893882,63.50264)" /> + + + + + + @@ -171,86 +222,83 @@ id="layer3" inkscape:label="shadow" style="display:inline" - transform="translate(-59.527203,-269.54474)"> - - + transform="translate(-59.527203,-269.54474)" /> - - + sodipodi:type="arc" + style="opacity:0.24100719;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3825)" + id="path3803" + sodipodi:cx="239.5" + sodipodi:cy="379.60452" + sodipodi:rx="184.5" + sodipodi:ry="37.5" + d="m 424,379.60452 a 184.5,37.5 0 1 1 -369,0 184.5,37.5 0 1 1 369,0 z" + transform="translate(63.527203,264.54474)" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" /> + - + sodipodi:nodetypes="ccccc" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:none" + d="m 191.99591,319.25525 241.23287,-0.35355 0.35791,77.42819 -261.27596,0 0.35792,-50.55813 c 1.53973,-9.08044 -0.27173,-18.35717 19.32726,-26.51651 z" + id="path3845" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" /> + style="fill:#818181;fill-opacity:1;stroke:url(#linearGradient3858)" + d="m 433.66578,319.41443 c -4.73114,4.61536 -11.77536,17.20872 -14.05673,27.71998 -1.27593,5.87879 -0.65354,300.93147 -1.34702,304.87971 l 15.83104,-28.53909 z" + id="path3793" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csccc" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" /> + ry="0" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" /> - + width="42.285057" + height="289.38181" + x="170.57629" + y="358.01779" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" /> + + + + + + + + - - - + gradientTransform="matrix(0.9551007,0,0,0.89688565,5.2893882,63.50264)" /> + + + + + + @@ -171,86 +222,83 @@ id="layer3" inkscape:label="shadow" style="display:inline" - transform="translate(-59.527203,-269.54474)"> - - + transform="translate(-59.527203,-269.54474)" /> - - + sodipodi:type="arc" + style="opacity:0.24100719;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3825)" + id="path3803" + sodipodi:cx="239.5" + sodipodi:cy="379.60452" + sodipodi:rx="184.5" + sodipodi:ry="37.5" + d="m 424,379.60452 a 184.5,37.5 0 1 1 -369,0 184.5,37.5 0 1 1 369,0 z" + transform="translate(63.527203,264.54474)" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" /> + - + sodipodi:nodetypes="ccccc" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" + inkscape:connector-curvature="0" /> + style="fill:#ffffff;fill-opacity:1;stroke:none" + d="m 191.99591,319.25525 241.23287,-0.35355 0.35791,77.42819 -261.27596,0 0.35792,-50.55813 c 1.53973,-9.08044 -0.27173,-18.35717 19.32726,-26.51651 z" + id="path3845" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccc" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" /> + style="fill:#818181;fill-opacity:1;stroke:url(#linearGradient3858)" + d="m 433.66578,319.41443 c -4.73114,4.61536 -11.77536,17.20872 -14.05673,27.71998 -1.27593,5.87879 -0.65354,300.93147 -1.34702,304.87971 l 15.83104,-28.53909 z" + id="path3793" + inkscape:connector-curvature="0" + sodipodi:nodetypes="csccc" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" /> + ry="0" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" /> - + width="42.285057" + height="289.38181" + x="170.57629" + y="358.01779" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + inkscape:export-xdpi="10.378776" + inkscape:export-ydpi="10.378776" /> @@ -135,6 +135,51 @@ y2="567.2699" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0035011,0,0,0.88202901,1.0116563,71.299495)" /> + + + + + + + + + @@ -171,87 +216,13 @@ id="layer3" inkscape:label="shadow" style="display:inline" - transform="translate(-59.527203,-269.54474)"> - - + transform="translate(-59.527203,-269.54474)" /> - - - - - - - - - - - + transform="translate(-59.527203,-269.54474)" /> + id="g3073" + transform="translate(-324.60697,-288.44698)" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-search.png" + inkscape:export-xdpi="10.447302" + inkscape:export-ydpi="10.447302"> + + + + + + inkscape:export-ydpi="10.378776" + inkscape:export-xdpi="10.378776" + inkscape:export-filename="/home/paolo/workspace/gthumb/data/icons/hicolor/48x48/actions/file-library.png" + y="632.43274" + x="490.52728" + height="289.38181" + width="42.285057" + id="rect4258" + style="fill:#000000;fill-opacity:0.15384617;stroke:none;display:inline" /> + + + + diff -Nru gthumb-2.14.3/data/icons/hicolor/scalable/actions/Makefile.in gthumb-3.0.0/data/icons/hicolor/scalable/actions/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/scalable/actions/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/scalable/actions/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -347,8 +369,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/data/icons/hicolor/scalable/apps/Makefile.in gthumb-3.0.0/data/icons/hicolor/scalable/apps/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/scalable/apps/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/scalable/apps/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -343,8 +365,11 @@ -rm -rf .libs _libs install-iconsDATA: $(icons_DATA) @$(NORMAL_INSTALL) - test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)" @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(iconsdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(iconsdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/data/icons/hicolor/scalable/Makefile.in gthumb-3.0.0/data/icons/hicolor/scalable/Makefile.in --- gthumb-2.14.3/data/icons/hicolor/scalable/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/icons/hicolor/scalable/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/data/icons/Makefile.am gthumb-3.0.0/data/icons/Makefile.am --- gthumb-2.14.3/data/icons/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/icons/Makefile.am 2012-03-05 21:22:15.000000000 +0000 @@ -1,3 +1,5 @@ SUBDIRS = hicolor +EXTRA_DIST = selection.svg + -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/data/icons/Makefile.in gthumb-3.0.0/data/icons/Makefile.in --- gthumb-2.14.3/data/icons/Makefile.in 2012-03-25 18:34:06.000000000 +0000 +++ gthumb-3.0.0/data/icons/Makefile.in 2012-04-23 18:09:42.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -301,6 +323,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = hicolor +EXTRA_DIST = selection.svg all: all-recursive .SUFFIXES: @@ -508,13 +531,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/data/icons/selection.svg gthumb-3.0.0/data/icons/selection.svg --- gthumb-2.14.3/data/icons/selection.svg 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/icons/selection.svg 2012-03-04 15:22:15.000000000 +0000 @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru gthumb-2.14.3/data/Makefile.am gthumb-3.0.0/data/Makefile.am --- gthumb-2.14.3/data/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/Makefile.am 2012-02-19 15:01:31.000000000 +0000 @@ -1,37 +1,67 @@ SUBDIRS = icons ui +desktopdir = $(datadir)/applications desktop_in_in_files = gthumb.desktop.in.in gthumb-import.desktop.in.in desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) -desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$(schema_DATA) -endif +gsettings_ENUM_NAMESPACE = org.gnome.gthumb +gsettings_ENUM_FILES = $(top_srcdir)/gthumb/*.h $(top_srcdir)/extensions/*/*.h +gsettings_schema_in_files = \ + org.gnome.gthumb.gschema.xml.in \ + org.gnome.gthumb.change-date.gschema.xml.in \ + org.gnome.gthumb.comments.gschema.xml.in \ + org.gnome.gthumb.contact-sheet.gschema.xml.in \ + org.gnome.gthumb.convert-format.gschema.xml.in \ + org.gnome.gthumb.crop.gschema.xml.in \ + org.gnome.gthumb.facebook.gschema.xml.in \ + org.gnome.gthumb.file-manager.gschema.xml.in \ + org.gnome.gthumb.gstreamer-tools.gschema.xml.in \ + org.gnome.gthumb.image-print.gschema.xml.in \ + org.gnome.gthumb.image-viewer.gschema.xml.in \ + org.gnome.gthumb.importer.gschema.xml.in \ + org.gnome.gthumb.photo-importer.gschema.xml.in \ + org.gnome.gthumb.picasaweb.gschema.xml.in \ + org.gnome.gthumb.pixbuf-savers.gschema.xml.in \ + org.gnome.gthumb.rename-series.gschema.xml.in \ + org.gnome.gthumb.resize.gschema.xml.in \ + org.gnome.gthumb.resize-images.gschema.xml.in \ + org.gnome.gthumb.rotate.gschema.xml.in \ + org.gnome.gthumb.slideshow.gschema.xml.in \ + org.gnome.gthumb.webalbums.gschema.xml.in +gsettings_SCHEMAS = $(gsettings_schema_in_files:.xml.in=.xml) + +@INTLTOOL_XML_NOMERGE_RULE@ + +@GSETTINGS_RULES@ + +convertdir = $(datadir)/GConf/gsettings +convert_DATA = gthumb.convert pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gthumb-$(GTHUMB_API_VERSION).pc -EXTRA_DIST = \ - $(desktop_in_in_files) \ - $(pkgconfig_DATA) \ - $(schema_in_files) +uidir = $(pkgdatadir)/ui +ui_DATA = filmholes.png + +EXTRA_DIST = \ + $(desktop_in_in_files) \ + $(gsettings_schema_in_files) \ + $(pkgconfig_DATA) \ + $(ui_DATA) \ + gthumb.convert -DISTCLEANFILES = \ - $(desktop_in_files) \ +DISTCLEANFILES = \ + $(desktop_in_files) \ $(pkgconfig_DATA) -CLEANFILES = \ - $(desktop_DATA) \ - $(schema_DATA) +CLEANFILES = \ + $(desktop_DATA) \ + $(gsettings_SCHEMAS) + +dist-hook: + cd $(distdir); rm -f $(CLEANFILES) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/data/Makefile.in gthumb-3.0.0/data/Makefile.in --- gthumb-2.14.3/data/Makefile.in 2012-03-25 18:34:06.000000000 +0000 +++ gthumb-3.0.0/data/Makefile.in 2012-04-23 18:09:42.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -66,6 +83,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -93,9 +115,9 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(schemadir)" -DATA = $(desktop_DATA) $(pkgconfig_DATA) $(schema_DATA) +am__installdirs = "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(desktopdir)" \ + "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(uidir)" +DATA = $(convert_DATA) $(desktop_DATA) $(pkgconfig_DATA) $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -174,10 +196,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -185,6 +205,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -224,6 +245,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -272,8 +295,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -304,6 +325,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -335,27 +357,56 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = icons ui +desktopdir = $(datadir)/applications desktop_in_in_files = gthumb.desktop.in.in gthumb-import.desktop.in.in desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) -desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) +gsettings_ENUM_NAMESPACE = org.gnome.gthumb +gsettings_ENUM_FILES = $(top_srcdir)/gthumb/*.h $(top_srcdir)/extensions/*/*.h +gsettings_schema_in_files = \ + org.gnome.gthumb.gschema.xml.in \ + org.gnome.gthumb.change-date.gschema.xml.in \ + org.gnome.gthumb.comments.gschema.xml.in \ + org.gnome.gthumb.contact-sheet.gschema.xml.in \ + org.gnome.gthumb.convert-format.gschema.xml.in \ + org.gnome.gthumb.crop.gschema.xml.in \ + org.gnome.gthumb.facebook.gschema.xml.in \ + org.gnome.gthumb.file-manager.gschema.xml.in \ + org.gnome.gthumb.gstreamer-tools.gschema.xml.in \ + org.gnome.gthumb.image-print.gschema.xml.in \ + org.gnome.gthumb.image-viewer.gschema.xml.in \ + org.gnome.gthumb.importer.gschema.xml.in \ + org.gnome.gthumb.photo-importer.gschema.xml.in \ + org.gnome.gthumb.picasaweb.gschema.xml.in \ + org.gnome.gthumb.pixbuf-savers.gschema.xml.in \ + org.gnome.gthumb.rename-series.gschema.xml.in \ + org.gnome.gthumb.resize.gschema.xml.in \ + org.gnome.gthumb.resize-images.gschema.xml.in \ + org.gnome.gthumb.rotate.gschema.xml.in \ + org.gnome.gthumb.slideshow.gschema.xml.in \ + org.gnome.gthumb.webalbums.gschema.xml.in + +gsettings_SCHEMAS = $(gsettings_schema_in_files:.xml.in=.xml) +convertdir = $(datadir)/GConf/gsettings +convert_DATA = gthumb.convert pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gthumb-$(GTHUMB_API_VERSION).pc +uidir = $(pkgdatadir)/ui +ui_DATA = filmholes.png EXTRA_DIST = \ - $(desktop_in_in_files) \ - $(pkgconfig_DATA) \ - $(schema_in_files) + $(desktop_in_in_files) \ + $(gsettings_schema_in_files) \ + $(pkgconfig_DATA) \ + $(ui_DATA) \ + gthumb.convert DISTCLEANFILES = \ - $(desktop_in_files) \ + $(desktop_in_files) \ $(pkgconfig_DATA) CLEANFILES = \ - $(desktop_DATA) \ - $(schema_DATA) + $(desktop_DATA) \ + $(gsettings_SCHEMAS) all: all-recursive @@ -402,10 +453,34 @@ clean-libtool: -rm -rf .libs _libs +install-convertDATA: $(convert_DATA) + @$(NORMAL_INSTALL) + @list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(convertdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(convertdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(convertdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(convertdir)" || exit $$?; \ + done + +uninstall-convertDATA: + @$(NORMAL_UNINSTALL) + @list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir) install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) - test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -422,8 +497,11 @@ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -438,24 +516,27 @@ @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) -install-schemaDATA: $(schema_DATA) +install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ + @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ done -uninstall-schemaDATA: +uninstall-uiDATA: @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ + @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) + dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -624,13 +705,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -650,12 +728,15 @@ || exit 1; \ fi; \ done + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am check: check-recursive all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(schemadir)"; do \ + for dir in "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(uidir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -690,7 +771,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -711,8 +791,8 @@ info-am: -install-data-am: install-data-local install-desktopDATA \ - install-pkgconfigDATA install-schemaDATA +install-data-am: install-convertDATA install-desktopDATA \ + install-pkgconfigDATA install-uiDATA install-dvi: install-dvi-recursive @@ -756,36 +836,37 @@ ps-am: -uninstall-am: uninstall-desktopDATA uninstall-pkgconfigDATA \ - uninstall-schemaDATA +uninstall-am: uninstall-convertDATA uninstall-desktopDATA \ + uninstall-pkgconfigDATA uninstall-uiDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ + ctags ctags-recursive dist-hook distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-desktopDATA \ - 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-pkgconfigDATA \ - install-ps install-ps-am install-schemaDATA install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-desktopDATA uninstall-pkgconfigDATA \ - uninstall-schemaDATA + html-am info info-am install install-am install-convertDATA \ + install-data install-data-am install-desktopDATA 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-pkgconfigDATA install-ps \ + install-ps-am install-strip install-uiDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-convertDATA \ + uninstall-desktopDATA uninstall-pkgconfigDATA uninstall-uiDATA @INTLTOOL_DESKTOP_RULE@ -@INTLTOOL_SCHEMAS_RULE@ +@INTLTOOL_XML_NOMERGE_RULE@ + +@GSETTINGS_RULES@ -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$(schema_DATA) +dist-hook: + cd $(distdir); rm -f $(CLEANFILES) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.change-date.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.change-date.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.change-date.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.change-date.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,54 @@ + + + + + + false + + + false + + + false + + + false + + + '' + + + false + + + false + + + false + + + false + + + 0 + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.comments.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.comments.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.comments.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.comments.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + + true + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.contact-sheet.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.contact-sheet.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.contact-sheet.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.contact-sheet.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,107 @@ + + + + + + + + + + + '' + + + '' + + + '' + + + '###' + + + 'image/jpeg' + + + false + + + 'default.cst' + + + 25 + + + false + + + 5 + + + 'general::unsorted' + + + false + + + true + + + 128 + + + false + + + 'general::datetime,general::dimensions,gth::file::display-size' + + + + + + '' + + + '###' + + + 'image/jpeg' + + + 25 + + + false + + + 5 + + + 'general::unsorted' + + + false + + + 128 + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.convert-format.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.convert-format.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.convert-format.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.convert-format.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + + 'image/jpeg' + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.crop.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.crop.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.crop.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.crop.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,45 @@ + + + + + + 'thirds' + + + 'none' + + + false + + + 1 + + + 1 + + + false + + + 8 + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.facebook.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.facebook.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.facebook.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.facebook.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + + 2048 + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.file-manager.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.file-manager.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.file-manager.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.file-manager.gschema.xml.in 2012-03-23 19:23:13.000000000 +0000 @@ -0,0 +1,33 @@ + + + + + + '' + + + true + + + [] + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.gschema.xml.in 2012-03-23 19:23:26.000000000 +0000 @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + [ 'default' ] + + + true + + + + + + false + + + + + + true + + + false + + + '' + + + '' + + + 'file::type::is_media' + + + false + + + true + + + true + + + true + + + 128 + + + 0 + <_description>Images over this size (in bytes) will not be thumbnailed. Use 0 if you want to generate thumbnails for all images. + + + 'comment::note,comment::time' + + + 'file::mtime' + + + false + + + 'system' + + + 0 + + + 0 + + + true + + + true + + + true + + + true + + + true + + + true + + + false + + + true + + + 285 + + + 285 + + + 'horizontal' + + + false + <_description>Whether to resize the window to fit the size of the image + + + false + <_description>Open files in the active window + + + + + + + + + + + true + + + true + + + true + + + + + + false + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + + 'file://~' + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.image-print.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.image-print.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.image-print.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.image-print.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,51 @@ + + + + + + '' + + + 'sans normal 12' + + + 'sans bold 12' + + + 'sans normal 8' + + + '' + + + '' + + + 1 + + + 1 + + + 'pixels' + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.image-viewer.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.image-viewer.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.image-viewer.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.image-viewer.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,48 @@ + + + + + + 'low' + + + 'fit-size-if-larger' + + + 'none' + <_description>Possible values are: white, black, checked, none. + + + true + <_description>Whether to reset the scrollbars position after changing image + + + 'midtone' + + + 'medium' + + + false + <_description>Whether to always use a black background. + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.importer.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.importer.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.importer.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.importer.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,42 @@ + + + + + + '' + + + 'none' + + + 'yyyymmdd' + + + false + + + '' + + + true + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.photo-importer.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.photo-importer.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.photo-importer.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.photo-importer.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,30 @@ + + + + + + false + + + false + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.picasaweb.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.picasaweb.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.picasaweb.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.picasaweb.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + + true + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,75 @@ + + + + + + + + + + + + + 'jpeg' + <_description>Possible values are: jpeg, jpg. + + + 85 + + + 0 + + + true + + + false + + + + + + 6 + + + + + + true + + + + + + 'tiff' + <_description>Possible values are: tiff, tif. + + + 'deflate' + + + 72 + + + 72 + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.rename-series.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.rename-series.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.rename-series.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.rename-series.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,40 @@ + + + + + + '####%E' + + + 1 + + + 'general::unsorted' + <_summary>Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal + + + false + + + 'none' + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.resize.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.resize.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.resize.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.resize.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,48 @@ + + + + + + 'percentage' + + + 100.0 + + + 100.0 + + + 1 + + + 1 + + + 'image' + + + true + + + true + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.resize-images.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.resize-images.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.resize-images.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.resize-images.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,42 @@ + + + + + + 640 + + + 480 + + + 'percentage' + + + true + + + true + + + '' + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.rotate.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.rotate.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.rotate.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.rotate.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,36 @@ + + + + + + 'crop' + + + true + + + 'thirds' + + + '#000' + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.slideshow.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.slideshow.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.slideshow.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.slideshow.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,39 @@ + + + + + + 5.0 + + + false + + + true + + + 'fade-in' + + + false + + + + diff -Nru gthumb-2.14.3/data/org.gnome.gthumb.webalbums.gschema.xml.in gthumb-3.0.0/data/org.gnome.gthumb.webalbums.gschema.xml.in --- gthumb-2.14.3/data/org.gnome.gthumb.webalbums.gschema.xml.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/org.gnome.gthumb.webalbums.gschema.xml.in 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,112 @@ + + + + + + 'index.html' + + + '' + + + false + + + false + + + 640 + + + 480 + + + 12 + + + false + + + 4 + + + true + + + 'file::mtime' + + + false + + + '' + + + '' + + + '' + + + '' + + + 'Wiki' + + + true + + + 'general::datetime,general::dimensions,gth::file::display-size' + + + true + + + true + + + 'gth::file::display-size,standard::fast-content-type,general::dimensions,general::format,general::location,general::datetime,general::rating,Exif::Image::Make,Exif::Image::Model,Exif::Image::Software,Exif::Image::Artist,Exif::Image::Copyright,Exif::Photo::ISOSpeedRatings,Exif::Photo::BrightnessValue,Exif::Photo::FNumber,Exif::Photo::ApertureValue,Exif::Photo::MaxApertureValue,Exif::Photo::ExposureTime,Exif::Photo::ExposureProgram,Exif::Photo::ExposureIndex,Exif::Photo::ExposureBiasValue,Exif::Photo::ExposureMode,Exif::Photo::ShutterSpeedValue,Exif::Photo::MeteringMode,Exif::Photo::LightSource,Exif::Photo::WhiteBalance,Exif::Photo::Flash,Exif::Photo::FocalLength,Exif::Photo::SubjectArea,Exif::Photo::Contrast,Exif::Photo::Saturation,Exif::Photo::Sharpness' + + + + + + + 'previews' + + + 'thumbnails' + + + 'images' + + + 'html' + + + 'html' + + + 'theme' + + + + diff -Nru gthumb-2.14.3/data/ui/filter-editor.ui gthumb-3.0.0/data/ui/filter-editor.ui --- gthumb-2.14.3/data/ui/filter-editor.ui 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/ui/filter-editor.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,24 +1,27 @@ - + - True + False 6 12 True + False 6 True + False Filter _Name: True name_entry False + True 0 @@ -28,97 +31,128 @@ True + True + True 1 False + True 0 - + True - 0 + False + vertical + 6 - - True - 6 - 6 - 12 - 6 - - - True - 6 - - - - - - - - True + False 6 _Match + False True True False + False True + 0 True + False + True 0 True + False + True + True 1 + + False + True + 0 + + + + + True + False + 24 + + + True + False + 6 + + + + + + + + True + True + 1 + + True + True 1 True + False 6 True + False 6 _Limit to + False True True False + False True True False + True 0 True + False 6 @@ -128,58 +162,73 @@ False + True 0 True + False + True + True 1 False + True 1 True + False 6 True + False selected by + True + True 0 True + False + True + True 1 True + False + True + True 2 @@ -193,6 +242,7 @@ False + True 0 diff -Nru gthumb-2.14.3/data/ui/histogram-info.ui gthumb-3.0.0/data/ui/histogram-info.ui --- gthumb-2.14.3/data/ui/histogram-info.ui 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/ui/histogram-info.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,111 +1,257 @@ - + - - - - True - 3 - True + + + False + vertical - + True - 3 - 2 - 6 - 2 - - - True - 1 - Mean: - - - - - - - GTK_FILL - - - - - True - 0 - 5 - - - - - - 1 - 2 - GTK_FILL - - - - - True - 1 - Std dev: - - - - - - - 1 - 2 - GTK_FILL - - - - - True - 1 - Median: - - - - - - - 2 - 3 - GTK_FILL - - - - - True - 0 - 5 - - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - 0 - 5 - - - - - - 1 - 2 - 2 - 3 - GTK_FILL + False + 3 + True + + + True + False + 3 + 2 + 6 + 2 + + + True + False + 1 + Mean: + end + 12 + + + + + + + GTK_FILL + + + + + + True + False + 1 + Std dev: + end + 12 + + + + + + + 1 + 2 + GTK_FILL + + + + + + True + False + 1 + Median: + end + 12 + + + + + + + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + 5 + + + + + + 1 + 2 + GTK_EXPAND + + + + + True + False + 0 + 5 + + + + + + 1 + 2 + 1 + 2 + GTK_EXPAND + + + + + True + False + 0 + 5 + + + + + + 1 + 2 + 2 + 3 + GTK_EXPAND + + + + + False + False + 0 + + + + + True + False + 3 + 2 + 6 + 2 + + + True + False + 1 + Pixels: + + + + + + + GTK_FILL + + + + + + True + False + 1 + Max: + + + + + + + 1 + 2 + GTK_FILL + + + + + + True + False + 1 + Selected: + + + + + + + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + 10 + + + + + + 1 + 2 + GTK_EXPAND + + + + + True + False + 0 + 10 + + + + + + 1 + 2 + 1 + 2 + GTK_EXPAND + + + + + True + False + 0 + 10 + + + + + + 1 + 2 + 2 + 3 + GTK_EXPAND + + + + + False + False + 1 @@ -115,114 +261,5 @@ 0 - - - True - 3 - 2 - 6 - 2 - - - True - 1 - Pixels: - - - - - - - GTK_FILL - - - - - True - 0 - 10 - - - - - - 1 - 2 - GTK_FILL - - - - - True - 1 - Max: - - - - - - - 1 - 2 - GTK_FILL - - - - - True - 0 - 10 - - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - 1 - Selected: - - - - - - - 2 - 3 - GTK_FILL - - - - - True - 0 - 10 - - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - False - False - 1 - - diff -Nru gthumb-2.14.3/data/ui/location.ui gthumb-3.0.0/data/ui/location.ui --- gthumb-2.14.3/data/ui/location.ui 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/data/ui/location.ui 2012-03-25 16:10:25.000000000 +0000 @@ -0,0 +1,110 @@ + + + + + False + 5 + True + dialog + + + False + vertical + 2 + + + False + end + + + gtk-cancel + False + True + True + True + False + True + + + False + True + 0 + + + + + gtk-jump-to + False + True + True + True + True + True + False + True + + + False + True + 1 + + + + + False + True + end + 0 + + + + + True + False + 5 + vertical + 6 + + + True + False + 0 + _Location: + True + location_entry + + + False + True + 0 + + + + + True + True + + True + 80 + + + False + True + 1 + + + + + False + True + 1 + + + + + + cancel_button + ok_button + + + diff -Nru gthumb-2.14.3/data/ui/Makefile.am gthumb-3.0.0/data/ui/Makefile.am --- gthumb-2.14.3/data/ui/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/ui/Makefile.am 2012-03-25 11:29:53.000000000 +0000 @@ -3,6 +3,7 @@ extensions-preferences.ui \ filter-editor.ui \ histogram-info.ui \ + location.ui \ overwrite-dialog.ui \ personalize-filters.ui \ preferences.ui \ diff -Nru gthumb-2.14.3/data/ui/Makefile.in gthumb-3.0.0/data/ui/Makefile.in --- gthumb-2.14.3/data/ui/Makefile.in 2012-03-25 18:34:07.000000000 +0000 +++ gthumb-3.0.0/data/ui/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -295,6 +317,7 @@ extensions-preferences.ui \ filter-editor.ui \ histogram-info.ui \ + location.ui \ overwrite-dialog.ui \ personalize-filters.ui \ preferences.ui \ @@ -342,8 +365,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/data/ui/overwrite-dialog.ui gthumb-3.0.0/data/ui/overwrite-dialog.ui --- gthumb-2.14.3/data/ui/overwrite-dialog.ui 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/ui/overwrite-dialog.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,15 +1,15 @@ - + - True + False 6 - vertical 6 True + False 0 Overwrite the old file with the new one? center @@ -27,24 +27,28 @@ True + False 12 True - vertical + False 6 True + False 0 True + False 6 6 True + False 0 none @@ -52,6 +56,8 @@ + True + True 0 @@ -60,17 +66,21 @@ True + False Old File: + True + True 0 True + False 3 2 12 @@ -78,6 +88,7 @@ True + False 0 @@ -91,6 +102,7 @@ True + False 0 @@ -104,9 +116,11 @@ True + False True + False 0 True @@ -122,6 +136,7 @@ True + False 0 Filename: @@ -130,11 +145,13 @@ GTK_FILL + GTK_FILL True + False 0 Size: @@ -145,11 +162,13 @@ 1 2 GTK_FILL + GTK_FILL True + False 0 Modified: @@ -160,36 +179,43 @@ 2 3 GTK_FILL + GTK_FILL False + True 1 + True + True 0 True - vertical + False 6 True + False 0 True + False 6 6 True + False 0 none @@ -197,6 +223,8 @@ + True + True 0 @@ -205,17 +233,21 @@ True + False New File: + True + True 0 True + False 3 2 12 @@ -223,6 +255,7 @@ True + False 0 @@ -236,6 +269,7 @@ True + False 0 @@ -249,9 +283,11 @@ True + False True + False 0 True @@ -267,6 +303,7 @@ True + False 0 Filename: @@ -275,11 +312,13 @@ GTK_FILL + GTK_FILL True + False 0 Size: @@ -290,11 +329,13 @@ 1 2 GTK_FILL + GTK_FILL True + False 0 Modified: @@ -305,21 +346,27 @@ 2 3 GTK_FILL + GTK_FILL False + True 1 + True + True 1 + True + True 5 1 @@ -327,26 +374,32 @@ True + False 6 6 True + False False + True 2 Over_write the old file + False True True False + False True + 0 True True @@ -359,10 +412,13 @@ Do not overwrite _the old file + False True True False + False True + 0 True overwrite_yes_radiobutton @@ -375,10 +431,13 @@ Overwrite _all files + False True True False + False True + 0 True overwrite_yes_radiobutton @@ -391,10 +450,13 @@ _Do not overwrite any file + False True True False + False True + 0 True overwrite_yes_radiobutton @@ -407,14 +469,18 @@ True + False 6 _Save the new file as: + False True True False + False True + 0 True overwrite_yes_radiobutton @@ -428,16 +494,19 @@ True True - + True + True + True 1 False + True 7 diff -Nru gthumb-2.14.3/data/ui/personalize-filters.ui gthumb-3.0.0/data/ui/personalize-filters.ui --- gthumb-2.14.3/data/ui/personalize-filters.ui 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/ui/personalize-filters.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,96 +1,158 @@ - + False 5 Filters normal - + True + False + vertical 2 + + + True + False + end + + + gtk-close + False + True + True + True + False + True + + + False + False + 0 + + + + + gtk-help + False + True + True + True + False + True + + + False + False + 1 + True + + + + + False + True + end + 0 + + True + False 6 12 True + False 6 True + False 0 _General filter: False + True 0 True + False + False + True 1 False + True 0 True + False 6 True + False 0 _Other filters: False + True 0 True + False 12 - 250 + 300 300 True True - automatic - automatic etched-in + True + True 0 True + False 6 start gtk-new + False True True True @@ -106,6 +168,7 @@ gtk-edit + False True True True @@ -121,6 +184,7 @@ gtk-remove + False True True True @@ -136,66 +200,31 @@ False + True 1 + True + True 1 + True + True 1 + True + True 1 - - - True - end - - - gtk-close - True - True - True - False - True - - - False - False - 0 - - - - - gtk-help - True - True - True - False - True - - - False - False - 1 - True - - - - - False - end - 0 - - diff -Nru gthumb-2.14.3/data/ui/preferences.ui gthumb-3.0.0/data/ui/preferences.ui --- gthumb-2.14.3/data/ui/preferences.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/data/ui/preferences.ui 2012-03-31 09:42:32.000000000 +0000 @@ -1,70 +1,64 @@ - - + + - Follow Nautilus behaviour + below the folder list - Activate items with a single click - - - Activate items with a double click + on the right False - 6 - gthumb Preferences + 5 + gThumb Preferences dialog - - True + False vertical - 8 + 2 - - True + False end gtk-help + False True True - False + True False True False - False + True 0 True - gtk-close + gtk-ok + False True True - True - True - True - False + True False True False - False + True 1 @@ -82,118 +76,145 @@ True 5 - + True False 12 + vertical 12 - + True False - 6 + 0 + none - - True - False - 5 - - - True - False - Appearance - - - - - - False - False - 0 - - - - - True - True - 0 - - - - + True False + 6 12 - + True False + vertical - + True False - 2 - 2 - 6 6 + 6 - + True False 0 _Toolbar style: True + toolbar_style_combobox - GTK_FILL + 0 + 0 + 1 + 1 - + True False - - - + 0 + T_humbnails in viewer: + True + + + 0 + 1 + 1 + 1 + + + + + True + False + + System settings + Text below icons + Text beside icons + Icons only + Text only + 1 - 2 + 0 + 1 + 1 - + + True + False + + on the bottom + on the side + + + + 1 + 1 + 1 + 1 + + + + True False 0 - T_humbnails in viewer: + File _properties in browser: True + file_properties_position_combobox - 1 - 2 - GTK_FILL + 0 + 2 + 1 + 1 - + True False - thumbnails_pane_orient_liststore + file_properties_position_liststore - 1 + 0 1 - 2 - 1 - 2 + 2 + 1 + 1 + + + + + + + + + False @@ -204,11 +225,17 @@ - - True - True - 1 - + + + + True + False + Appearance + True + + + + @@ -218,55 +245,51 @@ - + True False - 6 + 0 + none - - True - False - 5 - - - True - False - On startup: - center - - - - - - False - False - 0 - - - - - True - True - 0 - - - - + True False + 6 12 - + True False + vertical + 6 + + + Go to last _visited location + False + True + True + False + False + True + 0 + True + True + + + False + True + 0 + + - + True False 6 - - Go to last _visited location + + Go to this _folder: + False True True False @@ -275,99 +298,94 @@ 0 True True + go_to_last_location_radiobutton False - False + True 0 - + True False - 6 - - - Go to this _folder: - True - True - False - False - True - True - go_to_last_location_radiobutton - - - False - False - 0 - - - - - True - False - select-folder - False - Choose startup folder - - - True - True - 1 - - + select-folder + Choose startup folder - False - False + True + True 1 + + + False + True + 1 + + + + + True + False - + + Set to C_urrent + False True - False - 6 - - - Set to C_urrent - True - True - True - False - True - - - False - False - end - 0 - - + True + True + False + True - True + False True - 2 + end + 0 - True + False True - 0 + 2 + + + + + _Reuse the active window to open files + False + True + True + False + False + True + 0 + True + + + False + True + 3 - - True - True - 1 - + + + + True + False + On startup: + True + + + + @@ -377,51 +395,27 @@ - + True False - 6 + 0 + none - - True - False - 5 - - - True - False - Other - center - - - - - - False - False - 0 - - - - - False - True - 0 - - - - + True False + 6 12 - + True False + vertical 6 As_k confirmation before deleting files or catalogs + False True True False @@ -432,13 +426,14 @@ False - False + True 0 Ask whether to save _modified files + False True True False @@ -449,13 +444,14 @@ False - False + True 1 _Store metadata inside files if possible + False True True False @@ -465,7 +461,7 @@ True - True + False True 2 @@ -473,11 +469,17 @@ - - True - True - 1 - + + + + True + False + Other + True + + + + @@ -489,78 +491,56 @@ - + True False General - center False - + True False 12 + vertical 12 - + True False - 6 + 0 + none - - True - False - 5 - - - True - False - Caption - center - - - - - - False - False - 0 - - - - - False - True - 0 - - - - + True False + 6 12 - 150 True True in - automatic - - True - True - 1 - + + + + True + False + Caption + True + + + + @@ -570,61 +550,35 @@ - + True False - 6 + 0 + none - - True - False - 5 - - - True - False - Other - center - - - - - - False - False - 0 - - - - - False - True - 0 - - - - + True False + 6 12 - + True False + vertical 6 - + True False 6 - + True False - 0 Thumbnail _size: True - center + thumbnail_size_combobox False @@ -633,11 +587,30 @@ - + True False - + + True + False + + 48 + 64 + 85 + 95 + 112 + 128 + 164 + 200 + 256 + + + + False + True + 0 + @@ -648,7 +621,7 @@ - True + False True 0 @@ -656,6 +629,7 @@ D_etermine image type from content (slower) + False True True False @@ -665,7 +639,7 @@ True - True + False True 1 @@ -673,11 +647,17 @@ - - True - True - 1 - + + + + True + False + Other + True + + + + @@ -692,11 +672,10 @@ - + True False Browser - center 1 @@ -713,127 +692,8 @@ - help_button - close_button + help_button + close_button - - - - - - - - 48 - - - 64 - - - 85 - - - 95 - - - 112 - - - 128 - - - 164 - - - 200 - - - 256 - - - - - - - - - - - - - 0 - on the bottom - - - 1 - on the side - - - - - - - - - - - System settings - - - Text below icons - - - Text beside icons - - - Icons only - - - Text only - - - - - - - - - - - White - - - None - - - Black - - - Checked - - - - - - - - - - - Keep previous zoom - - - Fit to window - - - Fit to window if larger - - - Set image to actual size - - - Fit to width if larger - - - diff -Nru gthumb-2.14.3/data/ui/sort-order.ui gthumb-3.0.0/data/ui/sort-order.ui --- gthumb-2.14.3/data/ui/sort-order.ui 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/data/ui/sort-order.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,34 +1,67 @@ - + - + False 5 Sort By normal - + True + False vertical 2 + + + True + False + end + + + gtk-close + False + True + True + True + False + True + + + False + False + 0 + + + + + False + True + end + 0 + + True + False 6 - vertical 6 True + False 6 True + False _Sort by: True False + True 0 @@ -37,53 +70,36 @@ + False + True 0 _Inverse order + False True True False + False True + 0 True + False + True 1 False + True 1 - - - True - end - - - gtk-close - True - True - True - True - - - False - False - 0 - - - - - False - end - 0 - - diff -Nru gthumb-2.14.3/debian/changelog gthumb-3.0.0/debian/changelog --- gthumb-2.14.3/debian/changelog 2012-04-11 03:02:39.000000000 +0000 +++ gthumb-3.0.0/debian/changelog 2012-05-09 08:39:08.000000000 +0000 @@ -1,15 +1,22 @@ -gthumb (3:2.14.3-0ubuntu1) precise; urgency=low +gthumb (3:3.0.0-1~stracciatellappa~precise1) precise; urgency=low - * New upstream version from the stable branch. + * Rebuild or gnome stracciatella ppa + * debian/control + - updated build depend to libbrasero-media3-dev - -- Martin-Éric Racine Wed, 11 Apr 2012 06:01:19 +0300 + -- Gianvito Cavasoli Tue, 08 May 2012 15:56:56 +0200 -gthumb (3:2.14.2-1ubuntu1) precise; urgency=low +gthumb (3:2.90.2-1) experimental; urgency=low - * debian/patches/21-gthumb_missing_help_page.patch: fix missing help page in - preferences (LP: #928593) + * New upstream version + * Bump required versions of Build-Dependencies + * Patches refreshed to match new upstream code + * Standards-Version bump to 3.9.3, no changes needed + * Build-Depend on libpng12-dev | libpng-dev (Closes: #662366) + * Build-Depend on libexiv2 >= 0.21 + * Update debian/copyright - -- Vibhav Pant Sat, 24 Mar 2012 20:32:05 +0530 + -- David Paleino Sun, 08 Apr 2012 01:13:17 +0200 gthumb (3:2.14.2-1) unstable; urgency=low diff -Nru gthumb-2.14.3/debian/control gthumb-3.0.0/debian/control --- gthumb-2.14.3/debian/control 2012-03-26 15:13:57.000000000 +0000 +++ gthumb-3.0.0/debian/control 2012-05-09 08:36:31.000000000 +0000 @@ -1,29 +1,26 @@ Source: gthumb Section: gnome Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: David Paleino +Maintainer: David Paleino Build-Depends: debhelper (>= 7.0.50~) , dh-autoreconf , intltool - , libexiv2-dev (>= 0.18) + , libexiv2-dev (>= 0.21) , flex , bison , libtiff4-dev - , libpng12-dev + , libpng12-dev | libpng-dev , libjpeg-dev , libsm-dev , libice-dev - , gconf2 , scrollkeeper , automake , autoconf , libtool , gnome-doc-utils , gnome-common - , libgtk2.0-dev (>= 2.24.0) - , libgconf2-dev (>= 2.6.0) + , libgtk-3-dev (>= 3.2.0) , libxml2-dev (>= 2.4.0) , libglib2.0-dev (>= 2.28.0) , libcairo2-dev @@ -32,11 +29,13 @@ , libglade2-dev (>= 2.4.0) , libgstreamer0.10-dev (>= 0.10) , libgstreamer-plugins-base0.10-dev - , libunique-dev (>= 1.1.2) - , libsoup-gnome2.4-dev (>= 2.26) - , libgnome-keyring-dev (>= 2.28) -# , libbrasero-media-dev (>= 2.28) -Standards-Version: 3.9.2 + , libsoup-gnome2.4-dev (>= 2.36) + , libgnome-keyring-dev (>= 3.2.0) + , libbrasero-media3-dev (>= 3.4.0) + , libchamplain-gtk-0.12-dev (>= 0.12.0) + , librsvg2-dev (>= 2.34.0) + , zlib1g-dev +Standards-Version: 3.9.3 Homepage: http://gthumb.sourceforge.net Vcs-Git: git://git.debian.org/git/collab-maint/gthumb.git Vcs-Browser: http://git.debian.org/?p=collab-maint/gthumb.git diff -Nru gthumb-2.14.3/debian/copyright gthumb-3.0.0/debian/copyright --- gthumb-2.14.3/debian/copyright 2012-02-22 19:12:33.000000000 +0000 +++ gthumb-3.0.0/debian/copyright 2012-04-07 23:12:30.000000000 +0000 @@ -1,49 +1,32 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Files: debian/* -Copyright: © 2008-2012, David Paleino - © 2001-2007, Remco van de Meent -License: GPL-3+ - This program is free software: you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation, either version 3 - of the License, or (at your option) any later version. - Files: * Copyright: © 2001-2012, The Free Software Foundation, Inc. License: GPL-2+ - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. + +Files: debian/* +Copyright: © 2008-2012, David Paleino + © 2001-2007, Remco van de Meent +License: GPL-3+ Files: libgthumb/gconf-utils.{c,h} Copyright: © 2001-2002, The Free Software Foundation, Inc. - © 2000-2001, Eazel, Inc. -License: GPL-2+, LGPL-2+ - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - --- - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + © 2000-2001, Eazel, Inc. +License: GPL-2+ or LGPL-2+ Files: libgthumb/pixbuf-utils.c Copyright: © 1999-2003, The Free Software Foundation, Inc. - © 1999, Michael Zucchi - © 1999, Red Hat, Inc. - © 1995, Spencer Kimball and Peter Mattis -License: GPL-2+, LGPL-2+ + © 1999, Michael Zucchi + © 1999, Red Hat, Inc. + © 1995, Spencer Kimball and Peter Mattis +License: GPL-2+ or LGPL-2+ Files: src/gtkcellrendererthreestates.{c,h} Copyright: © 2001, The Free Software Foundation, Inc. - © 2000, Red Hat, Inc. - Jonathan Blandford -License: GPL-2+, LGPL-2+ + © 2000, Red Hat, Inc. - Jonathan Blandford +License: GPL-2+ or LGPL-2+ -Files: libgthumb/md5.{c,h} +Files: libgthumb/md5.* Copyright: © 1995, Software Foundation, Inc. License: GPL-2+ @@ -51,21 +34,17 @@ Copyright: © 1984, 1989, 1990, 2000-2006, The Free Software Foundation, Inc. License: GPL-2+ -Files: libgthumb/eel-canvas-rect.{c,h} +Files: libgthumb/eel-canvas-rect.* Copyright: © 2002, Alexander Larsson License: LGPL-2+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. -Files: libgthumb/jpegutils/jpeg-marker.{c,h} - libgthumb/jpegutils/jpeg-data.{c,h} +Files: libgthumb/jpegutils/jpeg-marker.* + libgthumb/jpegutils/jpeg-data.* Copyright: © 2001, Lutz Müller License: LGPL-2+ -Files: src/totem-scrsaver.{c,h} -Copyright: © 2004, 2005, Bastien Nocera +Files: src/totem-scrsaver.* +Copyright: © 2004-2005, Bastien Nocera License: LGPL-2+ Files: doc/C/gthumb.xml @@ -78,18 +57,18 @@ Files: doc/es/gthumb.xml Copyright: © 2007, Jorge González - © 2001-2004, 2006, Paolo Bacchilega + © 2001-2004, 2006, Paolo Bacchilega License: GFDL-1.1+ Files: doc/fr/gthumb.xml Copyright: © 2007, Bruno Brouard - © 2007, Claude Paroz - © 2001-2004, 2006, Paolo Bacchilega + © 2007, Claude Paroz + © 2001-2004, 2006, Paolo Bacchilega License: GFDL-1.1+ Files: doc/sv/gthumb.xml Copyright: © 2006-2007, Daniel Nylander - © 2001-2004, 2006, Paolo Bacchilega + © 2001-2004, 2006, Paolo Bacchilega License: GFDL-1.1+ Files: extensions/jpeg_utils/jpegint-80.h @@ -98,27 +77,22 @@ License: libjpeg Files: extensions/jpeg_utils/jpegtran.c - extensions/jpeg_utils/transupp-62.{c,h} + extensions/jpeg_utils/transupp-62.* Copyright: © 1995-1997, Thomas G. Lane © 2001-2002, 2009, The Free Software Foundation, Inc. -License: GPL-2+, libjpeg +License: GPL-2+ and libjpeg Files: extensions/jpeg_utils/transupp-80.c Copyright: © 1997-2009, Thomas G. Lane © 1997-2009, Guido Vollbeding © 2001-2002, The Free Software Foundation, Inc. -License: GPL-2+, libjpeg +License: GPL-2+ and libjpeg Files: extensions/jpeg_utils/transupp-80.h Copyright: © 1997-2009, Thomas G. Lane © 1997-2009, Guido Vollbeding License: libjpeg -On Debian systems, you can find the mentioned licenses: -GPLv2 - `/usr/share/common-licenses/GPL-2' -GPLv3 - `/usr/share/common-licenses/GPL-3' -LGPLv2 - `/usr/share/common-licenses/LGPL-2' - License: libjpeg LEGAL ISSUES ============ @@ -171,20 +145,18 @@ X-Comment: the full READMEs can be found in ./extensions/jpeg_utils/README.6b and ./extensions/jpeg_utils/README.8a in gThumb's sourcecode. -GFDLv1.1: - +License: GFDL-1.1+ GNU Free Documentation License Version 1.1, March 2000 - - + . Copyright (C) 2000 Free Software Foundation, Inc. 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - - + . + . 0. PREAMBLE - + . The purpose of this License is to make a manual, textbook, or other written document "free" in the sense of freedom: to assure everyone the effective freedom to copy and redistribute it, with or without @@ -192,12 +164,12 @@ this License preserves for the author and publisher a way to get credit for their work, while not being considered responsible for modifications made by others. - + . This License is a kind of "copyleft", which means that derivative works of the document must themselves be free in the same sense. It complements the GNU General Public License, which is a copyleft license designed for free software. - + . We have designed this License in order to use it for manuals for free software, because free software needs free documentation: a free program should come with manuals providing the same freedoms that the @@ -205,20 +177,20 @@ can be used for any textual work, regardless of subject matter or whether it is published as a printed book. We recommend this License principally for works whose purpose is instruction or reference. - - + . + . 1. APPLICABILITY AND DEFINITIONS - + . This License applies to any manual or other work that contains a notice placed by the copyright holder saying it can be distributed under the terms of this License. The "Document", below, refers to any such manual or work. Any member of the public is a licensee, and is addressed as "you". - + . A "Modified Version" of the Document means any work containing the Document or a portion of it, either copied verbatim, or with modifications and/or translated into another language. - + . A "Secondary Section" is a named appendix or a front-matter section of the Document that deals exclusively with the relationship of the publishers or authors of the Document to the Document's overall subject @@ -228,15 +200,15 @@ mathematics.) The relationship could be a matter of historical connection with the subject or with related matters, or of legal, commercial, philosophical, ethical or political position regarding them. - + . The "Invariant Sections" are certain Secondary Sections whose titles are designated, as being those of Invariant Sections, in the notice that says that the Document is released under this License. - + . The "Cover Texts" are certain short passages of text that are listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says that the Document is released under this License. - + . A "Transparent" copy of the Document means a machine-readable copy, represented in a format whose specification is available to the general public, whose contents can be viewed and edited directly and @@ -248,7 +220,7 @@ markup has been designed to thwart or discourage subsequent modification by readers is not Transparent. A copy that is not "Transparent" is called "Opaque". - + . Examples of suitable formats for Transparent copies include plain ASCII without markup, Texinfo input format, LaTeX input format, SGML or XML using a publicly available DTD, and standard-conforming simple HTML @@ -257,17 +229,17 @@ word processors, SGML or XML for which the DTD and/or processing tools are not generally available, and the machine-generated HTML produced by some word processors for output purposes only. - + . The "Title Page" means, for a printed book, the title page itself, plus such following pages as are needed to hold, legibly, the material this License requires to appear in the title page. For works in formats which do not have any title page as such, "Title Page" means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text. - - + . + . 2. VERBATIM COPYING - + . You may copy and distribute the Document in any medium, either commercially or noncommercially, provided that this License, the copyright notices, and the license notice saying this License applies to the Document are reproduced @@ -276,13 +248,13 @@ reading or further copying of the copies you make or distribute. However, you may accept compensation in exchange for copies. If you distribute a large enough number of copies you must also follow the conditions in section 3. - + . You may also lend copies, under the same conditions stated above, and you may publicly display copies. - - + . + . 3. COPYING IN QUANTITY - + . If you publish printed copies of the Document numbering more than 100, and the Document's license notice requires Cover Texts, you must enclose the copies in covers that carry, clearly and legibly, all these Cover Texts: Front-Cover Texts @@ -292,11 +264,11 @@ visible. You may add other material on the covers in addition. Copying with changes limited to the covers, as long as they preserve the title of the Document and satisfy these conditions, can be treated as verbatim copying in other respects. - + . If the required texts for either cover are too voluminous to fit legibly, you should put the first ones listed (as many as fit reasonably) on the actual cover, and continue the rest onto adjacent pages. - + . If you publish or distribute Opaque copies of the Document numbering more than 100, you must either include a machine-readable Transparent copy along with each Opaque copy, or state in or with each Opaque copy a publicly-accessible computer-network @@ -308,20 +280,20 @@ accessible at the stated location until at least one year after the last time you distribute an Opaque copy (directly or through your agents or retailers) of that edition to the public. - + . It is requested, but not required, that you contact the authors of the Document well before redistributing any large number of copies, to give them a chance to provide you with an updated version of the Document. - - + . + . 4. MODIFICATIONS - + . You may copy and distribute a Modified Version of the Document under the conditions of sections 2 and 3 above, provided that you release the Modified Version under precisely this License, with the Modified Version filling the role of the Document, thus licensing distribution and modification of the Modified Version to whoever possesses a copy of it. In addition, you must do these things in the Modified Version: - + . * A. Use in the Title Page (and on the covers, if any) a title distinct from that of the Document, and from those of previous versions (which should, if there were any, be listed in the History section of the Document). You may use the @@ -367,19 +339,19 @@ included in the Modified Version. * N. Do not retitle any existing section as "Endorsements" or to conflict in title with any Invariant Section. - + . If the Modified Version includes new front-matter sections or appendices that qualify as Secondary Sections and contain no material copied from the Document, you may at your option designate some or all of these sections as invariant. To do this, add their titles to the list of Invariant Sections in the Modified Version's license notice. These titles must be distinct from any other section titles. - + . You may add a section entitled "Endorsements", provided it contains nothing but endorsements of your Modified Version by various parties--for example, statements of peer review or that the text has been approved by an organization as the authoritative definition of a standard. - + . You may add a passage of up to five words as a Front-Cover Text, and a passage of up to 25 words as a Back-Cover Text, to the end of the list of Cover Texts in the Modified Version. Only one passage of Front-Cover Text and one of Back-Cover Text @@ -388,20 +360,20 @@ arrangement made by the same entity you are acting on behalf of, you may not add another; but you may replace the old one, on explicit permission from the previous publisher that added the old one. - + . The author(s) and publisher(s) of the Document do not by this License give permission to use their names for publicity for or to assert or imply endorsement of any Modified Version. - - + . + . 5. COMBINING DOCUMENTS - + . You may combine the Document with other documents released under this License, under the terms defined in section 4 above for modified versions, provided that you include in the combination all of the Invariant Sections of all of the original documents, unmodified, and list them all as Invariant Sections of your combined work in its license notice. - + . The combined work need only contain one copy of this License, and multiple identical Invariant Sections may be replaced with a single copy. If there are multiple Invariant Sections with the same name but different contents, make the title of each such section @@ -409,29 +381,29 @@ publisher of that section if known, or else a unique number. Make the same adjustment to the section titles in the list of Invariant Sections in the license notice of the combined work. - + . In the combination, you must combine any sections entitled "History" in the various original documents, forming one section entitled "History"; likewise combine any sections entitled "Acknowledgements", and any sections entitled "Dedications". You must delete all sections entitled "Endorsements." - - + . + . 6. COLLECTIONS OF DOCUMENTS - + . You may make a collection consisting of the Document and other documents released under this License, and replace the individual copies of this License in the various documents with a single copy that is included in the collection, provided that you follow the rules of this License for verbatim copying of each of the documents in all other respects. - + . You may extract a single document from such a collection, and distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. - - + . + . 7. AGGREGATION WITH INDEPENDENT WORKS - + . A compilation of the Document or its derivatives with other separate and independent documents or works, in or on a volume of a storage or distribution medium, does not as a whole count as a Modified Version of the Document, provided no compilation @@ -439,15 +411,15 @@ and this License does not apply to the other self-contained works thus compiled with the Document, on account of their being thus compiled, if they are not themselves derivative works of the Document. - + . If the Cover Text requirement of section 3 is applicable to these copies of the Document, then if the Document is less than one quarter of the entire aggregate, the Document's Cover Texts may be placed on covers that surround only the Document within the aggregate. Otherwise they must appear on covers around the whole aggregate. - - + . + . 8. TRANSLATION - + . Translation is considered a kind of modification, so you may distribute translations of the Document under the terms of section 4. Replacing Invariant Sections with translations requires special permission from their copyright holders, but you may @@ -456,25 +428,25 @@ provided that you also include the original English version of this License. In case of a disagreement between the translation and the original English version of this License, the original English version will prevail. - - + . + . 9. TERMINATION - + . You may not copy, modify, sublicense, or distribute the Document except as expressly provided for under this License. Any other attempt to copy, modify, sublicense or distribute the Document is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - - + . + . 10. FUTURE REVISIONS OF THIS LICENSE - + . The Free Software Foundation may publish new, revised versions of the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See http://www.gnu.org/copyleft/. - + . Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered version of this License "or any later version" applies to it, you have the option of following the terms and conditions @@ -482,14 +454,14 @@ (not as a draft) by the Free Software Foundation. If the Document does not specify a version number of this License, you may choose any version ever published (not as a draft) by the Free Software Foundation. - - + . + . How to use this License for your documents - + . To use this License in a document you have written, include a copy of the License in the document and put the following copyright and license notices just after the title page: - + . Copyright (c) YEAR YOUR NAME. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 @@ -498,12 +470,64 @@ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. A copy of the license is included in the section entitled "GNU Free Documentation License". - + . If you have no Invariant Sections, write "with no Invariant Sections" instead of saying which ones are invariant. If you have no Front-Cover Texts, write "no Front-Cover Texts" instead of "Front-Cover Texts being LIST"; likewise for Back-Cover Texts. - + . If your document contains nontrivial examples of program code, we recommend releasing these examples in parallel under your choice of free software license, such as the GNU General Public License, to permit their use in free software. + +License: GPL-2+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, you can find the complete text of the GNU General + Public License version 2 in `/usr/share/common-licenses/GPL-2'. + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, you can find the complete text of the GNU General + Public License version 3 in `/usr/share/common-licenses/GPL-3'. + +License: LGPL-2+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + . + You should have received a copy of the GNU Library General Public + License along with this program. If not, see + . + . + On Debian systems, you can find the complete text of the GNU Library + General Public License version 2 in `/usr/share/common-licenses/LGPL-2'. diff -Nru gthumb-2.14.3/debian/gthumb-data.install gthumb-3.0.0/debian/gthumb-data.install --- gthumb-2.14.3/debian/gthumb-data.install 2011-06-16 21:42:42.000000000 +0000 +++ gthumb-3.0.0/debian/gthumb-data.install 2012-04-07 19:13:31.000000000 +0000 @@ -1,6 +1,8 @@ +usr/share/aclocal +usr/share/GConf +usr/share/glib-2.0 usr/share/gnome -usr/share/icons usr/share/gthumb +usr/share/icons usr/share/locale -usr/share/gconf ../gthumb.xpm usr/share/pixmaps/ diff -Nru gthumb-2.14.3/debian/patches/01-fix_missing_linkage.patch gthumb-3.0.0/debian/patches/01-fix_missing_linkage.patch --- gthumb-2.14.3/debian/patches/01-fix_missing_linkage.patch 2011-12-21 21:11:08.000000000 +0000 +++ gthumb-3.0.0/debian/patches/01-fix_missing_linkage.patch 2012-04-07 18:09:48.000000000 +0000 @@ -9,15 +9,15 @@ --- gthumb.orig/gthumb/Makefile.am +++ gthumb/gthumb/Makefile.am -@@ -273,6 +273,7 @@ gthumb_LDADD = \ - $(LIBOPENRAW_LIBS) \ +@@ -276,6 +276,7 @@ gthumb_LDADD = \ $(LIBSOUP_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ + $(LIBRSVG_LIBS) \ + -lICE \ $(NULL) if RUN_IN_PLACE -@@ -303,6 +304,7 @@ gthumb_CFLAGS = \ +@@ -308,6 +309,7 @@ gthumb_CFLAGS = \ $(LIBSOUP_CFLAGS) \ $(LIBCHAMPLAIN_CFLAGS) \ $(SMCLIENT_CFLAGS) \ diff -Nru gthumb-2.14.3/debian/patches/05-fix_locales.patch gthumb-3.0.0/debian/patches/05-fix_locales.patch --- gthumb-2.14.3/debian/patches/05-fix_locales.patch 2011-06-16 21:42:42.000000000 +0000 +++ gthumb-3.0.0/debian/patches/05-fix_locales.patch 2012-04-07 18:09:55.000000000 +0000 @@ -5,7 +5,7 @@ --- gthumb.orig/po/ru.po +++ gthumb/po/ru.po -@@ -86,7 +86,7 @@ msgstr "Показать парамет +@@ -90,7 +90,7 @@ msgstr "Показать парамет #: ../data/gthumb.desktop.in.in.h:1 msgid "Image Viewer" diff -Nru gthumb-2.14.3/debian/patches/07-fix_documentation_xml.patch gthumb-3.0.0/debian/patches/07-fix_documentation_xml.patch --- gthumb-2.14.3/debian/patches/07-fix_documentation_xml.patch 2011-12-21 21:13:09.000000000 +0000 +++ gthumb-3.0.0/debian/patches/07-fix_documentation_xml.patch 2012-04-26 20:43:06.000000000 +0000 @@ -186,7 +186,7 @@ -
+
- Anzeigen und verbergen von Teilen der grafischen Oberflächen + Anzeigen und verbergen von Teilen der grafischen Oberflächen @@ -80,7 +80,7 @@ @@ -195,7 +195,7 @@ -
+
- Tastenkombinationen für Bildbetrachter und Browser bearbeiten + Tastenkombinationen für Bildbetrachter und Browser bearbeiten
@@ -173,7 +173,7 @@ @@ -204,7 +204,7 @@ -
+
- Tastenkombinationen nur für den Ansichtsmodus bearbeiten + Tastenkombinationen nur für den Ansichtsmodus bearbeiten
@@ -257,7 +257,7 @@ @@ -608,7 +608,7 @@ Bližnjice pregledovalnika
-@@ -401,7 +401,7 @@ +@@ -390,7 +390,7 @@
@@ -617,12 +617,12 @@ Krmarjenje brskalnika -@@ -478,7 +478,7 @@ +@@ -467,7 +467,7 @@
-
+
- Nadzor diapredstavitve + Nadzor predstavitve diff -Nru gthumb-2.14.3/debian/patches/21-gthumb_missing_help_page.patch gthumb-3.0.0/debian/patches/21-gthumb_missing_help_page.patch --- gthumb-2.14.3/debian/patches/21-gthumb_missing_help_page.patch 2012-03-26 15:37:58.000000000 +0000 +++ gthumb-3.0.0/debian/patches/21-gthumb_missing_help_page.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Origin: http://git.gnome.org/browse/gthumb/commit/?id=964c6a87a8d8eb5cf3f528ef5369ded9fc236dea -Description: fix missing help page in Preferences dialog -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=671290 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/928593 -Forwarded: not-needed -Reviewed-By: Michael J. Chudobiak -Last-Update: 21-02-2012 - ---- gthumb-2.14.2.orig/gthumb/dlg-preferences.c -+++ gthumb-2.14.2/gthumb/dlg-preferences.c -@@ -107,7 +107,7 @@ static void - help_button_clicked_cb (GtkWidget *widget, - DialogData *data) - { -- show_help_dialog (GTK_WINDOW (data->dialog), "preferences"); -+ show_help_dialog (GTK_WINDOW (data->dialog), NULL); - } - - diff -Nru gthumb-2.14.3/debian/patches/series gthumb-3.0.0/debian/patches/series --- gthumb-2.14.3/debian/patches/series 2012-03-26 15:17:47.000000000 +0000 +++ gthumb-3.0.0/debian/patches/series 2011-12-21 22:24:02.000000000 +0000 @@ -6,4 +6,3 @@ 07-fix_documentation_xml.patch 10-fix_POTFILES.skip.patch 13-fix_Close_mismatch.patch -21-gthumb_missing_help_page.patch diff -Nru gthumb-2.14.3/debian/rules gthumb-3.0.0/debian/rules --- gthumb-2.14.3/debian/rules 2011-10-14 07:22:55.000000000 +0000 +++ gthumb-3.0.0/debian/rules 2012-05-09 08:36:41.000000000 +0000 @@ -7,7 +7,6 @@ override_dh_auto_configure: dh_auto_configure -- --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ --disable-clutter \ - --disable-brasero \ --enable-debug #override_dh_auto_install: diff -Nru gthumb-2.14.3/extensions/23hq/23hq.extension.in.in gthumb-3.0.0/extensions/23hq/23hq.extension.in.in --- gthumb-2.14.3/extensions/23hq/23hq.extension.in.in 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/23hq/23hq.extension.in.in 2012-04-21 09:20:46.000000000 +0000 @@ -10,4 +10,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=importer;export_tools;flicker_utils diff -Nru gthumb-2.14.3/extensions/23hq/callbacks.c gthumb-3.0.0/extensions/23hq/callbacks.c --- gthumb-2.14.3/extensions/23hq/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/23hq/callbacks.c 2012-02-19 15:01:31.000000000 +0000 @@ -56,16 +56,18 @@ ""; -static GtkActionEntry action_entries[] = { +static GthActionEntryExt action_entries[] = { /* { "File_Import_23", "site-twentythree", N_("_23..."), NULL, N_("Download photos from 23"), + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, G_CALLBACK (gth_browser_activate_action_import_23) }, */ { "File_Export_23", "site-twentythree", N_("_23..."), NULL, N_("Upload photos to 23"), + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, G_CALLBACK (gth_browser_activate_action_export_23) }, }; @@ -95,10 +97,10 @@ data->action_group = gtk_action_group_new ("23HQ Actions"); gtk_action_group_set_translation_domain (data->action_group, NULL); - gtk_action_group_add_actions (data->action_group, - action_entries, - G_N_ELEMENTS (action_entries), - browser); + _gtk_action_group_add_actions_with_flags (data->action_group, + action_entries, + G_N_ELEMENTS (action_entries), + browser); gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->action_group, 0); merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), ui_info, -1, &error); @@ -107,9 +109,5 @@ g_clear_error (&error); } - /*gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Import/Web_Services/File_Import_23")), TRUE);*/ - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Export/Web_Services/File_Export_23")), TRUE); - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ExportPopup/Web_Services/File_Export_23")), TRUE); - g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } diff -Nru gthumb-2.14.3/extensions/23hq/Makefile.in gthumb-3.0.0/extensions/23hq/Makefile.in --- gthumb-2.14.3/extensions/23hq/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/23hq/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -122,6 +139,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(lib23hq_la_SOURCES) DIST_SOURCES = $(am__lib23hq_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) ETAGS = etags CTAGS = ctags @@ -170,10 +192,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +201,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +241,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +291,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +321,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -384,7 +406,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -392,6 +413,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -475,8 +498,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/bookmarks/bookmarks.extension.in.in gthumb-3.0.0/extensions/bookmarks/bookmarks.extension.in.in --- gthumb-2.14.3/extensions/bookmarks/bookmarks.extension.in.in 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/bookmarks/bookmarks.extension.in.in 2012-04-21 09:21:36.000000000 +0000 @@ -10,3 +10,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/bookmarks/callbacks.c gthumb-3.0.0/extensions/bookmarks/callbacks.c --- gthumb-2.14.3/extensions/bookmarks/callbacks.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/extensions/bookmarks/callbacks.c 2012-03-24 15:13:35.000000000 +0000 @@ -349,6 +349,8 @@ g_return_if_fail (GTH_IS_BROWSER (browser)); data = g_new0 (BrowserData, 1); + g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); + data->browser = browser; data->actions = gtk_action_group_new ("Bookmarks Actions"); @@ -372,10 +374,6 @@ "entry-points-changed", G_CALLBACK (entry_points_changed_cb), data); - - _gth_browser_update_entry_point_list (browser); - - g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } @@ -383,19 +381,5 @@ bookmarks__gth_browser_construct_idle_callback_cb (GthBrowser *browser) { _gth_browser_update_bookmark_list (browser); -} - - -void -bookmarks__gth_browser_update_sensitivity_cb (GthBrowser *browser) -{ - BrowserData *data; - /*GtkAction *action;*/ - - data = g_object_get_data (G_OBJECT (browser), BROWSER_DATA_KEY); - g_return_if_fail (data != NULL); - - /*action = gtk_action_group_get_action (data->actions, "Edit_AddToCatalog"); - sensitive = n_selected > 0; - g_object_set (action, "sensitive", sensitive, NULL);*/ + _gth_browser_update_entry_point_list (browser); } diff -Nru gthumb-2.14.3/extensions/bookmarks/data/Makefile.in gthumb-3.0.0/extensions/bookmarks/data/Makefile.in --- gthumb-2.14.3/extensions/bookmarks/data/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/bookmarks/data/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/bookmarks/data/ui/Makefile.in gthumb-3.0.0/extensions/bookmarks/data/ui/Makefile.in --- gthumb-2.14.3/extensions/bookmarks/data/ui/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/bookmarks/data/ui/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/bookmarks/Makefile.in gthumb-3.0.0/extensions/bookmarks/Makefile.in --- gthumb-2.14.3/extensions/bookmarks/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/bookmarks/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -205,10 +227,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -216,6 +236,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -255,6 +276,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -303,8 +326,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -335,6 +356,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -422,7 +444,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -430,6 +451,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -521,8 +544,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -705,13 +731,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/burn_disc/burn_disc.extension.in.in gthumb-3.0.0/extensions/burn_disc/burn_disc.extension.in.in --- gthumb-2.14.3/extensions/burn_disc/burn_disc.extension.in.in 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/burn_disc/burn_disc.extension.in.in 2012-04-21 09:26:59.000000000 +0000 @@ -8,6 +8,7 @@ Category=Exporter [Loader] -Requires=export_tools Type=module -File=%LIBRARY% \ No newline at end of file +File=%LIBRARY% +API=%GTHUMB_API_VERSION% +Requires=export_tools diff -Nru gthumb-2.14.3/extensions/burn_disc/data/Makefile.in gthumb-3.0.0/extensions/burn_disc/data/Makefile.in --- gthumb-2.14.3/extensions/burn_disc/data/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/burn_disc/data/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/burn_disc/data/ui/Makefile.in gthumb-3.0.0/extensions/burn_disc/data/ui/Makefile.in --- gthumb-2.14.3/extensions/burn_disc/data/ui/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/burn_disc/data/ui/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/burn_disc/gth-burn-task.c gthumb-3.0.0/extensions/burn_disc/gth-burn-task.c --- gthumb-2.14.3/extensions/burn_disc/gth-burn-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/burn_disc/gth-burn-task.c 2012-02-19 15:01:31.000000000 +0000 @@ -51,7 +51,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthBurnTask, gth_burn_task, GTH_TYPE_TASK) static void @@ -64,7 +64,7 @@ static void -gth_task_finalize (GObject *object) +gth_burn_task_finalize (GObject *object) { GthBurnTask *task; @@ -88,7 +88,7 @@ task->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_burn_task_parent_class)->finalize (object); } @@ -216,7 +216,7 @@ cursor = gdk_cursor_new (GDK_WATCH); gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (task->priv->browser)), cursor); - gdk_cursor_unref (cursor); + g_object_unref (cursor); if (! initialized) { brasero_media_library_start (); @@ -361,22 +361,26 @@ burn_content_to_disc (task); } else { - gboolean recursive; + GSettings *settings; + gboolean recursive; _g_object_list_unref (task->priv->selected_files); task->priv->selected_files = NULL; + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); recursive = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (task->priv->builder, "folder_recursive_radiobutton"))); task->priv->test = gth_main_get_general_filter (); task->priv->file_source = gth_main_get_file_source (task->priv->location); gth_file_source_for_each_child (task->priv->file_source, task->priv->location, recursive, - eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE : GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE, + g_settings_get_boolean (settings, PREF_BROWSER_FAST_FILE_TYPE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE : GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE, start_dir_func, for_each_file_func, done_func, task); + + g_object_unref (settings); } } else @@ -392,7 +396,7 @@ task->priv->builder = _gtk_builder_new_from_file ("burn-source-selector.ui", "burn_disc"); task->priv->dialog = gtk_dialog_new_with_buttons (_("Write to Disc"), GTK_WINDOW (task->priv->browser), - GTK_DIALOG_NO_SEPARATOR, + 0, GTK_STOCK_HELP, GTK_RESPONSE_HELP, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, @@ -426,10 +430,8 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass*) class; - object_class->finalize = gth_task_finalize; + object_class->finalize = gth_burn_task_finalize; task_class = (GthTaskClass*) class; task_class->exec = gth_burn_task_exec; @@ -447,34 +449,6 @@ } -GType -gth_burn_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthBurnTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_burn_task_class_init, - NULL, - NULL, - sizeof (GthBurnTask), - 0, - (GInstanceInitFunc) gth_burn_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthBurnTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_burn_task_new (GthBrowser *browser, GList *selected_files) diff -Nru gthumb-2.14.3/extensions/burn_disc/Makefile.in gthumb-3.0.0/extensions/burn_disc/Makefile.in --- gthumb-2.14.3/extensions/burn_disc/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/burn_disc/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -132,6 +149,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -211,10 +233,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -222,6 +242,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -261,6 +282,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -309,8 +332,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -341,6 +362,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -428,7 +450,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -436,6 +457,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -527,8 +550,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -711,13 +737,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/cairo_io/cairo_io.extension.in.in gthumb-3.0.0/extensions/cairo_io/cairo_io.extension.in.in --- gthumb-2.14.3/extensions/cairo_io/cairo_io.extension.in.in 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/cairo_io/cairo_io.extension.in.in 2012-04-21 09:26:52.000000000 +0000 @@ -4,4 +4,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% After=jpeg_utils diff -Nru gthumb-2.14.3/extensions/cairo_io/cairo-io-png.c gthumb-3.0.0/extensions/cairo_io/cairo-io-png.c --- gthumb-2.14.3/extensions/cairo_io/cairo-io-png.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/extensions/cairo_io/cairo-io-png.c 2012-03-24 13:43:10.000000000 +0000 @@ -30,7 +30,7 @@ #define PNG_SETJMP(ptr) setjmp(png_jmpbuf(ptr)) #ifdef PNG_LIBPNG_VER -#if PNG_LIBPNG_VER < 10500 +#if PNG_LIBPNG_VER < 10400 #ifdef PNG_SETJMP #undef PNG_SETJMP #endif diff -Nru gthumb-2.14.3/extensions/cairo_io/cairo-io-svg.c gthumb-3.0.0/extensions/cairo_io/cairo-io-svg.c --- gthumb-2.14.3/extensions/cairo_io/cairo-io-svg.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/cairo_io/cairo-io-svg.c 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,189 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "cairo-io-svg.h" + + +/* GthImageSvg (private class) */ + + +#define GTH_IMAGE_SVG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), gth_image_svg_get_type(), GthImageSvg)) + + +typedef struct { + GthImage __parent; + RsvgHandle *rsvg; + int original_width; + int original_height; + double last_zoom; +} GthImageSvg; + + +typedef GthImageClass GthImageSvgClass; + + +static gpointer gth_image_svg_parent_class; + + +G_DEFINE_TYPE (GthImageSvg, gth_image_svg, GTH_TYPE_IMAGE) + + +static void +gth_image_svg_finalize (GObject *object) +{ + GthImageSvg *self; + + self = GTH_IMAGE_SVG (object); + _g_object_unref (self->rsvg); + + G_OBJECT_CLASS (gth_image_svg_parent_class)->finalize (object); +} + + +static void +gth_image_svg_init (GthImageSvg *self) +{ + self->rsvg = NULL; + self->original_width = 0; + self->original_height = 0; + self->last_zoom = 0.0; +} + + +static gboolean +gth_image_svg_get_is_zoomable (GthImage *base) +{ + return (((GthImageSvg *) base)->rsvg != NULL); +} + + +static gboolean +gth_image_svg_set_zoom (GthImage *base, + double zoom, + int *original_width, + int *original_height) +{ + GthImageSvg *self; + cairo_surface_t *surface; + cairo_t *cr; + gboolean changed = FALSE; + + self = GTH_IMAGE_SVG (base); + if (self->rsvg == NULL) + return FALSE; + + if (zoom != self->last_zoom) { + self->last_zoom = zoom; + + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, + zoom * self->original_width, + zoom * self->original_height); + cr = cairo_create (surface); + cairo_scale (cr, zoom, zoom); + rsvg_handle_render_cairo (self->rsvg, cr); + gth_image_set_cairo_surface (base, surface); + changed = TRUE; + + cairo_destroy (cr); + cairo_surface_destroy (surface); + } + + if (original_width != NULL) + *original_width = self->original_width; + if (original_height != NULL) + *original_height = self->original_height; + + return changed; +} + + +static void +gth_image_svg_class_init (GthImageSvgClass *klass) +{ + GObjectClass *object_class; + GthImageClass *image_class; + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = gth_image_svg_finalize; + + image_class = GTH_IMAGE_CLASS (klass); + image_class->get_is_zoomable = gth_image_svg_get_is_zoomable; + image_class->set_zoom = gth_image_svg_set_zoom; +} + + +static GthImage * +gth_image_svg_new (void) +{ + return g_object_new (gth_image_svg_get_type (), NULL); +} + + +static void +gth_image_svg_set_handle (GthImageSvg *self, + RsvgHandle *rsvg) +{ + RsvgDimensionData dimension_data; + + if (self->rsvg == rsvg) + return; + + self->rsvg = g_object_ref (rsvg); + + rsvg_handle_get_dimensions (self->rsvg, &dimension_data); + self->original_width = dimension_data.width; + self->original_height = dimension_data.height; + + gth_image_svg_set_zoom (GTH_IMAGE (self), 1.0, NULL, NULL); +} + + +/* -- _cairo_image_surface_create_from_svg -- */ + + +GthImage * +_cairo_image_surface_create_from_svg (GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error) +{ + GthImage *image; + RsvgHandle *rsvg; + + image = gth_image_svg_new (); + rsvg = rsvg_handle_new_from_gfile_sync (file_data->file, + RSVG_HANDLE_FLAGS_NONE, + cancellable, + error); + if (rsvg != NULL) { + gth_image_svg_set_handle (GTH_IMAGE_SVG (image), rsvg); + g_object_unref (rsvg); + } + + return image; +} diff -Nru gthumb-2.14.3/extensions/cairo_io/cairo-io-svg.h gthumb-3.0.0/extensions/cairo_io/cairo-io-svg.h --- gthumb-2.14.3/extensions/cairo_io/cairo-io-svg.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/cairo_io/cairo-io-svg.h 2012-02-19 15:01:31.000000000 +0000 @@ -0,0 +1,40 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef CAIRO_IO_SVG_H +#define CAIRO_IO_SVG_H + +#include +#include + +G_BEGIN_DECLS + +GthImage * _cairo_image_surface_create_from_svg (GthFileData *file_data, + int requested_size, + int *original_width, + int *original_height, + gpointer user_data, + GCancellable *cancellable, + GError **error); + +G_END_DECLS + +#endif /* CAIRO_IO_SVG_H */ diff -Nru gthumb-2.14.3/extensions/cairo_io/main.c gthumb-3.0.0/extensions/cairo_io/main.c --- gthumb-2.14.3/extensions/cairo_io/main.c 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/cairo_io/main.c 2012-03-12 21:12:40.000000000 +0000 @@ -24,6 +24,7 @@ #include #include "cairo-io-jpeg.h" #include "cairo-io-png.h" +#include "cairo-io-svg.h" G_MODULE_EXPORT void @@ -39,6 +40,12 @@ GTH_IMAGE_FORMAT_CAIRO_SURFACE, "image/png", NULL); +#ifdef HAVE_LIBRSVG + gth_main_register_image_loader_func (_cairo_image_surface_create_from_svg, + GTH_IMAGE_FORMAT_CAIRO_SURFACE, + "image/svg+xml", + NULL); +#endif } diff -Nru gthumb-2.14.3/extensions/cairo_io/Makefile.am gthumb-3.0.0/extensions/cairo_io/Makefile.am --- gthumb-2.14.3/extensions/cairo_io/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/cairo_io/Makefile.am 2012-03-12 21:14:16.000000000 +0000 @@ -2,19 +2,25 @@ extension_LTLIBRARIES = libcairo_io.la libcairo_io_la_SOURCES = \ + cairo-io-png.c \ + cairo-io-png.h \ main.c if ENABLE_JPEG_TOOLS libcairo_io_la_SOURCES += \ cairo-io-jpeg.c \ - cairo-io-jpeg.h \ - cairo-io-png.c \ - cairo-io-png.h + cairo-io-jpeg.h +endif + +if ENABLE_LIBRSVG +libcairo_io_la_SOURCES += \ + cairo-io-svg.c \ + cairo-io-svg.h endif -libcairo_io_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +libcairo_io_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) $(LIBRSVG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libcairo_io_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) +libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(LIBRSVG_LIBS) if ENABLE_JPEG_TOOLS libcairo_io_la_LIBADD += ../jpeg_utils/libjpeg_utils.la endif diff -Nru gthumb-2.14.3/extensions/cairo_io/Makefile.in gthumb-3.0.0/extensions/cairo_io/Makefile.in --- gthumb-2.14.3/extensions/cairo_io/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/cairo_io/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,11 +54,13 @@ host_triplet = @host@ @ENABLE_JPEG_TOOLS_TRUE@am__append_1 = \ @ENABLE_JPEG_TOOLS_TRUE@ cairo-io-jpeg.c \ -@ENABLE_JPEG_TOOLS_TRUE@ cairo-io-jpeg.h \ -@ENABLE_JPEG_TOOLS_TRUE@ cairo-io-png.c \ -@ENABLE_JPEG_TOOLS_TRUE@ cairo-io-png.h +@ENABLE_JPEG_TOOLS_TRUE@ cairo-io-jpeg.h + +@ENABLE_LIBRSVG_TRUE@am__append_2 = \ +@ENABLE_LIBRSVG_TRUE@ cairo-io-svg.c \ +@ENABLE_LIBRSVG_TRUE@ cairo-io-svg.h -@ENABLE_JPEG_TOOLS_TRUE@am__append_2 = ../jpeg_utils/libjpeg_utils.la +@ENABLE_JPEG_TOOLS_TRUE@am__append_3 = ../jpeg_utils/libjpeg_utils.la subdir = extensions/cairo_io DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -87,12 +106,13 @@ "$(DESTDIR)$(extensioninidir)" LTLIBRARIES = $(extension_LTLIBRARIES) am__DEPENDENCIES_1 = -am__libcairo_io_la_SOURCES_DIST = main.c cairo-io-jpeg.c \ - cairo-io-jpeg.h cairo-io-png.c cairo-io-png.h +am__libcairo_io_la_SOURCES_DIST = cairo-io-png.c cairo-io-png.h main.c \ + cairo-io-jpeg.c cairo-io-jpeg.h cairo-io-svg.c cairo-io-svg.h @ENABLE_JPEG_TOOLS_TRUE@am__objects_1 = \ -@ENABLE_JPEG_TOOLS_TRUE@ libcairo_io_la-cairo-io-jpeg.lo \ -@ENABLE_JPEG_TOOLS_TRUE@ libcairo_io_la-cairo-io-png.lo -am_libcairo_io_la_OBJECTS = libcairo_io_la-main.lo $(am__objects_1) +@ENABLE_JPEG_TOOLS_TRUE@ libcairo_io_la-cairo-io-jpeg.lo +@ENABLE_LIBRSVG_TRUE@am__objects_2 = libcairo_io_la-cairo-io-svg.lo +am_libcairo_io_la_OBJECTS = libcairo_io_la-cairo-io-png.lo \ + libcairo_io_la-main.lo $(am__objects_1) $(am__objects_2) libcairo_io_la_OBJECTS = $(am_libcairo_io_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -129,6 +149,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libcairo_io_la_SOURCES) DIST_SOURCES = $(am__libcairo_io_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) ETAGS = etags CTAGS = ctags @@ -177,10 +202,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -188,6 +211,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -227,6 +251,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -275,8 +301,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -307,6 +331,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -339,10 +364,12 @@ top_srcdir = @top_srcdir@ extensiondir = $(pkglibdir)/extensions extension_LTLIBRARIES = libcairo_io.la -libcairo_io_la_SOURCES = main.c $(am__append_1) -libcairo_io_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +libcairo_io_la_SOURCES = cairo-io-png.c cairo-io-png.h main.c \ + $(am__append_1) $(am__append_2) +libcairo_io_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) $(LIBRSVG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libcairo_io_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(am__append_2) +libcairo_io_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) $(LIBRSVG_LIBS) \ + $(am__append_3) libcairo_io_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) extensionini_in_files = cairo_io.extension.in.in @@ -388,7 +415,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -396,6 +422,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -428,6 +456,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-cairo-io-jpeg.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-cairo-io-png.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-cairo-io-svg.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcairo_io_la-main.Plo@am__quote@ .c.o: @@ -451,6 +480,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +libcairo_io_la-cairo-io-png.lo: cairo-io-png.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-cairo-io-png.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-cairo-io-png.Tpo -c -o libcairo_io_la-cairo-io-png.lo `test -f 'cairo-io-png.c' || echo '$(srcdir)/'`cairo-io-png.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-cairo-io-png.Tpo $(DEPDIR)/libcairo_io_la-cairo-io-png.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cairo-io-png.c' object='libcairo_io_la-cairo-io-png.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-io-png.lo `test -f 'cairo-io-png.c' || echo '$(srcdir)/'`cairo-io-png.c + libcairo_io_la-main.lo: main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-main.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-main.Tpo -c -o libcairo_io_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-main.Tpo $(DEPDIR)/libcairo_io_la-main.Plo @@ -465,12 +501,12 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-io-jpeg.lo `test -f 'cairo-io-jpeg.c' || echo '$(srcdir)/'`cairo-io-jpeg.c -libcairo_io_la-cairo-io-png.lo: cairo-io-png.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-cairo-io-png.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-cairo-io-png.Tpo -c -o libcairo_io_la-cairo-io-png.lo `test -f 'cairo-io-png.c' || echo '$(srcdir)/'`cairo-io-png.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-cairo-io-png.Tpo $(DEPDIR)/libcairo_io_la-cairo-io-png.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cairo-io-png.c' object='libcairo_io_la-cairo-io-png.lo' libtool=yes @AMDEPBACKSLASH@ +libcairo_io_la-cairo-io-svg.lo: cairo-io-svg.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -MT libcairo_io_la-cairo-io-svg.lo -MD -MP -MF $(DEPDIR)/libcairo_io_la-cairo-io-svg.Tpo -c -o libcairo_io_la-cairo-io-svg.lo `test -f 'cairo-io-svg.c' || echo '$(srcdir)/'`cairo-io-svg.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcairo_io_la-cairo-io-svg.Tpo $(DEPDIR)/libcairo_io_la-cairo-io-svg.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='cairo-io-svg.c' object='libcairo_io_la-cairo-io-svg.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-io-png.lo `test -f 'cairo-io-png.c' || echo '$(srcdir)/'`cairo-io-png.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcairo_io_la_CFLAGS) $(CFLAGS) -c -o libcairo_io_la-cairo-io-svg.lo `test -f 'cairo-io-svg.c' || echo '$(srcdir)/'`cairo-io-svg.c mostlyclean-libtool: -rm -f *.lo @@ -479,8 +515,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/catalogs/actions.c gthumb-3.0.0/extensions/catalogs/actions.c --- gthumb-2.14.3/extensions/catalogs/actions.c 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/actions.c 2012-02-19 15:01:31.000000000 +0000 @@ -351,10 +351,12 @@ GthBrowser *browser) { GthFileData *file_data; + GSettings *settings; file_data = gth_browser_get_folder_popup_file_data (browser); - if (eel_gconf_get_boolean (PREF_MSG_CONFIRM_DELETION, DEFAULT_MSG_CONFIRM_DELETION)) { + settings = g_settings_new (GTHUMB_MESSAGES_SCHEMA); + if (g_settings_get_boolean (settings, PREF_MSG_CONFIRM_DELETION)) { char *prompt; GtkWidget *d; @@ -376,6 +378,8 @@ remove_catalog (GTK_WINDOW (browser), file_data); g_object_unref (file_data); } + + g_object_unref (settings); } diff -Nru gthumb-2.14.3/extensions/catalogs/callbacks.c gthumb-3.0.0/extensions/catalogs/callbacks.c --- gthumb-2.14.3/extensions/catalogs/callbacks.c 2011-12-11 16:09:39.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/callbacks.c 2012-04-20 19:29:00.000000000 +0000 @@ -155,6 +155,7 @@ guint folder_popup_merge_id; guint vfs_merge_id; gboolean catalog_menu_loaded; + guint n_top_catalogs; guint monitor_events; GtkWidget *properties_button; GtkWidget *organize_button; @@ -216,6 +217,7 @@ data = g_new0 (BrowserData, 1); data->browser = browser; + data->n_top_catalogs = 0; data->actions = gtk_action_group_new ("Catalog Actions"); gtk_action_group_set_translation_domain (data->actions, NULL); @@ -426,6 +428,20 @@ static void +update_commands_visibility (BrowserData *data) +{ + GtkAction *action; + + action = gtk_action_group_get_action (data->actions, "Edit_QuickAddToCatalog"); + gtk_action_set_visible (action, (data->n_top_catalogs > 0)); + + action = gtk_action_group_get_action (data->actions, "Edit_AddToCatalog"); + gtk_action_set_visible (action, (data->n_top_catalogs == 0)); +} + + + +static void catalog_list_ready (GthFileSource *file_source, GList *files, GError *error, @@ -471,25 +487,8 @@ root = g_file_new_for_uri ("catalog:///"); if (g_file_equal (list_data->root, root)) { - GtkUIManager *ui; - - ui = gth_browser_get_ui_manager (list_data->data->browser); - if (ordered != NULL) { - gtk_widget_show (gtk_ui_manager_get_widget (ui, "/FileListPopup/Folder_Actions2/Edit_QuickAddToCatalog")); - gtk_widget_show (gtk_ui_manager_get_widget (ui, "/FileListPopup/Folder_Actions2/Edit_QuickAddToCatalog/CatalogListSeparator")); - gtk_widget_hide (gtk_ui_manager_get_widget (ui, "/FileListPopup/Folder_Actions2/Edit_AddToCatalog")); - - gtk_widget_show (gtk_ui_manager_get_widget (ui, "/FilePopup/Folder_Actions2/Edit_QuickAddToCatalog")); - gtk_widget_show (gtk_ui_manager_get_widget (ui, "/FilePopup/Folder_Actions2/Edit_QuickAddToCatalog/CatalogListSeparator")); - gtk_widget_hide (gtk_ui_manager_get_widget (ui, "/FilePopup/Folder_Actions2/Edit_AddToCatalog")); - } - else { - gtk_widget_hide (gtk_ui_manager_get_widget (ui, "/FileListPopup/Folder_Actions2/Edit_QuickAddToCatalog")); - gtk_widget_show (gtk_ui_manager_get_widget (ui, "/FileListPopup/Folder_Actions2/Edit_AddToCatalog")); - - gtk_widget_hide (gtk_ui_manager_get_widget (ui, "/FilePopup/Folder_Actions2/Edit_QuickAddToCatalog")); - gtk_widget_show (gtk_ui_manager_get_widget (ui, "/FilePopup/Folder_Actions2/Edit_AddToCatalog")); - } + list_data->data->n_top_catalogs = g_list_length (ordered); + update_commands_visibility (list_data->data); } else if (ordered == NULL) { GtkWidget *item; @@ -564,6 +563,8 @@ data->catalog_menu_loaded = TRUE; update_catalog_menu (data); } + else + update_commands_visibility (data); } @@ -579,6 +580,8 @@ data->catalog_menu_loaded = TRUE; update_catalog_menu (data); } + else + update_commands_visibility (data); } @@ -691,7 +694,7 @@ { if (data->properties_button == NULL) { data->properties_button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (data->properties_button), gtk_image_new_from_stock (GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_BUTTON)); + gtk_container_add (GTK_CONTAINER (data->properties_button), gtk_image_new_from_stock (GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU)); g_object_add_weak_pointer (G_OBJECT (data->properties_button), (gpointer *)&data->properties_button); gtk_button_set_relief (GTK_BUTTON (data->properties_button), GTK_RELIEF_NONE); gtk_widget_set_tooltip_text (data->properties_button, _("Catalog Properties")); diff -Nru gthumb-2.14.3/extensions/catalogs/catalogs.extension.in.in gthumb-3.0.0/extensions/catalogs/catalogs.extension.in.in --- gthumb-2.14.3/extensions/catalogs/catalogs.extension.in.in 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/catalogs.extension.in.in 2012-04-21 09:26:49.000000000 +0000 @@ -11,3 +11,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/catalogs/data/Makefile.in gthumb-3.0.0/extensions/catalogs/data/Makefile.in --- gthumb-2.14.3/extensions/catalogs/data/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/data/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/catalogs/data/ui/add-to-catalog.ui gthumb-3.0.0/extensions/catalogs/data/ui/add-to-catalog.ui --- gthumb-2.14.3/extensions/catalogs/data/ui/add-to-catalog.ui 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/data/ui/add-to-catalog.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,190 +1,222 @@ - + - 400 350 + False 5 Add to Catalog normal - + True + False vertical 2 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 0 + + + + + gtk-add + False + True + True + True + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + True + + + False + False + 2 + True + + + + + False + True + end + 0 + + True + False 5 - vertical 12 True + False 12 True - vertical + False 6 True + False 0 C_atalogs: True False + True 0 True + False 12 True True - automatic - automatic in + True + True 0 True - vertical + False 6 _New Catalog + False True True True + False True False + True 0 New _Library + False True True True + False True False + True 1 False + True end 1 + True + True 1 + True + True 0 + True + True 0 _View the destination + False True True False + False True + 0 True False + True 1 + True + True 1 - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-add - True - True - True - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - - - False - False - 2 - True - - - - - False - end - 0 - - diff -Nru gthumb-2.14.3/extensions/catalogs/data/ui/catalog-properties.ui gthumb-3.0.0/extensions/catalogs/data/ui/catalog-properties.ui --- gthumb-2.14.3/extensions/catalogs/data/ui/catalog-properties.ui 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/data/ui/catalog-properties.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,21 +1,86 @@ - + - + False 5 Properties normal - + True + False vertical 8 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 0 + + + + + gtk-save + False + True + True + True + True + True + False + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + True + + + False + False + 2 + True + + + + + False + True + end + 0 + + True + False 5 - vertical 12 @@ -24,17 +89,18 @@ True + False 12 - vertical 12 True - vertical + False 6 True + False 0 General @@ -43,16 +109,19 @@ False + True 0 True + False 12 True + False 2 2 6 @@ -60,6 +129,7 @@ True + False 0 _Name: True @@ -67,11 +137,13 @@ GTK_FILL + GTK_FILL True + False 0 _Date: True @@ -80,23 +152,26 @@ 1 2 GTK_FILL + GTK_FILL True True - + True 1 2 + GTK_FILL True + False @@ -106,7 +181,7 @@ 2 1 2 - GTK_EXPAND + @@ -121,6 +196,7 @@ False + True 0 @@ -129,6 +205,7 @@ True + False Catalog @@ -149,68 +226,16 @@ + True + True 0 - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-save - True - True - True - True - True - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - - - False - False - 2 - True - - - - False - end - 0 + True + 1 diff -Nru gthumb-2.14.3/extensions/catalogs/data/ui/Makefile.in gthumb-3.0.0/extensions/catalogs/data/ui/Makefile.in --- gthumb-2.14.3/extensions/catalogs/data/ui/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/data/ui/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -339,8 +361,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/catalogs/data/ui/organize-files-task.ui gthumb-3.0.0/extensions/catalogs/data/ui/organize-files-task.ui --- gthumb-2.14.3/extensions/catalogs/data/ui/organize-files-task.ui 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/data/ui/organize-files-task.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,7 +1,6 @@ - + - @@ -17,32 +16,98 @@ + False 5 Organize Files normal - + True + False vertical 2 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 0 + + + + + gtk-close + False + True + True + True + False + True + + + False + False + 1 + + + + + gtk-save + False + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 5 - vertical 12 True + False 12 True + False 0 1 True + False 0 gtk-dialog-info 24 @@ -52,17 +117,19 @@ False + True 0 True - vertical + False 12 True + False 0 Organizing files @@ -72,76 +139,90 @@ False + True 0 True + False 6 True + False 0 middle + True + True 0 False + True 1 True + False 6 True - vertical + False 6 True - vertical + False True + False 6 True + False 0 Organization: False + True 0 True + False 0 + True + True 1 False + True 0 True - vertical + False 6 @@ -149,8 +230,6 @@ 250 True True - automatic - automatic in @@ -160,6 +239,9 @@ False True 0 + + + Catalog @@ -213,72 +295,90 @@ + True + True 0 + True + True 1 + True + True 0 True + False 6 Select All + False True True True + False False + True 0 Select None + False True True True + False False + True 1 False + True 1 + True + True 0 - 350 + 380 350 - vertical + False True + False 0 Catalog _Preview: True False + True 0 @@ -288,80 +388,36 @@ False + True 1 + True + True 2 + True + True 1 + True + True 0 - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-close - True - True - True - True - - - False - False - 1 - - - - - gtk-save - True - True - True - True - - - False - False - 2 - - - - False - end - 0 + True + 1 diff -Nru gthumb-2.14.3/extensions/catalogs/data/ui/organize-files.ui gthumb-3.0.0/extensions/catalogs/data/ui/organize-files.ui --- gthumb-2.14.3/extensions/catalogs/data/ui/organize-files.ui 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/data/ui/organize-files.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,35 +1,139 @@ - + - + + + + + + + + + + + + 0 + Date photo was taken + camera-photo + + + 1 + File modified date + appointment-soon + + + 2 + Tag + tag + + + 3 + Tag (embedded) + tag + + + + + True + False + gtk-execute + + False 5 Organize Files False normal - + True + False vertical 2 + + + True + False + end + + + gtk-help + False + True + True + True + False + True + + + False + False + 0 + True + + + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 1 + + + + + gtk-execute + False + True + True + True + False + True + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 5 - vertical 12 True + False 12 True + False 12 12 True + False 0 48 file-catalog @@ -39,22 +143,24 @@ False + True 0 True - vertical + False 12 True - vertical + False 6 True + False 6 12 @@ -62,28 +168,34 @@ + True + True 0 True + False 6 True + False 0 _Group files by: True False + True 0 True + False group_by_liststore 0 @@ -103,58 +215,76 @@ False + True 1 + True + True 1 _Include sub-folders + False True True False + False True + 0 True False + True 2 Ignore catalogs with a single file + False True True False + False + 0 True + True + True 3 True + False 12 True + False 6 Put single files in the catalog: + False True True False + False + 0 True False + True 0 @@ -163,10 +293,12 @@ True False True - + Singles + True + True 1 @@ -174,83 +306,37 @@ + True + True 4 + True + True 0 + True + True 1 False + True 0 - 1 - - - - - True - end - - - gtk-help - True - True - True - True - - - False - False - 0 - True - - - - - gtk-cancel - True - True - True - True - - - False - False - 1 - - - - - gtk-execute - True - True - True - True - True - - - False - False - 2 - - - - False - end - 0 + True + 1 @@ -261,40 +347,4 @@ start_button - - True - gtk-execute - - - - - - - - - - - - - 0 - Date photo was taken - camera-photo - - - 1 - File modified date - appointment-soon - - - 2 - Tag - tag - - - 3 - Tag (embedded) - tag - - - diff -Nru gthumb-2.14.3/extensions/catalogs/gth-catalog.c gthumb-3.0.0/extensions/catalogs/gth-catalog.c --- gthumb-2.14.3/extensions/catalogs/gth-catalog.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/gth-catalog.c 2012-03-24 15:35:18.000000000 +0000 @@ -44,7 +44,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthCatalog, gth_catalog, G_TYPE_OBJECT) static void @@ -66,7 +66,7 @@ catalog->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_catalog_parent_class)->finalize (object); } @@ -232,9 +232,7 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - object_class->finalize = gth_catalog_finalize; class->create_root = base_create_root; @@ -253,34 +251,6 @@ } -GType -gth_catalog_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthCatalogClass), - NULL, - NULL, - (GClassInitFunc) gth_catalog_class_init, - NULL, - NULL, - sizeof (GthCatalog), - 0, - (GInstanceInitFunc) gth_catalog_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthCatalog", - &type_info, - 0); - } - - return type; -} - - GthCatalog * gth_catalog_new (void) { diff -Nru gthumb-2.14.3/extensions/catalogs/gth-file-source-catalogs.c gthumb-3.0.0/extensions/catalogs/gth-file-source-catalogs.c --- gthumb-2.14.3/extensions/catalogs/gth-file-source-catalogs.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/gth-file-source-catalogs.c 2012-03-26 16:26:16.000000000 +0000 @@ -37,7 +37,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthFileSourceCatalogs, gth_file_source_catalogs, GTH_TYPE_FILE_SOURCE) static GList * @@ -1206,90 +1206,24 @@ } -static int -remove_from_file_list_and_get_position (GList **file_list, - GFile *file) -{ - GList *scan; - int i = 0; - - for (scan = *file_list; scan; scan = scan->next, i++) - if (g_file_equal ((GFile *) scan->data, file)) - break; - - if (scan == NULL) - return -1; - - *file_list = g_list_remove_link (*file_list, scan); - - return i; -} - - static int * reorder_catalog_list (GthCatalog *catalog, GList *visible_files, GList *files_to_move, int dest_pos) { - GHashTable *positions; - GList *new_visible_files; - GList *scan; - int *new_order; - int pos; - GList *new_file_list; - GHashTable *visibles; - - /* save the original positions */ - - positions = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, (GDestroyNotify) g_object_unref, NULL); - for (scan = visible_files, pos = 0; scan; scan = scan->next, pos++) - g_hash_table_insert (positions, g_object_ref ((GFile *) scan->data), GINT_TO_POINTER (pos)); - - /* create the new visible list */ - - new_visible_files = g_list_copy (visible_files); - - for (scan = files_to_move; scan; scan = scan->next) { - int file_pos = remove_from_file_list_and_get_position (&new_visible_files, (GFile *) scan->data); - if (file_pos < dest_pos) - dest_pos--; - } - - for (scan = files_to_move; scan; scan = scan->next) { - new_visible_files = g_list_insert (new_visible_files, (GFile *) scan->data, dest_pos); - dest_pos++; - } - - /* compute the new order */ + int *new_order; + GList *new_file_list; - new_order = g_new0 (int, g_list_length (new_visible_files)); - for (scan = new_visible_files, pos = 0; scan; scan = scan->next, pos++) - new_order[pos] = GPOINTER_TO_INT (g_hash_table_lookup (positions, (GFile *) scan->data)); - - /* save the new order in the catalog, appending the hidden files at - * the end. */ - - new_file_list = _g_object_list_ref (new_visible_files); - - visibles = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, (GDestroyNotify) g_object_unref, NULL); - for (scan = new_visible_files; scan; scan = scan->next) - g_hash_table_insert (visibles, g_object_ref ((GFile *) scan->data), GINT_TO_POINTER (1)); - - new_file_list = g_list_reverse (new_file_list); - for (scan = gth_catalog_get_file_list (catalog); scan; scan = scan->next) { - GFile *file = scan->data; - - if (g_hash_table_lookup (visibles, file) == NULL) - new_file_list = g_list_prepend (new_file_list, g_object_ref (file)); - } - new_file_list = g_list_reverse (new_file_list); + _g_list_reorder (gth_catalog_get_file_list (catalog), + visible_files, + files_to_move, + dest_pos, + &new_order, + &new_file_list); gth_catalog_set_file_list (catalog, new_file_list); _g_object_list_unref (new_file_list); - g_hash_table_destroy (visibles); - g_list_free (new_visible_files); - g_hash_table_destroy (positions); return new_order; } @@ -1521,7 +1455,7 @@ catalogs->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_source_catalogs_parent_class)->finalize (object); } @@ -1531,11 +1465,10 @@ GObjectClass *object_class; GthFileSourceClass *file_source_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - file_source_class = (GthFileSourceClass*) class; - object_class->finalize = gth_file_source_catalogs_finalize; + + file_source_class = (GthFileSourceClass*) class; file_source_class->get_entry_points = get_entry_points; file_source_class->to_gio_file = gth_file_source_catalogs_to_gio_file; file_source_class->get_file_info = gth_file_source_catalogs_get_file_info; @@ -1555,36 +1488,8 @@ static void gth_file_source_catalogs_init (GthFileSourceCatalogs *catalogs) { - gth_file_source_add_scheme (GTH_FILE_SOURCE (catalogs), "catalog://"); + gth_file_source_add_scheme (GTH_FILE_SOURCE (catalogs), "catalog"); catalogs->priv = g_new0 (GthFileSourceCatalogsPrivate, 1); catalogs->priv->catalog = gth_catalog_new (); } - - -GType -gth_file_source_catalogs_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthFileSourceCatalogsClass), - NULL, - NULL, - (GClassInitFunc) gth_file_source_catalogs_class_init, - NULL, - NULL, - sizeof (GthFileSourceCatalogs), - 0, - (GInstanceInitFunc) gth_file_source_catalogs_init - }; - - type = g_type_register_static (GTH_TYPE_FILE_SOURCE, - "GthFileSourceCatalogs", - &type_info, - 0); - } - - return type; -} diff -Nru gthumb-2.14.3/extensions/catalogs/gth-organize-task.c gthumb-3.0.0/extensions/catalogs/gth-organize-task.c --- gthumb-2.14.3/extensions/catalogs/gth-organize-task.c 2012-03-24 16:43:32.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/gth-organize-task.c 2012-02-19 15:01:31.000000000 +0000 @@ -59,7 +59,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthOrganizeTask, gth_organize_task, GTH_TYPE_TASK) static void @@ -77,7 +77,7 @@ g_object_unref (self->priv->icon_pixbuf); g_object_unref (self->priv->filter); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_organize_task_parent_class)->finalize (object); } @@ -541,7 +541,7 @@ gth_organize_task_exec (GthTask *base) { GthOrganizeTask *self; - const char *attributes = NULL; + const char *attributes = ""; self = GTH_ORGANIZE_TASK (base); @@ -628,7 +628,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthOrganizeTaskPrivate)); object_class = (GObjectClass*) klass; @@ -801,7 +800,7 @@ gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GET_WIDGET ("organization_treeview")))); g_object_unref (icon); - self->priv->file_list = gth_file_list_new (gth_icon_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); + self->priv->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); gth_file_list_set_caption (GTH_FILE_LIST (self->priv->file_list), "standard::display-name"); gtk_widget_show (self->priv->file_list); gtk_box_pack_start (GTK_BOX (GET_WIDGET ("preview_box")), self->priv->file_list, TRUE, TRUE, 0); @@ -837,34 +836,6 @@ } -GType -gth_organize_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthOrganizeTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_organize_task_class_init, - NULL, - NULL, - sizeof (GthOrganizeTask), - 0, - (GInstanceInitFunc) gth_organize_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthOrganizeTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_organize_task_new (GthBrowser *browser, GFile *folder, diff -Nru gthumb-2.14.3/extensions/catalogs/Makefile.in gthumb-3.0.0/extensions/catalogs/Makefile.in --- gthumb-2.14.3/extensions/catalogs/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/catalogs/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -131,6 +148,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -210,10 +232,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -221,6 +241,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -260,6 +281,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -308,8 +331,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -340,6 +361,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -437,7 +459,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -445,6 +466,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -576,8 +599,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -760,13 +786,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/change_date/callbacks.c gthumb-3.0.0/extensions/change_date/callbacks.c --- gthumb-2.14.3/extensions/change_date/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/change_date/callbacks.c 2012-02-19 15:01:31.000000000 +0000 @@ -81,8 +81,6 @@ g_clear_error (&error); } - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ListToolsPopup/Tools/ChangeDate")), TRUE); - g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } diff -Nru gthumb-2.14.3/extensions/change_date/change_date.extension.in.in gthumb-3.0.0/extensions/change_date/change_date.extension.in.in --- gthumb-2.14.3/extensions/change_date/change_date.extension.in.in 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/change_date/change_date.extension.in.in 2012-04-21 09:26:45.000000000 +0000 @@ -9,3 +9,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/change_date/data/gthumb_change_date.schemas.in gthumb-3.0.0/extensions/change_date/data/gthumb_change_date.schemas.in --- gthumb-2.14.3/extensions/change_date/data/gthumb_change_date.schemas.in 2012-01-08 09:05:13.000000000 +0000 +++ gthumb-3.0.0/extensions/change_date/data/gthumb_change_date.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,125 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/change_date/set_last_modified_date - /apps/gthumb/ext/change_date/set_last_modified_date - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/ext/change_date/set_comment_date - /apps/gthumb/ext/change_date/set_comment_date - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/ext/change_date/set_exif_datetimeoriginal_tag - /apps/gthumb/ext/change_date/set_exif_datetimeoriginal_tag - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/ext/change_date/to_following_date - /apps/gthumb/ext/change_date/to_following_date - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/ext/change_date/date - /apps/gthumb/ext/change_date/date - gthumb - string - - - - - - - - - /schemas/apps/gthumb/ext/change_date/to_file_modified_date - /apps/gthumb/ext/change_date/to_file_modified_date - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/ext/change_date/to_file_creation_date - /apps/gthumb/ext/change_date/to_file_creation_date - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/ext/change_date/to_photo_original_date - /apps/gthumb/ext/change_date/to_photo_original_date - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/ext/change_date/adjust_time - /apps/gthumb/ext/change_date/adjust_time - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/ext/change_date/time_adjustment - /apps/gthumb/ext/change_date/time_adjustment - gthumb - int - 0 - - - - - - - - diff -Nru gthumb-2.14.3/extensions/change_date/data/Makefile.am gthumb-3.0.0/extensions/change_date/data/Makefile.am --- gthumb-2.14.3/extensions/change_date/data/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/change_date/data/Makefile.am 2012-02-19 15:01:31.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_change_date.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/change_date/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/change_date/data/Makefile.in gthumb-3.0.0/extensions/change_date/data/Makefile.in --- gthumb-2.14.3/extensions/change_date/data/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/change_date/data/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_change_date.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/change_date/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/change_date/data/ui/Makefile.in gthumb-3.0.0/extensions/change_date/data/ui/Makefile.in --- gthumb-2.14.3/extensions/change_date/data/ui/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/change_date/data/ui/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/change_date/dlg-change-date.c gthumb-3.0.0/extensions/change_date/dlg-change-date.c --- gthumb-2.14.3/extensions/change_date/dlg-change-date.c 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/change_date/dlg-change-date.c 2012-02-19 15:01:31.000000000 +0000 @@ -35,6 +35,7 @@ typedef struct { GthBrowser *browser; GtkBuilder *builder; + GSettings *settings; GtkWidget *dialog; GtkWidget *date_selector; GList *file_list; @@ -46,6 +47,7 @@ DialogData *data) { _g_object_list_unref (data->file_list); + g_object_unref (data->settings); g_object_unref (data->builder); g_free (data); } @@ -95,23 +97,23 @@ /* save the preferences */ - eel_gconf_set_boolean (PREF_CHANGE_DATE_SET_LAST_MODIFIED_DATE, (change_fields & GTH_CHANGE_LAST_MODIFIED_DATE) == GTH_CHANGE_LAST_MODIFIED_DATE); - eel_gconf_set_boolean (PREF_CHANGE_DATE_SET_COMMENT_DATE, (change_fields & GTH_CHANGE_COMMENT_DATE) == GTH_CHANGE_COMMENT_DATE); - eel_gconf_set_boolean (PREF_CHANGE_DATE_SET_EXIF_DATETIMEORIGINAL_TAG, (change_fields & GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG) == GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG); + g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_SET_LAST_MODIFIED_DATE, (change_fields & GTH_CHANGE_LAST_MODIFIED_DATE) == GTH_CHANGE_LAST_MODIFIED_DATE); + g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_SET_COMMENT_DATE, (change_fields & GTH_CHANGE_COMMENT_DATE) == GTH_CHANGE_COMMENT_DATE); + g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_SET_EXIF_DATETIMEORIGINAL_TAG, (change_fields & GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG) == GTH_CHANGE_EXIF_DATETIMEORIGINAL_TAG); - eel_gconf_set_boolean (PREF_CHANGE_DATE_TO_FOLLOWING_DATE, change_type == GTH_CHANGE_TO_FOLLOWING_DATE); + g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_TO_FOLLOWING_DATE, change_type == GTH_CHANGE_TO_FOLLOWING_DATE); if (change_type == GTH_CHANGE_TO_FOLLOWING_DATE) { char *s; s = gth_datetime_to_exif_date (date_time); - eel_gconf_set_string (PREF_CHANGE_DATE_DATE, s); + g_settings_set_string (data->settings, PREF_CHANGE_DATE_DATE, s); g_free (s); } - eel_gconf_set_boolean (PREF_CHANGE_DATE_TO_FILE_MODIFIED_DATE, change_type == GTH_CHANGE_TO_FILE_MODIFIED_DATE); - eel_gconf_set_boolean (PREF_CHANGE_DATE_TO_FILE_CREATION_DATE, change_type == GTH_CHANGE_TO_FILE_CREATION_DATE); - eel_gconf_set_boolean (PREF_CHANGE_DATE_TO_PHOTO_ORIGINAL_DATE, change_type == GTH_CHANGE_TO_PHOTO_ORIGINAL_DATE); - eel_gconf_set_boolean (PREF_CHANGE_DATE_ADJUST_TIME, change_type == GTH_CHANGE_ADJUST_TIME); + g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_TO_FILE_MODIFIED_DATE, change_type == GTH_CHANGE_TO_FILE_MODIFIED_DATE); + g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_TO_FILE_CREATION_DATE, change_type == GTH_CHANGE_TO_FILE_CREATION_DATE); + g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_TO_PHOTO_ORIGINAL_DATE, change_type == GTH_CHANGE_TO_PHOTO_ORIGINAL_DATE); + g_settings_set_boolean (data->settings, PREF_CHANGE_DATE_ADJUST_TIME, change_type == GTH_CHANGE_ADJUST_TIME); if (change_type == GTH_CHANGE_ADJUST_TIME) - eel_gconf_set_integer (PREF_CHANGE_DATE_TIME_ADJUSTMENT, time_adjustment); + g_settings_set_int (data->settings, PREF_CHANGE_DATE_TIME_ADJUSTMENT, time_adjustment); /* exec the task */ @@ -177,6 +179,7 @@ data->browser = browser; data->file_list = _g_object_list_ref (file_list); data->builder = _gtk_builder_new_from_file ("change-date.ui", "change_date"); + data->settings = g_settings_new (GTHUMB_CHANGE_DATE_SCHEMA); /* Get the widgets. */ @@ -188,17 +191,21 @@ /* Set widgets data. */ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("change_last_modified_checkbutton")), eel_gconf_get_boolean (PREF_CHANGE_DATE_SET_LAST_MODIFIED_DATE, FALSE)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("change_comment_checkbutton")), eel_gconf_get_boolean (PREF_CHANGE_DATE_SET_COMMENT_DATE, FALSE)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("change_datetimeoriginal_checkbutton")), eel_gconf_get_boolean (PREF_CHANGE_DATE_SET_EXIF_DATETIMEORIGINAL_TAG, FALSE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("change_last_modified_checkbutton")), + g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_SET_LAST_MODIFIED_DATE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("change_comment_checkbutton")), + g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_SET_COMMENT_DATE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("change_datetimeoriginal_checkbutton")), + g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_SET_EXIF_DATETIMEORIGINAL_TAG)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("to_following_date_radiobutton")), eel_gconf_get_boolean (PREF_CHANGE_DATE_TO_FOLLOWING_DATE, TRUE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("to_following_date_radiobutton")), + g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_TO_FOLLOWING_DATE)); datetime = gth_datetime_new (); g_get_current_time (&timeval); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("to_following_date_radiobutton")))) { char *s; - s = eel_gconf_get_string (PREF_CHANGE_DATE_DATE, ""); + s = g_settings_get_string (data->settings, PREF_CHANGE_DATE_DATE); if (strcmp (s, "") != 0) gth_datetime_from_exif_date (datetime, s); else @@ -210,10 +217,14 @@ gth_time_selector_set_value (GTH_TIME_SELECTOR (data->date_selector), datetime); gth_datetime_free (datetime); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("to_last_modified_date_radiobutton")), eel_gconf_get_boolean (PREF_CHANGE_DATE_TO_FILE_MODIFIED_DATE, FALSE)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("to_creation_date_radiobutton")), eel_gconf_get_boolean (PREF_CHANGE_DATE_TO_FILE_CREATION_DATE, FALSE)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("to_photo_original_date_radiobutton")), eel_gconf_get_boolean (PREF_CHANGE_DATE_TO_PHOTO_ORIGINAL_DATE, FALSE)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("adjust_time_radiobutton")), eel_gconf_get_boolean (PREF_CHANGE_DATE_ADJUST_TIME, FALSE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("to_last_modified_date_radiobutton")), + g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_TO_FILE_MODIFIED_DATE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("to_creation_date_radiobutton")), + g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_TO_FILE_CREATION_DATE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("to_photo_original_date_radiobutton")), + g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_TO_PHOTO_ORIGINAL_DATE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("adjust_time_radiobutton")), + g_settings_get_boolean (data->settings, PREF_CHANGE_DATE_ADJUST_TIME)); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("adjust_time_radiobutton")))) { int adjustement; int sign; @@ -221,7 +232,7 @@ int minutes; int seconds; - adjustement = eel_gconf_get_integer (PREF_CHANGE_DATE_TIME_ADJUSTMENT, 0); + adjustement = g_settings_get_int (data->settings, PREF_CHANGE_DATE_TIME_ADJUSTMENT); if (adjustement < 0) { sign = -1; adjustement = - adjustement; diff -Nru gthumb-2.14.3/extensions/change_date/gth-change-date-task.c gthumb-3.0.0/extensions/change_date/gth-change-date-task.c --- gthumb-2.14.3/extensions/change_date/gth-change-date-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/change_date/gth-change-date-task.c 2012-02-19 15:01:31.000000000 +0000 @@ -37,7 +37,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthChangeDateTask, gth_change_date_task, GTH_TYPE_TASK) static void @@ -52,7 +52,7 @@ _g_object_list_unref (self->priv->files); gth_datetime_free (self->priv->date_time); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_change_date_task_parent_class)->finalize (object); } @@ -361,7 +361,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthChangeDateTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -380,34 +379,6 @@ } -GType -gth_change_date_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthChangeDateTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_change_date_task_class_init, - NULL, - NULL, - sizeof (GthChangeDateTask), - 0, - (GInstanceInitFunc) gth_change_date_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthChangeDateTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_change_date_task_new (GFile *location, GList *files, /* GthFileData */ diff -Nru gthumb-2.14.3/extensions/change_date/Makefile.in gthumb-3.0.0/extensions/change_date/Makefile.in --- gthumb-2.14.3/extensions/change_date/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/change_date/Makefile.in 2012-04-23 18:09:44.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -128,6 +145,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -207,10 +229,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -218,6 +238,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -257,6 +278,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -305,8 +328,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -337,6 +358,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -427,7 +449,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -435,6 +456,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -534,8 +557,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -718,13 +744,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/change_date/preferences.h gthumb-3.0.0/extensions/change_date/preferences.h --- gthumb-2.14.3/extensions/change_date/preferences.h 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/change_date/preferences.h 2012-02-19 15:01:31.000000000 +0000 @@ -3,7 +3,7 @@ /* * GThumb * - * Copyright (C) 2011 Free Software Foundation, Inc. + * Copyright © 2011 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,16 +26,22 @@ G_BEGIN_DECLS -#define PREF_CHANGE_DATE_SET_LAST_MODIFIED_DATE "/apps/gthumb/ext/change_date/set_last_modified_date" -#define PREF_CHANGE_DATE_SET_COMMENT_DATE "/apps/gthumb/ext/change_date/set_comment_date" -#define PREF_CHANGE_DATE_SET_EXIF_DATETIMEORIGINAL_TAG "/apps/gthumb/ext/change_date/set_exif_datetimeoriginal_tag" -#define PREF_CHANGE_DATE_TO_FOLLOWING_DATE "/apps/gthumb/ext/change_date/to_following_date" -#define PREF_CHANGE_DATE_DATE "/apps/gthumb/ext/change_date/date" -#define PREF_CHANGE_DATE_TO_FILE_MODIFIED_DATE "/apps/gthumb/ext/change_date/to_file_modified_date" -#define PREF_CHANGE_DATE_TO_FILE_CREATION_DATE "/apps/gthumb/ext/change_date/to_file_creation_date" -#define PREF_CHANGE_DATE_TO_PHOTO_ORIGINAL_DATE "/apps/gthumb/ext/change_date/to_photo_original_date" -#define PREF_CHANGE_DATE_ADJUST_TIME "/apps/gthumb/ext/change_date/adjust_time" -#define PREF_CHANGE_DATE_TIME_ADJUSTMENT "/apps/gthumb/ext/change_date/time_adjustment" +/* schema */ + +#define GTHUMB_CHANGE_DATE_SCHEMA GTHUMB_SCHEMA ".change-date" + +/* keys */ + +#define PREF_CHANGE_DATE_SET_LAST_MODIFIED_DATE "set-last-modified-date" +#define PREF_CHANGE_DATE_SET_COMMENT_DATE "set-comment-date" +#define PREF_CHANGE_DATE_SET_EXIF_DATETIMEORIGINAL_TAG "set-exif-datetimeoriginal-tag" +#define PREF_CHANGE_DATE_TO_FOLLOWING_DATE "to-following-date" +#define PREF_CHANGE_DATE_DATE "date" +#define PREF_CHANGE_DATE_TO_FILE_MODIFIED_DATE "to-file-modified-date" +#define PREF_CHANGE_DATE_TO_FILE_CREATION_DATE "to-file-creation-date" +#define PREF_CHANGE_DATE_TO_PHOTO_ORIGINAL_DATE "to-photo-original-date" +#define PREF_CHANGE_DATE_ADJUST_TIME "adjust-time" +#define PREF_CHANGE_DATE_TIME_ADJUSTMENT "time-adjustment" G_END_DECLS diff -Nru gthumb-2.14.3/extensions/comments/actions.c gthumb-3.0.0/extensions/comments/actions.c --- gthumb-2.14.3/extensions/comments/actions.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/actions.c 2012-03-22 09:26:47.000000000 +0000 @@ -0,0 +1,49 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include +#include +#include "gth-import-metadata-task.h" + + +void +gth_browser_activate_action_tool_import_embedded_metadata (GtkAction *action, + GthBrowser *browser) +{ + GList *items; + GList *file_data_list; + GthTask *task; + + items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); + file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); + /* use all the files if no file or only one file is selected */ + if ((file_data_list == NULL) || (file_data_list->next == NULL)) { + _g_object_list_unref (file_data_list); + file_data_list = gth_file_store_get_visibles (gth_browser_get_file_store (browser)); + } + task = gth_import_metadata_task_new (browser, file_data_list); + gth_browser_exec_task (browser, task, FALSE); + + g_object_unref (task); + _g_object_list_unref (file_data_list); + _gtk_tree_path_list_free (items); +} diff -Nru gthumb-2.14.3/extensions/comments/actions.h gthumb-3.0.0/extensions/comments/actions.h --- gthumb-2.14.3/extensions/comments/actions.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/actions.h 2012-03-22 08:59:15.000000000 +0000 @@ -0,0 +1,31 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef ACTIONS_H +#define ACTIONS_H + +#include + +#define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data); + +DEFINE_ACTION(gth_browser_activate_action_tool_import_embedded_metadata) + +#endif /* ACTIONS_H */ diff -Nru gthumb-2.14.3/extensions/comments/callbacks.c gthumb-3.0.0/extensions/comments/callbacks.c --- gthumb-2.14.3/extensions/comments/callbacks.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/callbacks.c 2012-03-22 08:59:15.000000000 +0000 @@ -0,0 +1,91 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include +#include +#include +#include +#include +#include "actions.h" + + +#define BROWSER_DATA_KEY "comments-data" + + +static const char *fixed_ui_file_tools_info = +"" +" " +" " +" " +" " +" " +""; + + +static GthActionEntryExt comments_action_entries[] = { + { "Tool_ImportEmbeddedMetadata", NULL, + N_("Import Embedded Metadata"), NULL, + N_("Import the metadata stored inside files into the gThumb comment system"), + GTH_ACTION_FLAG_NONE, + G_CALLBACK (gth_browser_activate_action_tool_import_embedded_metadata) } +}; + + +typedef struct { + GthBrowser *browser; + GtkActionGroup *actions; +} BrowserData; + + +static void +browser_data_free (BrowserData *data) +{ + g_free (data); +} + + +void +comments__gth_browser_construct_cb (GthBrowser *browser) +{ + BrowserData *data; + GError *error = NULL; + + g_return_if_fail (GTH_IS_BROWSER (browser)); + + data = g_new0 (BrowserData, 1); + data->browser = browser; + + data->actions = gtk_action_group_new ("Comments Actions"); + gtk_action_group_set_translation_domain (data->actions, NULL); + _gtk_action_group_add_actions_with_flags (data->actions, + comments_action_entries, + G_N_ELEMENTS (comments_action_entries), + browser); + gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->actions, 0); + + if (gth_main_extension_is_active ("list_tools") && ! gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), fixed_ui_file_tools_info, -1, &error)) { + g_message ("building menus failed: %s", error->message); + g_error_free (error); + } + + g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); +} diff -Nru gthumb-2.14.3/extensions/comments/callbacks.h gthumb-3.0.0/extensions/comments/callbacks.h --- gthumb-2.14.3/extensions/comments/callbacks.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/callbacks.h 2012-03-22 08:59:15.000000000 +0000 @@ -0,0 +1,29 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef CALLBACKS_H +#define CALLBACKS_H + +#include + +void comments__gth_browser_construct_cb (GthBrowser *browser); + +#endif /* CALLBACKS_H */ diff -Nru gthumb-2.14.3/extensions/comments/comments.extension.in.in gthumb-3.0.0/extensions/comments/comments.extension.in.in --- gthumb-2.14.3/extensions/comments/comments.extension.in.in 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/comments.extension.in.in 2012-04-21 09:26:42.000000000 +0000 @@ -9,3 +9,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/comments/data/gthumb-comments.schemas.in gthumb-3.0.0/extensions/comments/data/gthumb-comments.schemas.in --- gthumb-2.14.3/extensions/comments/data/gthumb-comments.schemas.in 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/data/gthumb-comments.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/comments/synchronize - /apps/gthumb/ext/comments/synchronize - gthumb - bool - true - - - - - - - - diff -Nru gthumb-2.14.3/extensions/comments/data/Makefile.am gthumb-3.0.0/extensions/comments/data/Makefile.am --- gthumb-2.14.3/extensions/comments/data/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/data/Makefile.am 2012-02-19 15:01:31.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-comments.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/comments/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/comments/data/Makefile.in gthumb-3.0.0/extensions/comments/data/Makefile.in --- gthumb-2.14.3/extensions/comments/data/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/data/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-comments.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/comments/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/comments/data/ui/Makefile.in gthumb-3.0.0/extensions/comments/data/ui/Makefile.in --- gthumb-2.14.3/extensions/comments/data/ui/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/data/ui/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/comments/dlg-comments-preferences.c gthumb-3.0.0/extensions/comments/dlg-comments-preferences.c --- gthumb-2.14.3/extensions/comments/dlg-comments-preferences.c 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/dlg-comments-preferences.c 2012-02-19 15:01:31.000000000 +0000 @@ -27,6 +27,7 @@ typedef struct { GtkBuilder *builder; + GSettings *settings; GtkWidget *dialog; } DialogData; @@ -36,6 +37,7 @@ DialogData *data) { g_object_unref (data->builder); + g_object_unref (data->settings); g_free (data); } @@ -44,7 +46,9 @@ sync_checkbutton_clicked_cb (GtkWidget *widget, DialogData *data) { - eel_gconf_set_boolean (PREF_COMMENTS_SYNCHRONIZE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (data->builder, "sync_checkbutton")))); + g_settings_set_boolean (data->settings, + PREF_COMMENTS_SYNCHRONIZE, + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (data->builder, "sync_checkbutton")))); } @@ -55,6 +59,7 @@ data = g_new0 (DialogData, 1); data->builder = _gtk_builder_new_from_file ("comments-preferences.ui", "comments"); + data->settings = g_settings_new (GTHUMB_COMMENTS_SCHEMA); /* Get the widgets. */ @@ -62,7 +67,8 @@ /* Set widgets data. */ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (data->builder, "sync_checkbutton")), eel_gconf_get_boolean (PREF_COMMENTS_SYNCHRONIZE, TRUE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (data->builder, "sync_checkbutton")), + g_settings_get_boolean (data->settings, PREF_COMMENTS_SYNCHRONIZE)); /* Set the signals handlers. */ diff -Nru gthumb-2.14.3/extensions/comments/gth-comment.c gthumb-3.0.0/extensions/comments/gth-comment.c --- gthumb-2.14.3/extensions/comments/gth-comment.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/gth-comment.c 2012-03-24 13:07:04.000000000 +0000 @@ -26,7 +26,6 @@ #define COMMENT_VERSION "3.0" -#define GTH_COMMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_COMMENT, GthCommentPrivate)) struct _GthCommentPrivate { /* All strings in utf8 format. */ @@ -41,7 +40,18 @@ gboolean utf8; }; -static gpointer gth_comment_parent_class = NULL; + +static void gth_comment_gth_duplicable_interface_init (GthDuplicableInterface *iface); +static void gth_comment_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthComment, + gth_comment, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTH_TYPE_DUPLICABLE, + gth_comment_gth_duplicable_interface_init) + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + gth_comment_dom_domizable_interface_init)) static void @@ -82,17 +92,15 @@ static void gth_comment_class_init (GthCommentClass *klass) { - gth_comment_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthCommentPrivate)); - G_OBJECT_CLASS (klass)->finalize = gth_comment_finalize; } static void -gth_comment_instance_init (GthComment *self) +gth_comment_init (GthComment *self) { - self->priv = GTH_COMMENT_GET_PRIVATE (self); + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_COMMENT, GthCommentPrivate); self->priv->caption = NULL; self->priv->note = NULL; self->priv->place = NULL; @@ -111,7 +119,7 @@ static void -gth_comment_gth_duplicable_interface_init (GthDuplicableIface *iface) +gth_comment_gth_duplicable_interface_init (GthDuplicableInterface *iface) { iface->duplicate = gth_comment_real_duplicate; } @@ -226,50 +234,13 @@ static void -gth_comment_dom_domizable_interface_init (DomDomizableIface *iface) +gth_comment_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = gth_comment_real_create_element; iface->load_from_element = gth_comment_real_load_from_element; } -GType -gth_comment_get_type (void) -{ - static GType gth_comment_type_id = 0; - - if (gth_comment_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthCommentClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_comment_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthComment), - 0, - (GInstanceInitFunc) gth_comment_instance_init, - NULL - }; - static const GInterfaceInfo gth_duplicable_info = { - (GInterfaceInitFunc) gth_comment_gth_duplicable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) gth_comment_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - gth_comment_type_id = g_type_register_static (G_TYPE_OBJECT, "GthComment", &g_define_type_info, 0); - g_type_add_interface_static (gth_comment_type_id, GTH_TYPE_DUPLICABLE, >h_duplicable_info); - g_type_add_interface_static (gth_comment_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return gth_comment_type_id; -} - - GthComment * gth_comment_new (void) { @@ -629,3 +600,135 @@ "general::datetime", g_file_info_get_attribute_object (file_data->info, "comment::time")); } + + +void +gth_comment_synchronize_metadata (GList *file_list) +{ + GList *scan; + + for (scan = file_list; scan; scan = scan->next) { + GthFileData *file_data = scan->data; + gboolean write_comment; + GthMetadata *metadata; + GthStringList *comment_categories; + GList *scan; + const char *text; + GthComment *comment; + GthStringList *categories; + + write_comment = FALSE; + + comment = gth_comment_new (); + gth_comment_set_note (comment, g_file_info_get_attribute_string (file_data->info, "comment::note")); + gth_comment_set_caption (comment, g_file_info_get_attribute_string (file_data->info, "comment::caption")); + gth_comment_set_place (comment, g_file_info_get_attribute_string (file_data->info, "comment::place")); + + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::time"); + if (metadata != NULL) + gth_comment_set_time_from_exif_format (comment, gth_metadata_get_raw (metadata)); + + comment_categories = (GthStringList *) g_file_info_get_attribute_object (file_data->info, "comment::categories"); + if (comment_categories != NULL) + for (scan = gth_string_list_get_list (comment_categories); scan; scan = scan->next) + gth_comment_add_category (comment, (char *) scan->data); + + gth_comment_set_rating (comment, g_file_info_get_attribute_int32 (file_data->info, "comment::rating")); + + /* sync embedded data and .comment data if required */ + + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::description"); + if (metadata != NULL) { + text = g_file_info_get_attribute_string (file_data->info, "comment::note"); + if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { + gth_comment_set_note (comment, gth_metadata_get_formatted (metadata)); + write_comment = TRUE; + } + } + + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::title"); + if (metadata != NULL) { + text = g_file_info_get_attribute_string (file_data->info, "comment::caption"); + if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { + gth_comment_set_caption (comment, gth_metadata_get_formatted (metadata)); + write_comment = TRUE; + } + } + + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::location"); + if (metadata != NULL) { + text = g_file_info_get_attribute_string (file_data->info, "comment::place"); + if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { + gth_comment_set_place (comment, gth_metadata_get_formatted (metadata)); + write_comment = TRUE; + } + } + + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::datetime"); + if (metadata != NULL) { + text = gth_metadata_get_raw (metadata); + metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::time"); + if (metadata != NULL) { + if (! dom_str_equal (gth_metadata_get_raw (metadata), text)) { + gth_comment_set_time_from_exif_format (comment, gth_metadata_get_raw (metadata)); + write_comment = TRUE; + } + } + } + + categories = (GthStringList *) g_file_info_get_attribute_object (file_data->info, "general::tags"); + if (categories != NULL) { + comment_categories = (GthStringList *) g_file_info_get_attribute_object (file_data->info, "comment::categories"); + if (! gth_string_list_equal (categories, comment_categories)) { + GList *scan; + + gth_comment_clear_categories (comment); + for (scan = gth_string_list_get_list (categories); scan; scan = scan->next) + gth_comment_add_category (comment, scan->data); + write_comment = TRUE; + } + } + + if (write_comment) { + GFile *comment_file; + GFile *comment_directory; + char *buffer; + gsize size; + + comment_file = gth_comment_get_comment_file (file_data->file); + comment_directory = g_file_get_parent (comment_file); + if (! g_file_query_exists (comment_directory, NULL)) + g_file_make_directory (comment_directory, NULL, NULL); + + buffer = gth_comment_to_data (comment, &size); + g_write_file (comment_file, + FALSE, + G_FILE_CREATE_NONE, + buffer, + size, + NULL, + NULL); + + { + GFile *parent; + GList *list; + + parent = g_file_get_parent (file_data->file); + list = g_list_prepend (NULL, file_data->file); + gth_monitor_folder_changed (gth_main_get_default_monitor (), + parent, + list, + GTH_MONITOR_EVENT_CHANGED); + + g_list_free (list); + g_object_unref (parent); + } + + g_free (buffer); + g_object_unref (comment_directory); + g_object_unref (comment_file); + } + + g_object_unref (comment); + } +} diff -Nru gthumb-2.14.3/extensions/comments/gth-comment.h gthumb-3.0.0/extensions/comments/gth-comment.h --- gthumb-2.14.3/extensions/comments/gth-comment.h 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/gth-comment.h 2012-03-22 08:59:15.000000000 +0000 @@ -82,5 +82,6 @@ GthTime * gth_comment_get_time_of_day (GthComment *comment); char * gth_comment_get_time_as_exif_format (GthComment *comment); void gth_comment_update_general_attributes (GthFileData *file_data); +void gth_comment_synchronize_metadata (GList *file_list /* GthFileData list */); #endif /* GTH_COMMENT_H */ diff -Nru gthumb-2.14.3/extensions/comments/gth-import-metadata-task.c gthumb-3.0.0/extensions/comments/gth-import-metadata-task.c --- gthumb-2.14.3/extensions/comments/gth-import-metadata-task.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/gth-import-metadata-task.c 2012-03-22 09:18:19.000000000 +0000 @@ -0,0 +1,238 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include "gth-comment.h" +#include "gth-import-metadata-task.h" +#include "preferences.h" + + +struct _GthImportMetadataTaskPrivate { + GthBrowser *browser; + GList *file_list; + GList *current; + GthFileData *file_data; +}; + + +G_DEFINE_TYPE (GthImportMetadataTask, gth_import_metadata_task, GTH_TYPE_TASK) + + +static void +gth_import_metadata_task_finalize (GObject *object) +{ + GthImportMetadataTask *self; + + self = GTH_IMPORT_METADATA_TASK (object); + + _g_object_unref (self->priv->file_data); + _g_object_list_unref (self->priv->file_list); + + G_OBJECT_CLASS (gth_import_metadata_task_parent_class)->finalize (object); +} + + +static void import_current_file (GthImportMetadataTask *self); + + +static void +transform_next_file (GthImportMetadataTask *self) +{ + self->priv->current = self->priv->current->next; + import_current_file (self); +} + + +static void +write_file_ready_cb (void **buffer, + gsize count, + GError *error, + gpointer user_data) +{ + GthImportMetadataTask *self = user_data; + + if (error != NULL) { + gth_task_completed (GTH_TASK (self), error); + return; + } + + { + GFile *file; + GFile *parent; + GList *list; + + file = self->priv->current->data; + parent = g_file_get_parent (file); + list = g_list_prepend (NULL, file); + gth_monitor_folder_changed (gth_main_get_default_monitor (), + parent, + list, + GTH_MONITOR_EVENT_CHANGED); + + g_list_free (list); + g_object_unref (parent); + } + + transform_next_file (self); +} + + +static void +load_file_ready_cb (void **buffer, + gsize count, + GError *error, + gpointer user_data) +{ + GthImportMetadataTask *self = user_data; + GFile *file; + void *tmp_buffer; + + if (error != NULL) { + gth_task_completed (GTH_TASK (self), error); + return; + } + + file = self->priv->current->data; + + tmp_buffer = *buffer; + *buffer = NULL; + + gth_hook_invoke ("delete-metadata", file, &tmp_buffer, &count); + + g_write_file_async (file, + tmp_buffer, + count, + TRUE, + G_PRIORITY_DEFAULT, + gth_task_get_cancellable (GTH_TASK (self)), + write_file_ready_cb, + self); +} + + +static void +import_current_file (GthImportMetadataTask *self) +{ + GFile *file; + + if (self->priv->current == NULL) { + gth_task_completed (GTH_TASK (self), NULL); + return; + } + + file = self->priv->current->data; + g_load_file_async (file, + G_PRIORITY_DEFAULT, + gth_task_get_cancellable (GTH_TASK (self)), + load_file_ready_cb, + self); +} + + +static void +metadata_ready_cb (GObject *source_object, + GAsyncResult *res, + gpointer user_data) +{ + GthImportMetadataTask *self = user_data; + GList *file_data_list; + GError *error = NULL; + GSettings *settings; + gboolean store_metadata_in_files; + gboolean synchronize; + + file_data_list = _g_query_metadata_finish (res, &error); + if (error != NULL) { + gth_task_completed (GTH_TASK (self), error); + return; + } + + settings = g_settings_new (GTHUMB_GENERAL_SCHEMA); + store_metadata_in_files = g_settings_get_boolean (settings, PREF_GENERAL_STORE_METADATA_IN_FILES); + g_object_unref (settings); + + settings = g_settings_new (GTHUMB_COMMENTS_SCHEMA); + synchronize = g_settings_get_boolean (settings, PREF_COMMENTS_SYNCHRONIZE); + g_object_unref (settings); + + /* Synchronization is done in _g_query_metadata_async if both + * PREF_GENERAL_STORE_METADATA_IN_FILES and PREF_COMMENTS_SYNCHRONIZE + * are true. */ + if (! store_metadata_in_files || ! synchronize) + gth_comment_synchronize_metadata (file_data_list); + + gth_task_completed (GTH_TASK (self), NULL); +} + + +static void +gth_import_metadata_task_exec (GthTask *task) +{ + GthImportMetadataTask *self; + + g_return_if_fail (GTH_IS_IMPORT_METADATA_TASK (task)); + + self = GTH_IMPORT_METADATA_TASK (task); + + _g_query_metadata_async (self->priv->file_list, + "*", + gth_task_get_cancellable (task), + metadata_ready_cb, + self); +} + + +static void +gth_import_metadata_task_class_init (GthImportMetadataTaskClass *klass) +{ + GObjectClass *object_class; + GthTaskClass *task_class; + + g_type_class_add_private (klass, sizeof (GthImportMetadataTaskPrivate)); + + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = gth_import_metadata_task_finalize; + + task_class = GTH_TASK_CLASS (klass); + task_class->exec = gth_import_metadata_task_exec; +} + + +static void +gth_import_metadata_task_init (GthImportMetadataTask *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMPORT_METADATA_TASK, GthImportMetadataTaskPrivate); + self->priv->file_data = NULL; +} + + +GthTask * +gth_import_metadata_task_new (GthBrowser *browser, + GList *file_list) +{ + GthImportMetadataTask *self; + + self = GTH_IMPORT_METADATA_TASK (g_object_new (GTH_TYPE_IMPORT_METADATA_TASK, NULL)); + self->priv->browser = browser; + self->priv->file_list = _g_object_list_ref (file_list); + + return (GthTask *) self; +} diff -Nru gthumb-2.14.3/extensions/comments/gth-import-metadata-task.h gthumb-3.0.0/extensions/comments/gth-import-metadata-task.h --- gthumb-2.14.3/extensions/comments/gth-import-metadata-task.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/gth-import-metadata-task.h 2012-03-22 08:59:15.000000000 +0000 @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 The Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_IMPORT_METADATA_TASK_H +#define GTH_IMPORT_METADATA_TASK_H + +#include +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_IMPORT_METADATA_TASK (gth_import_metadata_task_get_type ()) +#define GTH_IMPORT_METADATA_TASK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_IMPORT_METADATA_TASK, GthImportMetadataTask)) +#define GTH_IMPORT_METADATA_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_IMPORT_METADATA_TASK, GthImportMetadataTaskClass)) +#define GTH_IS_IMPORT_METADATA_TASK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_IMPORT_METADATA_TASK)) +#define GTH_IS_IMPORT_METADATA_TASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_IMPORT_METADATA_TASK)) +#define GTH_IMPORT_METADATA_TASK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_IMPORT_METADATA_TASK, GthImportMetadataTaskClass)) + +typedef struct _GthImportMetadataTask GthImportMetadataTask; +typedef struct _GthImportMetadataTaskClass GthImportMetadataTaskClass; +typedef struct _GthImportMetadataTaskPrivate GthImportMetadataTaskPrivate; + +struct _GthImportMetadataTask { + GthTask __parent; + GthImportMetadataTaskPrivate *priv; +}; + +struct _GthImportMetadataTaskClass { + GthTaskClass __parent; +}; + +GType gth_import_metadata_task_get_type (void); +GthTask * gth_import_metadata_task_new (GthBrowser *browser, + GList *file_list /* GFile list */); + +G_END_DECLS + +#endif /* GTH_IMPORT_METADATA_TASK_H */ diff -Nru gthumb-2.14.3/extensions/comments/gth-metadata-provider-comment.c gthumb-3.0.0/extensions/comments/gth-metadata-provider-comment.c --- gthumb-2.14.3/extensions/comments/gth-metadata-provider-comment.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/gth-metadata-provider-comment.c 2012-04-09 18:29:50.000000000 +0000 @@ -26,7 +26,7 @@ #include "gth-metadata-provider-comment.h" -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthMetadataProviderComment, gth_metadata_provider_comment, GTH_TYPE_METADATA_PROVIDER) static gboolean @@ -67,18 +67,15 @@ const char *attributes, GCancellable *cancellable) { - GthComment *comment; - GFileAttributeMatcher *matcher; - const char *value; - GPtrArray *categories; - char *comment_time; + GthComment *comment; + const char *value; + GPtrArray *categories; + char *comment_time; comment = gth_comment_new_for_file (file_data->file, cancellable, NULL); if (comment == NULL) return; - matcher = g_file_attribute_matcher_new (attributes); - value = gth_comment_get_note (comment); if (value != NULL) g_file_info_set_attribute_string (file_data->info, "comment::note", value); @@ -127,7 +124,6 @@ gth_comment_update_general_attributes (file_data); - g_file_attribute_matcher_unref (matcher); g_object_unref (comment); } @@ -221,38 +217,17 @@ static void gth_metadata_provider_comment_class_init (GthMetadataProviderCommentClass *klass) { - parent_class = g_type_class_peek_parent (klass); + GthMetadataProviderClass *mp_class; - GTH_METADATA_PROVIDER_CLASS (klass)->can_read = gth_metadata_provider_comment_can_read; - GTH_METADATA_PROVIDER_CLASS (klass)->can_write = gth_metadata_provider_comment_can_write; - GTH_METADATA_PROVIDER_CLASS (klass)->read = gth_metadata_provider_comment_read; - GTH_METADATA_PROVIDER_CLASS (klass)->write = gth_metadata_provider_comment_write; + mp_class = GTH_METADATA_PROVIDER_CLASS (klass); + mp_class->can_read = gth_metadata_provider_comment_can_read; + mp_class->can_write = gth_metadata_provider_comment_can_write; + mp_class->read = gth_metadata_provider_comment_read; + mp_class->write = gth_metadata_provider_comment_write; } - -GType -gth_metadata_provider_comment_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthMetadataProviderCommentClass), - NULL, - NULL, - (GClassInitFunc) gth_metadata_provider_comment_class_init, - NULL, - NULL, - sizeof (GthMetadataProviderComment), - 0, - (GInstanceInitFunc) NULL - }; - - type = g_type_register_static (GTH_TYPE_METADATA_PROVIDER, - "GthMetadataProviderComment", - &type_info, - 0); - } - - return type; +static void +gth_metadata_provider_comment_init (GthMetadataProviderComment *self) +{ + /* void */ } diff -Nru gthumb-2.14.3/extensions/comments/main.c gthumb-3.0.0/extensions/comments/main.c --- gthumb-2.14.3/extensions/comments/main.c 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/main.c 2012-03-22 08:59:15.000000000 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include "callbacks.h" #include "dlg-comments-preferences.h" #include "gth-comment.h" #include "gth-metadata-provider-comment.h" @@ -77,143 +78,40 @@ static void -comments__read_metadata_ready_cb (GthFileData *file_data, - const char *attributes) +comments__read_metadata_ready_cb (GList *file_list, + const char *attributes) { - gboolean write_comment = FALSE; - GthMetadata *metadata; - GthStringList *comment_categories; - GList *scan; - const char *text; - GthComment *comment; - GthStringList *categories; + GSettings *settings; + gboolean store_metadata_in_files; + gboolean synchronize; - if (! eel_gconf_get_boolean (PREF_STORE_METADATA_IN_FILES, TRUE)) { - /* if PREF_STORE_METADATA_IN_FILES is false, avoid to + settings = g_settings_new (GTHUMB_GENERAL_SCHEMA); + store_metadata_in_files = g_settings_get_boolean (settings, PREF_GENERAL_STORE_METADATA_IN_FILES); + g_object_unref (settings); + + if (! store_metadata_in_files) { + GList *scan; + + /* if PREF_GENERAL_STORE_METADATA_IN_FILES is false, avoid to * synchronize the .comment metadata because the embedded * metadata is likely to be out-of-date. * Give priority to the .comment metadata which, if present, * is the most up-to-date. */ - gth_comment_update_general_attributes (file_data); + for (scan = file_list; scan; scan = scan->next) + gth_comment_update_general_attributes ((GthFileData *) scan->data); return; } - if (! eel_gconf_get_boolean (PREF_COMMENTS_SYNCHRONIZE, TRUE)) - return; - - comment = gth_comment_new (); - gth_comment_set_note (comment, g_file_info_get_attribute_string (file_data->info, "comment::note")); - gth_comment_set_caption (comment, g_file_info_get_attribute_string (file_data->info, "comment::caption")); - gth_comment_set_place (comment, g_file_info_get_attribute_string (file_data->info, "comment::place")); - - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::time"); - if (metadata != NULL) - gth_comment_set_time_from_exif_format (comment, gth_metadata_get_raw (metadata)); - - comment_categories = (GthStringList *) g_file_info_get_attribute_object (file_data->info, "comment::categories"); - if (comment_categories != NULL) - for (scan = gth_string_list_get_list (comment_categories); scan; scan = scan->next) - gth_comment_add_category (comment, (char *) scan->data); - - gth_comment_set_rating (comment, g_file_info_get_attribute_int32 (file_data->info, "comment::rating")); - - /* sync embedded data and .comment data if required */ - - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::description"); - if (metadata != NULL) { - text = g_file_info_get_attribute_string (file_data->info, "comment::note"); - if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { - gth_comment_set_note (comment, gth_metadata_get_formatted (metadata)); - write_comment = TRUE; - } - } - - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::title"); - if (metadata != NULL) { - text = g_file_info_get_attribute_string (file_data->info, "comment::caption"); - if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { - gth_comment_set_caption (comment, gth_metadata_get_formatted (metadata)); - write_comment = TRUE; - } - } - - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::location"); - if (metadata != NULL) { - text = g_file_info_get_attribute_string (file_data->info, "comment::place"); - if (! dom_str_equal (gth_metadata_get_formatted (metadata), text)) { - gth_comment_set_place (comment, gth_metadata_get_formatted (metadata)); - write_comment = TRUE; - } - } + settings = g_settings_new (GTHUMB_COMMENTS_SCHEMA); + synchronize = g_settings_get_boolean (settings, PREF_COMMENTS_SYNCHRONIZE); + g_object_unref (settings); - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "general::datetime"); - if (metadata != NULL) { - text = gth_metadata_get_raw (metadata); - metadata = (GthMetadata *) g_file_info_get_attribute_object (file_data->info, "comment::time"); - if (metadata != NULL) { - if (! dom_str_equal (gth_metadata_get_raw (metadata), text)) { - gth_comment_set_time_from_exif_format (comment, gth_metadata_get_raw (metadata)); - write_comment = TRUE; - } - } - } - - categories = (GthStringList *) g_file_info_get_attribute_object (file_data->info, "general::tags"); - if (categories != NULL) { - comment_categories = (GthStringList *) g_file_info_get_attribute_object (file_data->info, "comment::categories"); - if (! gth_string_list_equal (categories, comment_categories)) { - GList *scan; - - gth_comment_clear_categories (comment); - for (scan = gth_string_list_get_list (categories); scan; scan = scan->next) - gth_comment_add_category (comment, scan->data); - write_comment = TRUE; - } - } - - if (write_comment) { - GFile *comment_file; - GFile *comment_directory; - char *buffer; - gsize size; - - comment_file = gth_comment_get_comment_file (file_data->file); - comment_directory = g_file_get_parent (comment_file); - if (! g_file_query_exists (comment_directory, NULL)) - g_file_make_directory (comment_directory, NULL, NULL); - - buffer = gth_comment_to_data (comment, &size); - g_write_file (comment_file, - FALSE, - G_FILE_CREATE_NONE, - buffer, - size, - NULL, - NULL); - - { - GFile *parent; - GList *list; - - parent = g_file_get_parent (file_data->file); - list = g_list_prepend (NULL, file_data->file); - gth_monitor_folder_changed (gth_main_get_default_monitor (), - parent, - list, - GTH_MONITOR_EVENT_CHANGED); - - g_list_free (list); - g_object_unref (parent); - } - - g_free (buffer); - g_object_unref (comment_directory); - g_object_unref (comment_file); - } + if (! synchronize) + return; - g_object_unref (comment); + gth_comment_synchronize_metadata (file_list); } @@ -265,6 +163,7 @@ gth_hook_add_callback ("read-metadata-ready", 10, G_CALLBACK (comments__read_metadata_ready_cb), NULL); if (gth_main_extension_is_active ("edit_metadata")) gth_hook_add_callback ("delete-metadata", 10, G_CALLBACK (comments__delete_metadata_cb), NULL); + gth_hook_add_callback ("gth-browser-construct", 10, G_CALLBACK (comments__gth_browser_construct_cb), NULL); } diff -Nru gthumb-2.14.3/extensions/comments/Makefile.am gthumb-3.0.0/extensions/comments/Makefile.am --- gthumb-2.14.3/extensions/comments/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/Makefile.am 2012-03-22 08:59:15.000000000 +0000 @@ -4,10 +4,16 @@ extension_LTLIBRARIES = libcomments.la libcomments_la_SOURCES = \ + actions.c \ + actions.h \ + callbacks.c \ + callbacks.h \ dlg-comments-preferences.c \ dlg-comments-preferences.h \ gth-comment.c \ gth-comment.h \ + gth-import-metadata-task.c \ + gth-import-metadata-task.h \ gth-metadata-provider-comment.c \ gth-metadata-provider-comment.h \ main.c \ diff -Nru gthumb-2.14.3/extensions/comments/Makefile.in gthumb-3.0.0/extensions/comments/Makefile.in --- gthumb-2.14.3/extensions/comments/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -80,9 +97,11 @@ "$(DESTDIR)$(extensioninidir)" LTLIBRARIES = $(extension_LTLIBRARIES) am__DEPENDENCIES_1 = -am_libcomments_la_OBJECTS = \ +am_libcomments_la_OBJECTS = libcomments_la-actions.lo \ + libcomments_la-callbacks.lo \ libcomments_la-dlg-comments-preferences.lo \ libcomments_la-gth-comment.lo \ + libcomments_la-gth-import-metadata-task.lo \ libcomments_la-gth-metadata-provider-comment.lo \ libcomments_la-main.lo libcomments_la_OBJECTS = $(am_libcomments_la_OBJECTS) @@ -128,6 +147,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -207,10 +231,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -218,6 +240,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -257,6 +280,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -305,8 +330,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -337,6 +360,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -371,10 +395,16 @@ extensiondir = $(pkglibdir)/extensions extension_LTLIBRARIES = libcomments.la libcomments_la_SOURCES = \ + actions.c \ + actions.h \ + callbacks.c \ + callbacks.h \ dlg-comments-preferences.c \ dlg-comments-preferences.h \ gth-comment.c \ gth-comment.h \ + gth-import-metadata-task.c \ + gth-import-metadata-task.h \ gth-metadata-provider-comment.c \ gth-metadata-provider-comment.h \ main.c \ @@ -425,7 +455,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -433,6 +462,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -463,8 +494,11 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcomments_la-actions.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcomments_la-callbacks.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcomments_la-dlg-comments-preferences.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcomments_la-gth-comment.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcomments_la-gth-import-metadata-task.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcomments_la-gth-metadata-provider-comment.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libcomments_la-main.Plo@am__quote@ @@ -489,6 +523,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +libcomments_la-actions.lo: actions.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcomments_la_CFLAGS) $(CFLAGS) -MT libcomments_la-actions.lo -MD -MP -MF $(DEPDIR)/libcomments_la-actions.Tpo -c -o libcomments_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcomments_la-actions.Tpo $(DEPDIR)/libcomments_la-actions.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='actions.c' object='libcomments_la-actions.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcomments_la_CFLAGS) $(CFLAGS) -c -o libcomments_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c + +libcomments_la-callbacks.lo: callbacks.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcomments_la_CFLAGS) $(CFLAGS) -MT libcomments_la-callbacks.lo -MD -MP -MF $(DEPDIR)/libcomments_la-callbacks.Tpo -c -o libcomments_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcomments_la-callbacks.Tpo $(DEPDIR)/libcomments_la-callbacks.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callbacks.c' object='libcomments_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcomments_la_CFLAGS) $(CFLAGS) -c -o libcomments_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c + libcomments_la-dlg-comments-preferences.lo: dlg-comments-preferences.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcomments_la_CFLAGS) $(CFLAGS) -MT libcomments_la-dlg-comments-preferences.lo -MD -MP -MF $(DEPDIR)/libcomments_la-dlg-comments-preferences.Tpo -c -o libcomments_la-dlg-comments-preferences.lo `test -f 'dlg-comments-preferences.c' || echo '$(srcdir)/'`dlg-comments-preferences.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcomments_la-dlg-comments-preferences.Tpo $(DEPDIR)/libcomments_la-dlg-comments-preferences.Plo @@ -503,6 +551,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcomments_la_CFLAGS) $(CFLAGS) -c -o libcomments_la-gth-comment.lo `test -f 'gth-comment.c' || echo '$(srcdir)/'`gth-comment.c +libcomments_la-gth-import-metadata-task.lo: gth-import-metadata-task.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcomments_la_CFLAGS) $(CFLAGS) -MT libcomments_la-gth-import-metadata-task.lo -MD -MP -MF $(DEPDIR)/libcomments_la-gth-import-metadata-task.Tpo -c -o libcomments_la-gth-import-metadata-task.lo `test -f 'gth-import-metadata-task.c' || echo '$(srcdir)/'`gth-import-metadata-task.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcomments_la-gth-import-metadata-task.Tpo $(DEPDIR)/libcomments_la-gth-import-metadata-task.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-import-metadata-task.c' object='libcomments_la-gth-import-metadata-task.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcomments_la_CFLAGS) $(CFLAGS) -c -o libcomments_la-gth-import-metadata-task.lo `test -f 'gth-import-metadata-task.c' || echo '$(srcdir)/'`gth-import-metadata-task.c + libcomments_la-gth-metadata-provider-comment.lo: gth-metadata-provider-comment.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcomments_la_CFLAGS) $(CFLAGS) -MT libcomments_la-gth-metadata-provider-comment.lo -MD -MP -MF $(DEPDIR)/libcomments_la-gth-metadata-provider-comment.Tpo -c -o libcomments_la-gth-metadata-provider-comment.lo `test -f 'gth-metadata-provider-comment.c' || echo '$(srcdir)/'`gth-metadata-provider-comment.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libcomments_la-gth-metadata-provider-comment.Tpo $(DEPDIR)/libcomments_la-gth-metadata-provider-comment.Plo @@ -524,8 +579,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -708,13 +766,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/comments/preferences.h gthumb-3.0.0/extensions/comments/preferences.h --- gthumb-2.14.3/extensions/comments/preferences.h 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/comments/preferences.h 2012-02-19 15:01:31.000000000 +0000 @@ -22,6 +22,12 @@ #ifndef PREFERENCES_H #define PREFERENCES_H -#define PREF_COMMENTS_SYNCHRONIZE "/apps/gthumb/ext/comments/synchronize" +/* schema */ + +#define GTHUMB_COMMENTS_SCHEMA GTHUMB_SCHEMA ".comments" + +/* keys */ + +#define PREF_COMMENTS_SYNCHRONIZE "synchronize" #endif /* PREFERENCES_H */ diff -Nru gthumb-2.14.3/extensions/contact_sheet/callbacks.c gthumb-3.0.0/extensions/contact_sheet/callbacks.c --- gthumb-2.14.3/extensions/contact_sheet/callbacks.c 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/callbacks.c 2012-03-05 17:42:02.000000000 +0000 @@ -91,7 +91,7 @@ data = g_new0 (BrowserData, 1); - data->action_group = gtk_action_group_new ("Web Albums Actions"); + data->action_group = gtk_action_group_new ("Contact Sheet Actions"); gtk_action_group_set_translation_domain (data->action_group, NULL); gtk_action_group_add_actions (data->action_group, action_entries, diff -Nru gthumb-2.14.3/extensions/contact_sheet/contact_sheet.extension.in.in gthumb-3.0.0/extensions/contact_sheet/contact_sheet.extension.in.in --- gthumb-2.14.3/extensions/contact_sheet/contact_sheet.extension.in.in 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/contact_sheet.extension.in.in 2012-04-21 09:26:38.000000000 +0000 @@ -9,4 +9,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=export_tools diff -Nru gthumb-2.14.3/extensions/contact_sheet/data/contact_sheet_themes/Makefile.in gthumb-3.0.0/extensions/contact_sheet/data/contact_sheet_themes/Makefile.in --- gthumb-2.14.3/extensions/contact_sheet/data/contact_sheet_themes/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/data/contact_sheet_themes/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -339,8 +361,11 @@ -rm -rf .libs _libs install-themeDATA: $(theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/contact_sheet/data/gthumb_contact_sheet.schemas.in gthumb-3.0.0/extensions/contact_sheet/data/gthumb_contact_sheet.schemas.in --- gthumb-2.14.3/extensions/contact_sheet/data/gthumb_contact_sheet.schemas.in 2011-11-13 19:38:41.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/data/gthumb_contact_sheet.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,334 +0,0 @@ - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/header - /apps/gthumb/ext/contact_sheet/header - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/footer - /apps/gthumb/ext/contact_sheet/footer - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/destination - /apps/gthumb/ext/contact_sheet/destination - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/template - /apps/gthumb/ext/contact_sheet/template - gthumb - string - ### - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/mime_type - /apps/gthumb/ext/contact_sheet/mime_type - gthumb - string - image/jpeg - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/html_image_map - /apps/gthumb/ext/contact_sheet/html_image_map - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/theme - /apps/gthumb/ext/contact_sheet/theme - gthumb - string - default.cst - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/images_per_page - /apps/gthumb/ext/contact_sheet/images_per_page - gthumb - int - 25 - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/single_page - /apps/gthumb/ext/contact_sheet/single_page - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/columns - /apps/gthumb/ext/contact_sheet/columns - gthumb - int - 5 - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/sort_type - /apps/gthumb/ext/contact_sheet/sort_type - gthumb - string - general::unsorted - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/sort_inverse - /apps/gthumb/ext/contact_sheet/sort_inverse - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/same_size - /apps/gthumb/ext/contact_sheet/same_size - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/thumbnail_size - /apps/gthumb/ext/contact_sheet/thumbnail_size - gthumb - int - 128 - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/squared_thumbnail - /apps/gthumb/ext/contact_sheet/squared_thumbnail - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/ext/contact_sheet/thumbnail_caption - /apps/gthumb/ext/contact_sheet/thumbnail_caption - gthumb - string - - - - - - - - - - - - /schemas/apps/gthumb/ext/image_wall/destination - /apps/gthumb/ext/image_wall/destination - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/image_wall/template - /apps/gthumb/ext/image_wall/template - gthumb - string - ### - - - - - - - - - /schemas/apps/gthumb/ext/image_wall/mime_type - /apps/gthumb/ext/image_wall/mime_type - gthumb - string - image/jpeg - - - - - - - - - /schemas/apps/gthumb/ext/image_wall/images_per_page - /apps/gthumb/ext/image_wall/images_per_page - gthumb - int - 25 - - - - - - - - - /schemas/apps/gthumb/ext/image_wall/single_page - /apps/gthumb/ext/image_wall/single_page - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/ext/image_wall/columns - /apps/gthumb/ext/image_wall/columns - gthumb - int - 5 - - - - - - - - - /schemas/apps/gthumb/ext/image_wall/sort_type - /apps/gthumb/ext/image_wall/sort_type - gthumb - string - general::unsorted - - - - - - - - - /schemas/apps/gthumb/ext/image_wall/sort_inverse - /apps/gthumb/ext/image_wall/sort_inverse - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/ext/image_wall/thumbnail_size - /apps/gthumb/ext/image_wall/thumbnail_size - gthumb - int - 128 - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/contact_sheet/data/Makefile.am gthumb-3.0.0/extensions/contact_sheet/data/Makefile.am --- gthumb-2.14.3/extensions/contact_sheet/data/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/data/Makefile.am 2012-02-19 15:01:31.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = contact_sheet_themes ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_contact_sheet.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/contact_sheet/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/contact_sheet/data/Makefile.in gthumb-3.0.0/extensions/contact_sheet/data/Makefile.in --- gthumb-2.14.3/extensions/contact_sheet/data/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/data/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = contact_sheet_themes ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_contact_sheet.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/contact_sheet/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui gthumb-3.0.0/extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui --- gthumb-2.14.3/extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui 2011-10-17 08:57:03.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,7 +1,6 @@ - + - @@ -33,24 +32,29 @@ True + False 6 24 True + False 12 True + False 6 True + False _Name: True False + True 0 @@ -58,29 +62,35 @@ True True - + + True + True 1 False + True 0 True + False 12 True + False 6 True + False 0 Background @@ -89,16 +99,19 @@ False + True 0 True + False 12 True + False 4 5 6 @@ -106,10 +119,13 @@ _Solid color + False True True False + False True + 0 True True @@ -122,10 +138,13 @@ _Gradient + False True True False + False True + 0 True solid_color_radiobutton @@ -140,6 +159,7 @@ True + False @@ -152,10 +172,13 @@ _Horizontal: + False True True False + False True + 0 True @@ -170,6 +193,7 @@ True + False @@ -182,10 +206,13 @@ _Vertical: + False True True False + False True + 0 True @@ -199,13 +226,16 @@ + False True True True + False none True + False gtk-refresh @@ -221,13 +251,16 @@ + False True True True + False none True + False gtk-refresh @@ -243,9 +276,11 @@ + False True True True + False Select a color #000000000000 @@ -258,9 +293,11 @@ + False True True True + False Select a color #000000000000 @@ -275,9 +312,11 @@ + False True True True + False Select a color #000000000000 @@ -292,9 +331,11 @@ + False True True True + False Select a color #000000000000 @@ -309,9 +350,11 @@ + False True True True + False Select a color #000000000000 @@ -334,22 +377,27 @@ + False + True 1 False + True 0 True + False 6 True + False 0 Frame @@ -358,16 +406,19 @@ False + True 0 True + False 12 True + False 2 2 12 @@ -375,6 +426,7 @@ True + False 0 _Style: True @@ -388,6 +440,7 @@ True + False 0 C_olor: True @@ -403,6 +456,7 @@ True + False frame_style_liststore @@ -415,21 +469,26 @@ 1 2 GTK_FILL + GTK_FILL True + False + False True True True + False Select a color #000000000000 False + True 0 @@ -439,28 +498,34 @@ 2 1 2 + GTK_FILL + False + True 1 False + True 1 True + False 6 True + False 0 Text @@ -469,16 +534,19 @@ False + True 0 True + False 12 True + False 3 2 12 @@ -486,6 +554,7 @@ True + False 0 _Header: True @@ -499,28 +568,36 @@ True + False 6 + False True True True + False Select a font + True + True 0 + False True True True + False Select a color #000000000000 False + True 1 @@ -528,11 +605,13 @@ 1 2 + GTK_FILL True + False 0 _Footer: True @@ -541,33 +620,42 @@ 1 2 GTK_FILL + GTK_FILL True + False 6 + False True True True + False Select a font + True + True 0 + False True True True + False Select a color #000000000000 False + True 1 @@ -577,11 +665,13 @@ 2 1 2 + GTK_FILL True + False 0 Caption: @@ -589,33 +679,42 @@ 2 3 GTK_FILL + GTK_FILL True + False 6 + False True True True + False Select a font + True + True 0 + False True True True + False Select a color #000000000000 False + True 1 @@ -625,35 +724,43 @@ 2 2 3 + GTK_FILL + False + True 1 False + True 2 + True + True 1 False + True 0 True + False 3 @@ -661,28 +768,32 @@ 380 True True - automatic - automatic in True + False queue none True + False + True + True 0 + True + True 1 diff -Nru gthumb-2.14.3/extensions/contact_sheet/data/ui/contact-sheet.ui gthumb-3.0.0/extensions/contact_sheet/data/ui/contact-sheet.ui --- gthumb-2.14.3/extensions/contact_sheet/data/ui/contact-sheet.ui 2011-10-17 08:57:03.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/data/ui/contact-sheet.ui 2012-02-19 15:01:31.000000000 +0000 @@ -6,6 +6,14 @@ 1 10 + + + + + + + + False 6 @@ -25,6 +33,7 @@ gtk-help + False True True True @@ -42,6 +51,7 @@ gtk-cancel + False True True True @@ -58,6 +68,7 @@ gtk-save + False True True True @@ -131,6 +142,7 @@ 1 2 + GTK_FILL @@ -146,6 +158,7 @@ 2 3 + GTK_FILL @@ -163,6 +176,7 @@ 2 1 2 + GTK_FILL @@ -180,6 +194,7 @@ 2 2 3 + GTK_FILL @@ -193,6 +208,9 @@ + + GTK_FILL + @@ -208,6 +226,7 @@ 1 2 + GTK_FILL @@ -223,6 +242,7 @@ 3 4 + GTK_FILL @@ -240,6 +260,7 @@ 2 3 4 + GTK_FILL @@ -372,6 +393,7 @@ GTK_FILL + GTK_FILL @@ -385,6 +407,7 @@ 1 2 + GTK_FILL @@ -400,6 +423,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -436,7 +460,7 @@ - True + False True 1 @@ -470,6 +494,7 @@ 1 2 + GTK_FILL @@ -487,6 +512,7 @@ 2 1 2 + GTK_FILL @@ -500,6 +526,9 @@ + + GTK_FILL + @@ -515,6 +544,7 @@ 1 2 + GTK_FILL @@ -531,7 +561,7 @@ - True + False True 0 @@ -539,6 +569,7 @@ Create _HTML image map + False True True False @@ -548,7 +579,7 @@ True - True + False True 1 @@ -597,8 +628,6 @@ True True in - automatic - automatic True @@ -640,6 +669,7 @@ 6 + False True True True @@ -661,6 +691,7 @@ + False True True True @@ -682,6 +713,7 @@ + False True True True @@ -781,6 +813,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -809,6 +842,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -835,6 +869,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -848,11 +883,13 @@ GTK_FILL + GTK_FILL All images on a single page + False True True False @@ -863,11 +900,13 @@ 2 3 + GTK_FILL _All pages with the same size + False True True False @@ -974,6 +1013,7 @@ Re_verse order + False True True False @@ -983,7 +1023,7 @@ True - True + False True 1 @@ -1009,6 +1049,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -1037,6 +1078,7 @@ Sq_uared + False True True False @@ -1056,6 +1098,7 @@ 2 1 2 + GTK_FILL @@ -1088,8 +1131,6 @@ True True in - automatic - automatic @@ -1147,7 +1188,7 @@ - False + True True 1 @@ -1160,14 +1201,6 @@ ok_button - - - - - - - - 100 1 diff -Nru gthumb-2.14.3/extensions/contact_sheet/data/ui/image-wall.ui gthumb-3.0.0/extensions/contact_sheet/data/ui/image-wall.ui --- gthumb-2.14.3/extensions/contact_sheet/data/ui/image-wall.ui 2011-10-17 08:57:03.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/data/ui/image-wall.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,37 +1,123 @@ - + - + + 100 + 1 + 10 + + + + + + + + + + False 6 Image Wall dialog - + True + False + vertical 5 + + + True + False + end + + + gtk-help + False + True + True + True + True + False + True + + + False + False + 0 + True + + + + + gtk-cancel + False + True + True + True + True + False + True + + + False + False + 1 + + + + + gtk-save + False + True + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 6 6 True + False 0 none True + False 6 12 True + False 6 True + False 3 2 6 @@ -39,17 +125,20 @@ True + False 0 _Destination: True GTK_FILL + GTK_FILL True + False select-folder False Choose destination folder @@ -57,11 +146,13 @@ 1 2 + GTK_FILL True + False 0 File_name: True @@ -71,30 +162,33 @@ 1 2 GTK_FILL + GTK_FILL True + False 6 True True - + True ### gtk-help - True - True + True + True 0 True + False filetype_liststore 0 @@ -105,6 +199,8 @@ + False + True 1 @@ -119,6 +215,7 @@ + False 2 2 12 @@ -126,6 +223,7 @@ True + False 0 # @@ -135,11 +233,13 @@ 1 2 + GTK_FILL True + False 0 New enumerator digit @@ -151,11 +251,13 @@ 2 1 2 + GTK_FILL True + False 0 Special code @@ -163,10 +265,14 @@ + + GTK_FILL + True + False 0 Description @@ -177,6 +283,7 @@ 1 2 + GTK_FILL @@ -193,6 +300,8 @@ + False + True 0 @@ -203,6 +312,7 @@ True + False Saving True @@ -213,22 +323,26 @@ False + True 0 True + False 0 none True + False 6 12 True + False 2 3 6 @@ -236,6 +350,7 @@ True + False 0 Columns: @@ -243,22 +358,25 @@ 1 2 GTK_FILL + GTK_FILL True + False 6 True True - + cols_adjustment 1 False + True 0 @@ -269,22 +387,25 @@ 1 2 GTK_FILL + GTK_FILL True + False 6 True True - + rows_adjustment 1 False + True 0 @@ -293,11 +414,13 @@ 1 2 GTK_FILL + GTK_FILL True + False 0 Images per page: True @@ -305,19 +428,23 @@ GTK_FILL + GTK_FILL All images on a single page + False True True False + False True 2 3 + GTK_FILL @@ -330,6 +457,7 @@ True + False Layout True @@ -340,26 +468,31 @@ False + True 1 True + False 0 none True + False 6 12 True + False 6 True + False 2 2 6 @@ -367,6 +500,7 @@ True + False 0 S_ort: True @@ -379,10 +513,12 @@ True + False 6 True + False sort_liststore @@ -392,19 +528,26 @@ + True + True 0 Re_verse order + False True True False + False True + 0 True + False + True 1 @@ -418,6 +561,7 @@ True + False 0 _Size: True @@ -427,15 +571,18 @@ 1 2 GTK_FILL + GTK_FILL True + False 6 True + False thumbnail_size_liststore @@ -446,6 +593,7 @@ False + True 0 @@ -455,11 +603,13 @@ 2 1 2 + GTK_FILL False + True 0 @@ -470,6 +620,7 @@ True + False Thumbnails True @@ -479,70 +630,16 @@ - 2 - - - - - 1 - - - - - True - end - - - gtk-help - True - True - True - True - True - - - False - False - 0 - True - - - - - gtk-cancel - True - True - True - True - True - - - False - False - 1 - - - - - gtk-save - True - True - True - True - True - True - - False - False + True 2 - False - end - 0 + True + True + 1 @@ -558,11 +655,6 @@ 1 10 - - 100 - 1 - 10 - @@ -579,12 +671,4 @@ - - - - - - - - diff -Nru gthumb-2.14.3/extensions/contact_sheet/data/ui/Makefile.in gthumb-3.0.0/extensions/contact_sheet/data/ui/Makefile.in --- gthumb-2.14.3/extensions/contact_sheet/data/ui/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/data/ui/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -338,8 +360,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/contact_sheet/dlg-contact-sheet.c gthumb-3.0.0/extensions/contact_sheet/dlg-contact-sheet.c --- gthumb-2.14.3/extensions/contact_sheet/dlg-contact-sheet.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/dlg-contact-sheet.c 2012-02-19 15:01:31.000000000 +0000 @@ -29,8 +29,6 @@ #define GET_WIDGET(name) _gtk_builder_get_widget (data->builder, (name)) #define STRING_IS_VOID(x) (((x) == NULL) || (*(x) == 0)) -#define DEFAULT_CONTACT_SHEET_THEME "default" -#define DEFAULT_CONTACT_SHEET_THUMBNAIL_CAPTION ("general::datetime,general::dimensions,gth::file::display-size") #define PREVIEW_SIZE 112 enum { @@ -56,6 +54,7 @@ typedef struct { GthBrowser *browser; + GSettings *settings; GList *file_list; GtkBuilder *builder; GtkWidget *dialog; @@ -85,6 +84,7 @@ { gth_browser_set_dialog (data->browser, "contact_sheet", NULL); _g_object_list_unref (data->file_list); + g_object_unref (data->settings); g_object_unref (data->builder); g_free (data); } @@ -153,18 +153,18 @@ /* save the options */ header = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("header_entry"))); - eel_gconf_set_string (PREF_CONTACT_SHEET_HEADER, header); + g_settings_set_string (data->settings, PREF_CONTACT_SHEET_HEADER, header); footer = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("footer_entry"))); - eel_gconf_set_string (PREF_CONTACT_SHEET_FOOTER, footer); + g_settings_set_string (data->settings, PREF_CONTACT_SHEET_FOOTER, footer); s_value = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton"))); destination = g_file_new_for_uri (s_value); - eel_gconf_set_path (PREF_CONTACT_SHEET_DESTINATION, s_value); + _g_settings_set_uri (data->settings, PREF_CONTACT_SHEET_DESTINATION, s_value); g_free (s_value); template = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("template_entry"))); - eel_gconf_set_string (PREF_CONTACT_SHEET_TEMPLATE, template); + g_settings_set_string (data->settings, PREF_CONTACT_SHEET_TEMPLATE, template); mime_type = NULL; if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("filetype_combobox")), &iter)) { @@ -173,48 +173,48 @@ FILE_TYPE_COLUMN_MIME_TYPE, &mime_type, FILE_TYPE_COLUMN_DEFAULT_EXTENSION, &file_extension, -1); - eel_gconf_set_string (PREF_CONTACT_SHEET_MIME_TYPE, mime_type); + g_settings_set_string (data->settings, PREF_CONTACT_SHEET_MIME_TYPE, mime_type); } create_image_map = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("image_map_checkbutton"))); - eel_gconf_set_boolean (PREF_CONTACT_SHEET_HTML_IMAGE_MAP, create_image_map); + g_settings_set_boolean (data->settings, PREF_CONTACT_SHEET_HTML_IMAGE_MAP, create_image_map); theme = get_selected_theme (data); g_return_if_fail (theme != NULL); theme_name = g_file_get_basename (theme->file); - eel_gconf_set_string (PREF_CONTACT_SHEET_THEME, theme_name); + g_settings_set_string (data->settings, PREF_CONTACT_SHEET_THEME, theme_name); images_per_index = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("images_per_index_spinbutton"))); - eel_gconf_set_integer (PREF_CONTACT_SHEET_IMAGES_PER_PAGE, images_per_index); + g_settings_set_int (data->settings, PREF_CONTACT_SHEET_IMAGES_PER_PAGE, images_per_index); single_page = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_index_checkbutton"))); - eel_gconf_set_boolean (PREF_CONTACT_SHEET_SINGLE_PAGE, single_page); + g_settings_set_boolean (data->settings, PREF_CONTACT_SHEET_SINGLE_PAGE, single_page); columns = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("cols_spinbutton"))); - eel_gconf_set_integer (PREF_CONTACT_SHEET_COLUMNS, columns); + g_settings_set_int (data->settings, PREF_CONTACT_SHEET_COLUMNS, columns); if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("sort_combobox")), &iter)) { gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("sort_liststore")), &iter, SORT_TYPE_COLUMN_DATA, &sort_type, -1); - eel_gconf_set_string (PREF_CONTACT_SHEET_SORT_TYPE, sort_type->name); + g_settings_set_string (data->settings, PREF_CONTACT_SHEET_SORT_TYPE, sort_type->name); } sort_inverse = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton"))); - eel_gconf_set_boolean (PREF_CONTACT_SHEET_SORT_INVERSE, sort_inverse); + g_settings_set_boolean (data->settings, PREF_CONTACT_SHEET_SORT_INVERSE, sort_inverse); same_size = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("same_size_checkbutton"))); - eel_gconf_set_boolean (PREF_CONTACT_SHEET_SAME_SIZE, same_size); + g_settings_set_boolean (data->settings, PREF_CONTACT_SHEET_SAME_SIZE, same_size); thumbnail_size = thumb_size[gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnail_size_combobox")))]; - eel_gconf_set_integer (PREF_CONTACT_SHEET_THUMBNAIL_SIZE, thumbnail_size); + g_settings_set_int (data->settings, PREF_CONTACT_SHEET_THUMBNAIL_SIZE, thumbnail_size); squared_thumbnail = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("squared_thumbnail_checkbutton"))); - eel_gconf_set_boolean (PREF_CONTACT_SHEET_SQUARED_THUMBNAIL, squared_thumbnail); + g_settings_set_boolean (data->settings, PREF_CONTACT_SHEET_SQUARED_THUMBNAIL, squared_thumbnail); thumbnail_caption = gth_metadata_chooser_get_selection (GTH_METADATA_CHOOSER (data->thumbnail_caption_chooser)); - eel_gconf_set_string (PREF_CONTACT_SHEET_THUMBNAIL_CAPTION, thumbnail_caption); + g_settings_set_string (data->settings, PREF_CONTACT_SHEET_THUMBNAIL_CAPTION, thumbnail_caption); /* exec the task */ @@ -268,13 +268,16 @@ gpointer user_data) { DialogData *data = user_data; - GtkWidget *help_box; + GtkWidget *help_box = NULL; if (GTK_WIDGET (entry) == GET_WIDGET ("footer_entry")) help_box = GET_WIDGET ("page_footer_help_table"); else if (GTK_WIDGET (entry) == GET_WIDGET ("template_entry")) help_box = GET_WIDGET ("template_help_table"); + if (help_box == NULL) + return; + if (gtk_widget_get_visible (help_box)) gtk_widget_hide (help_box); else @@ -399,7 +402,7 @@ (PREVIEW_SIZE + col_spacing * 2)); gtk_widget_realize (GET_WIDGET ("theme_iconview")); - default_theme = eel_gconf_get_string (PREF_CONTACT_SHEET_THEME, DEFAULT_CONTACT_SHEET_THEME); + default_theme = g_settings_get_string (data->settings, PREF_CONTACT_SHEET_THEME); model = GTK_TREE_MODEL (GET_WIDGET ("theme_liststore")); if (gtk_tree_model_get_iter_first (model, &iter)) { gboolean theme_selected = FALSE; @@ -696,6 +699,7 @@ data->browser = browser; data->file_list = _g_object_list_ref (file_list); data->builder = _gtk_builder_new_from_file ("contact-sheet.ui", "contact_sheet"); + data->settings = g_settings_new (GTHUMB_CONTACT_SHEET_SCHEMA); data->dialog = _gtk_builder_get_widget (data->builder, "contact_sheet_dialog"); gth_browser_set_dialog (browser, "contact_sheet", data->dialog); @@ -710,11 +714,11 @@ gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("header_entry")), g_file_info_get_edit_name (gth_browser_get_location_data (browser)->info)); - s_value = eel_gconf_get_string (PREF_CONTACT_SHEET_FOOTER, ""); + s_value = g_settings_get_string (data->settings, PREF_CONTACT_SHEET_FOOTER); gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("footer_entry")), s_value); g_free (s_value); - s_value = eel_gconf_get_path (PREF_CONTACT_SHEET_DESTINATION, NULL); + s_value = _g_settings_get_uri (data->settings, PREF_CONTACT_SHEET_DESTINATION); if (s_value == NULL) { GFile *location = gth_browser_get_location (data->browser); if (location != NULL) @@ -725,11 +729,11 @@ gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), s_value); g_free (s_value); - s_value = eel_gconf_get_path (PREF_CONTACT_SHEET_TEMPLATE, NULL); + s_value = _g_settings_get_uri (data->settings, PREF_CONTACT_SHEET_TEMPLATE); gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("template_entry")), s_value); g_free (s_value); - default_mime_type = eel_gconf_get_string (PREF_CONTACT_SHEET_MIME_TYPE, "image/jpeg"); + default_mime_type = g_settings_get_string (data->settings, PREF_CONTACT_SHEET_MIME_TYPE); active_index = 0; savers = gth_main_get_type_set ("pixbuf-saver"); for (i = 0; (savers != NULL) && (i < savers->len); i++) { @@ -753,19 +757,19 @@ gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("filetype_combobox")), active_index); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(GET_WIDGET("image_map_checkbutton")), eel_gconf_get_boolean (PREF_CONTACT_SHEET_HTML_IMAGE_MAP, FALSE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(GET_WIDGET("image_map_checkbutton")), g_settings_get_boolean (data->settings, PREF_CONTACT_SHEET_HTML_IMAGE_MAP)); load_themes (data); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (GET_WIDGET ("theme_liststore")), THEME_COLUMN_DISPLAY_NAME, GTK_SORT_ASCENDING); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("images_per_index_spinbutton")), eel_gconf_get_integer (PREF_CONTACT_SHEET_IMAGES_PER_PAGE, 25)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_index_checkbutton")), eel_gconf_get_boolean (PREF_CONTACT_SHEET_SINGLE_PAGE, FALSE)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("cols_spinbutton")), eel_gconf_get_integer (PREF_CONTACT_SHEET_COLUMNS, 5)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("same_size_checkbutton")), eel_gconf_get_boolean (PREF_CONTACT_SHEET_SAME_SIZE, FALSE)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("images_per_index_spinbutton")), g_settings_get_int (data->settings, PREF_CONTACT_SHEET_IMAGES_PER_PAGE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_index_checkbutton")), g_settings_get_boolean (data->settings, PREF_CONTACT_SHEET_SINGLE_PAGE)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("cols_spinbutton")), g_settings_get_int (data->settings, PREF_CONTACT_SHEET_COLUMNS)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("same_size_checkbutton")), g_settings_get_boolean (data->settings, PREF_CONTACT_SHEET_SAME_SIZE)); - default_sort_type = eel_gconf_get_string (PREF_CONTACT_SHEET_SORT_TYPE, "general::unsorted"); + default_sort_type = g_settings_get_string (data->settings, PREF_CONTACT_SHEET_SORT_TYPE); active_index = 0; sort_types = gth_main_get_all_sort_types (); for (i = 0, scan = sort_types; scan; scan = scan->next, i++) { @@ -785,7 +789,7 @@ g_free (default_sort_type); gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("sort_combobox")), active_index); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")), eel_gconf_get_boolean (PREF_CONTACT_SHEET_SORT_INVERSE, FALSE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")), g_settings_get_boolean (data->settings, PREF_CONTACT_SHEET_SORT_INVERSE)); for (i = 0; i < thumb_sizes; i++) { char *name; @@ -801,10 +805,10 @@ g_free (name); } - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnail_size_combobox")), get_idx_from_size (eel_gconf_get_integer (PREF_CONTACT_SHEET_THUMBNAIL_SIZE, 128))); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("squared_thumbnail_checkbutton")), eel_gconf_get_boolean (PREF_CONTACT_SHEET_SQUARED_THUMBNAIL, FALSE)); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnail_size_combobox")), get_idx_from_size (g_settings_get_int (data->settings, PREF_CONTACT_SHEET_THUMBNAIL_SIZE))); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("squared_thumbnail_checkbutton")), g_settings_get_boolean (data->settings, PREF_CONTACT_SHEET_SQUARED_THUMBNAIL)); - caption = eel_gconf_get_string (PREF_CONTACT_SHEET_THUMBNAIL_CAPTION, DEFAULT_CONTACT_SHEET_THUMBNAIL_CAPTION); + caption = g_settings_get_string (data->settings, PREF_CONTACT_SHEET_THUMBNAIL_CAPTION); gth_metadata_chooser_set_selection (GTH_METADATA_CHOOSER (data->thumbnail_caption_chooser), caption); g_free (caption); diff -Nru gthumb-2.14.3/extensions/contact_sheet/dlg-image-wall.c gthumb-3.0.0/extensions/contact_sheet/dlg-image-wall.c --- gthumb-2.14.3/extensions/contact_sheet/dlg-image-wall.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/dlg-image-wall.c 2012-02-19 15:01:31.000000000 +0000 @@ -47,6 +47,7 @@ typedef struct { GthBrowser *browser; + GSettings *settings; GList *file_list; GtkBuilder *builder; GtkWidget *dialog; @@ -75,6 +76,7 @@ { gth_browser_set_dialog (data->browser, "image_wall", NULL); _g_object_list_unref (data->file_list); + g_object_unref (data->settings); g_object_unref (data->builder); g_free (data); } @@ -111,11 +113,11 @@ s_value = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton"))); destination = g_file_new_for_uri (s_value); - eel_gconf_set_path (PREF_IMAGE_WALL_DESTINATION, s_value); + _g_settings_set_uri (data->settings, PREF_IMAGE_WALL_DESTINATION, s_value); g_free (s_value); template = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("template_entry"))); - eel_gconf_set_string (PREF_IMAGE_WALL_TEMPLATE, template); + g_settings_set_string (data->settings, PREF_IMAGE_WALL_TEMPLATE, template); mime_type = NULL; if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("filetype_combobox")), &iter)) { @@ -124,31 +126,31 @@ FILE_TYPE_COLUMN_MIME_TYPE, &mime_type, FILE_TYPE_COLUMN_DEFAULT_EXTENSION, &file_extension, -1); - eel_gconf_set_string (PREF_IMAGE_WALL_MIME_TYPE, mime_type); + g_settings_set_string (data->settings, PREF_IMAGE_WALL_MIME_TYPE, mime_type); } images_per_index = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("images_per_index_spinbutton"))); - eel_gconf_set_integer (PREF_IMAGE_WALL_IMAGES_PER_PAGE, images_per_index); + g_settings_set_int (data->settings, PREF_IMAGE_WALL_IMAGES_PER_PAGE, images_per_index); single_page = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_index_checkbutton"))); - eel_gconf_set_boolean (PREF_IMAGE_WALL_SINGLE_PAGE, single_page); + g_settings_set_boolean (data->settings, PREF_IMAGE_WALL_SINGLE_PAGE, single_page); columns = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("cols_spinbutton"))); - eel_gconf_set_integer (PREF_IMAGE_WALL_COLUMNS, columns); + g_settings_set_int (data->settings, PREF_IMAGE_WALL_COLUMNS, columns); if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("sort_combobox")), &iter)) { gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("sort_liststore")), &iter, SORT_TYPE_COLUMN_DATA, &sort_type, -1); - eel_gconf_set_string (PREF_IMAGE_WALL_SORT_TYPE, sort_type->name); + g_settings_set_string (data->settings, PREF_IMAGE_WALL_SORT_TYPE, sort_type->name); } sort_inverse = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton"))); - eel_gconf_set_boolean (PREF_IMAGE_WALL_SORT_INVERSE, sort_inverse); + g_settings_set_boolean (data->settings, PREF_IMAGE_WALL_SORT_INVERSE, sort_inverse); thumbnail_size = thumb_size[gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnail_size_combobox")))]; - eel_gconf_set_integer (PREF_IMAGE_WALL_THUMBNAIL_SIZE, thumbnail_size); + g_settings_set_int (data->settings, PREF_IMAGE_WALL_THUMBNAIL_SIZE, thumbnail_size); theme = gth_contact_sheet_theme_new (); theme->background_type = GTH_CONTACT_SHEET_BACKGROUND_TYPE_SOLID; @@ -203,11 +205,14 @@ gpointer user_data) { DialogData *data = user_data; - GtkWidget *help_box; + GtkWidget *help_box = NULL; if (GTK_WIDGET (entry) == GET_WIDGET ("template_entry")) help_box = GET_WIDGET ("template_help_table"); + if (help_box == NULL) + return; + if (gtk_widget_get_visible (help_box)) gtk_widget_hide (help_box); else @@ -238,6 +243,7 @@ data->browser = browser; data->file_list = _g_object_list_ref (file_list); data->builder = _gtk_builder_new_from_file ("image-wall.ui", "contact_sheet"); + data->settings = g_settings_new (GTHUMB_IMAGE_WALL_SCHEMA); data->dialog = _gtk_builder_get_widget (data->builder, "image_wall_dialog"); gth_browser_set_dialog (browser, "image_wall", data->dialog); @@ -245,7 +251,7 @@ /* Set widgets data. */ - s_value = eel_gconf_get_path (PREF_IMAGE_WALL_DESTINATION, NULL); + s_value = _g_settings_get_uri (data->settings, PREF_IMAGE_WALL_DESTINATION); if (s_value == NULL) { GFile *location = gth_browser_get_location (data->browser); if (location != NULL) @@ -256,11 +262,11 @@ gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), s_value); g_free (s_value); - s_value = eel_gconf_get_path (PREF_IMAGE_WALL_TEMPLATE, NULL); + s_value = _g_settings_get_uri (data->settings, PREF_IMAGE_WALL_TEMPLATE); gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("template_entry")), s_value); g_free (s_value); - default_mime_type = eel_gconf_get_string (PREF_IMAGE_WALL_MIME_TYPE, "image/jpeg"); + default_mime_type = g_settings_get_string (data->settings, PREF_IMAGE_WALL_MIME_TYPE); active_index = 0; savers = gth_main_get_type_set ("pixbuf-saver"); for (i = 0; (savers != NULL) && (i < savers->len); i++) { @@ -284,11 +290,14 @@ gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("filetype_combobox")), active_index); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("images_per_index_spinbutton")), eel_gconf_get_integer (PREF_IMAGE_WALL_IMAGES_PER_PAGE, 25)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_index_checkbutton")), eel_gconf_get_boolean (PREF_IMAGE_WALL_SINGLE_PAGE, FALSE)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("cols_spinbutton")), eel_gconf_get_integer (PREF_IMAGE_WALL_COLUMNS, 5)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("images_per_index_spinbutton")), + g_settings_get_int (data->settings, PREF_IMAGE_WALL_IMAGES_PER_PAGE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_index_checkbutton")), + g_settings_get_boolean (data->settings, PREF_IMAGE_WALL_SINGLE_PAGE)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("cols_spinbutton")), + g_settings_get_int (data->settings, PREF_IMAGE_WALL_COLUMNS)); - default_sort_type = eel_gconf_get_string (PREF_IMAGE_WALL_SORT_TYPE, "general::unsorted"); + default_sort_type = g_settings_get_string (data->settings, PREF_IMAGE_WALL_SORT_TYPE); active_index = 0; sort_types = gth_main_get_all_sort_types (); for (i = 0, scan = sort_types; scan; scan = scan->next, i++) { @@ -308,7 +317,8 @@ g_free (default_sort_type); gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("sort_combobox")), active_index); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")), eel_gconf_get_boolean (PREF_IMAGE_WALL_SORT_INVERSE, FALSE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")), + g_settings_get_boolean (data->settings, PREF_IMAGE_WALL_SORT_INVERSE)); for (i = 0; i < thumb_sizes; i++) { char *name; @@ -324,7 +334,8 @@ g_free (name); } - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnail_size_combobox")), get_idx_from_size (eel_gconf_get_integer (PREF_IMAGE_WALL_THUMBNAIL_SIZE, 128))); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnail_size_combobox")), + get_idx_from_size (g_settings_get_int (data->settings, PREF_IMAGE_WALL_THUMBNAIL_SIZE))); update_sensitivity (data); diff -Nru gthumb-2.14.3/extensions/contact_sheet/gth-contact-sheet-creator.c gthumb-3.0.0/extensions/contact_sheet/gth-contact-sheet-creator.c --- gthumb-2.14.3/extensions/contact_sheet/gth-contact-sheet-creator.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/gth-contact-sheet-creator.c 2012-02-19 15:01:31.000000000 +0000 @@ -30,7 +30,8 @@ #define DEFAULT_THUMB_SIZE 128 #define DEFAULT_FONT "Sans 12" -static GObjectClass *parent_class = NULL; + +G_DEFINE_TYPE (GthContactSheetCreator, gth_contact_sheet_creator, GTH_TYPE_TASK) typedef struct { @@ -544,8 +545,8 @@ static void paint_frame (GthContactSheetCreator *self, - GdkRectangle *frame_rect, - GdkRectangle *image_rect, + cairo_rectangle_int_t *frame_rect, + cairo_rectangle_int_t *image_rect, GthFileData *file_data) { gth_contact_sheet_theme_paint_frame (self->priv->theme, self->priv->cr, frame_rect, image_rect); @@ -589,7 +590,7 @@ static void paint_image (GthContactSheetCreator *self, - GdkRectangle *image_rect, + cairo_rectangle_int_t *image_rect, GdkPixbuf *image) { cairo_save (self->priv->cr); @@ -702,12 +703,12 @@ x = self->priv->theme->col_spacing; for (scan_row = first_item; scan_row != last_item; scan_row = scan_row->next) { - ItemData *row_item = scan_row->data; - int frame_width; - int frame_height; - GdkRectangle frame_rect; - int text_y; - int i; + ItemData *row_item = scan_row->data; + int frame_width; + int frame_height; + cairo_rectangle_int_t frame_rect; + int text_y; + int i; frame_width = self->priv->thumb_width + (self->priv->theme->frame_hpadding * 2); frame_height = self->priv->thumb_height + (self->priv->theme->frame_vpadding * 2); @@ -719,9 +720,9 @@ /* paint the thumbnail */ if (row_item->thumbnail != NULL) { - int thumbnail_width; - int thumbnail_height; - GdkRectangle image_rect; + int thumbnail_width; + int thumbnail_height; + cairo_rectangle_int_t image_rect; thumbnail_width = gdk_pixbuf_get_width (row_item->thumbnail); thumbnail_height = gdk_pixbuf_get_height (row_item->thumbnail); @@ -1048,7 +1049,7 @@ g_free (self->priv->header); _g_object_list_unref (self->priv->gfile_list); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_contact_sheet_creator_parent_class)->finalize (object); } @@ -1058,7 +1059,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthContactSheetCreatorPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -1107,34 +1107,6 @@ } -GType -gth_contact_sheet_creator_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthContactSheetCreatorClass), - NULL, - NULL, - (GClassInitFunc) gth_contact_sheet_creator_class_init, - NULL, - NULL, - sizeof (GthContactSheetCreator), - 0, - (GInstanceInitFunc) gth_contact_sheet_creator_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthContactSheetCreator", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_contact_sheet_creator_new (GthBrowser *browser, GList *file_list) diff -Nru gthumb-2.14.3/extensions/contact_sheet/gth-contact-sheet-theme.c gthumb-3.0.0/extensions/contact_sheet/gth-contact-sheet-theme.c --- gthumb-2.14.3/extensions/contact_sheet/gth-contact-sheet-theme.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/gth-contact-sheet-theme.c 2012-02-19 15:01:31.000000000 +0000 @@ -275,10 +275,10 @@ void -gth_contact_sheet_theme_paint_frame (GthContactSheetTheme *theme, - cairo_t *cr, - GdkRectangle *frame_rect, - GdkRectangle *image_rect) +gth_contact_sheet_theme_paint_frame (GthContactSheetTheme *theme, + cairo_t *cr, + cairo_rectangle_int_t *frame_rect, + cairo_rectangle_int_t *image_rect) { int width; @@ -487,10 +487,10 @@ static void paint_thumbnail (GthContactSheetTheme *theme, cairo_t *cr, - GdkRectangle *image_rect, + cairo_rectangle_int_t *image_rect, double font_scale) { - GdkRectangle frame_rect; + cairo_rectangle_int_t frame_rect; /* frame */ @@ -536,8 +536,8 @@ int width, int height) { - double font_scale; - GdkRectangle image_rect; + double font_scale; + cairo_rectangle_int_t image_rect; if (height < 200) font_scale = height / 200.0; diff -Nru gthumb-2.14.3/extensions/contact_sheet/gth-contact-sheet-theme-dialog.c gthumb-3.0.0/extensions/contact_sheet/gth-contact-sheet-theme-dialog.c --- gthumb-2.14.3/extensions/contact_sheet/gth-contact-sheet-theme-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/gth-contact-sheet-theme-dialog.c 2012-02-19 15:01:31.000000000 +0000 @@ -26,7 +26,7 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthContactSheetThemeDialog, gth_contact_sheet_theme_dialog, GTK_TYPE_DIALOG) struct _GthContactSheetThemeDialogPrivate { @@ -49,7 +49,7 @@ gth_contact_sheet_theme_unref (self->priv->theme); gth_contact_sheet_theme_list_free (self->priv->all_themes); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_contact_sheet_theme_dialog_parent_class)->finalize (object); } @@ -58,7 +58,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthContactSheetThemeDialogPrivate)); object_class = (GObjectClass*) klass; @@ -67,19 +66,16 @@ static gboolean -preview_area_expose_event_cb (GtkWidget *widget, - GdkEventExpose *event, - gpointer user_data) +preview_area_draw_cb (GtkWidget *widget, + cairo_t *cr, + gpointer user_data) { GthContactSheetThemeDialog *self = user_data; - cairo_t *cr; - cr = gdk_cairo_create (gtk_widget_get_window (widget)); gth_contact_sheet_theme_paint_preview (self->priv->theme, cr, gdk_window_get_width (gtk_widget_get_window (widget)), gdk_window_get_height (gtk_widget_get_window (widget))); - cairo_destroy (cr); return TRUE; } @@ -229,8 +225,8 @@ gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK); g_signal_connect (GET_WIDGET ("preview_area"), - "expose_event", - G_CALLBACK (preview_area_expose_event_cb), + "draw", + G_CALLBACK (preview_area_draw_cb), self); g_signal_connect_swapped (GET_WIDGET ("solid_color_radiobutton"), "toggled", @@ -311,34 +307,6 @@ } -GType -gth_contact_sheet_theme_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthContactSheetThemeDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_contact_sheet_theme_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthContactSheetThemeDialog), - 0, - (GInstanceInitFunc) gth_contact_sheet_theme_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthContactSheetThemeDialog", - &g_define_type_info, - 0); - } - - return type; -} - - GthContactSheetTheme * _gth_contact_sheet_theme_new_default (void) { diff -Nru gthumb-2.14.3/extensions/contact_sheet/gth-contact-sheet-theme.h gthumb-3.0.0/extensions/contact_sheet/gth-contact-sheet-theme.h --- gthumb-2.14.3/extensions/contact_sheet/gth-contact-sheet-theme.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/gth-contact-sheet-theme.h 2012-02-19 15:01:31.000000000 +0000 @@ -92,8 +92,8 @@ int height); void gth_contact_sheet_theme_paint_frame (GthContactSheetTheme *theme, cairo_t *cr, - GdkRectangle *frame_rect, - GdkRectangle *image_rect); + cairo_rectangle_int_t *frame_rect, + cairo_rectangle_int_t *image_rect); void gth_contact_sheet_theme_paint_preview (GthContactSheetTheme *theme, cairo_t *cr, int width, diff -Nru gthumb-2.14.3/extensions/contact_sheet/Makefile.am gthumb-3.0.0/extensions/contact_sheet/Makefile.am --- gthumb-2.14.3/extensions/contact_sheet/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/Makefile.am 2012-04-20 21:23:07.000000000 +0000 @@ -60,7 +60,10 @@ libcontact_sheet_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb -DCONTACT_SHEET_DATADIR=\"$(contact_sheet_datadir)\" libcontact_sheet_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libcontact_sheet_la_LIBADD = $(GTHUMB_LIBS) ../image_rotation/libimage_rotation.la ../export_tools/libexport_tools.la +libcontact_sheet_la_LIBADD = $(GTHUMB_LIBS) ../export_tools/libexport_tools.la +if ENABLE_JPEG_TOOLS +libcontact_sheet_la_LIBADD += ../image_rotation/libimage_rotation.la +endif libcontact_sheet_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) diff -Nru gthumb-2.14.3/extensions/contact_sheet/Makefile.in gthumb-3.0.0/extensions/contact_sheet/Makefile.in --- gthumb-2.14.3/extensions/contact_sheet/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,6 +52,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_JPEG_TOOLS_TRUE@am__append_1 = ../image_rotation/libimage_rotation.la subdir = extensions/contact_sheet DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -134,6 +152,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -213,10 +236,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -224,6 +245,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -263,6 +285,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -311,8 +335,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -343,6 +365,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -408,7 +431,8 @@ @RUN_IN_PLACE_TRUE@contact_sheet_datadir = $(abs_top_srcdir)/extensions/contact_sheet/data libcontact_sheet_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb -DCONTACT_SHEET_DATADIR=\"$(contact_sheet_datadir)\" libcontact_sheet_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libcontact_sheet_la_LIBADD = $(GTHUMB_LIBS) ../image_rotation/libimage_rotation.la ../export_tools/libexport_tools.la +libcontact_sheet_la_LIBADD = $(GTHUMB_LIBS) \ + ../export_tools/libexport_tools.la $(am__append_1) libcontact_sheet_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) @@ -454,7 +478,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -462,6 +485,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -593,8 +618,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -777,13 +805,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/contact_sheet/preferences.h gthumb-3.0.0/extensions/contact_sheet/preferences.h --- gthumb-2.14.3/extensions/contact_sheet/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/contact_sheet/preferences.h 2012-02-19 15:01:31.000000000 +0000 @@ -26,32 +26,41 @@ G_BEGIN_DECLS -#define PREF_CONTACT_SHEET_HEADER "/apps/gthumb/ext/contact_sheet/header" -#define PREF_CONTACT_SHEET_FOOTER "/apps/gthumb/ext/contact_sheet/footer" -#define PREF_CONTACT_SHEET_DESTINATION "/apps/gthumb/ext/contact_sheet/destination" -#define PREF_CONTACT_SHEET_TEMPLATE "/apps/gthumb/ext/contact_sheet/template" -#define PREF_CONTACT_SHEET_MIME_TYPE "/apps/gthumb/ext/contact_sheet/mime_type" -#define PREF_CONTACT_SHEET_HTML_IMAGE_MAP "/apps/gthumb/ext/contact_sheet/html_image_map" -#define PREF_CONTACT_SHEET_THEME "/apps/gthumb/ext/contact_sheet/theme" -#define PREF_CONTACT_SHEET_IMAGES_PER_PAGE "/apps/gthumb/ext/contact_sheet/images_per_page" -#define PREF_CONTACT_SHEET_SINGLE_PAGE "/apps/gthumb/ext/contact_sheet/single_page" -#define PREF_CONTACT_SHEET_COLUMNS "/apps/gthumb/ext/contact_sheet/columns" -#define PREF_CONTACT_SHEET_SORT_TYPE "/apps/gthumb/ext/contact_sheet/sort_type" -#define PREF_CONTACT_SHEET_SORT_INVERSE "/apps/gthumb/ext/contact_sheet/sort_inverse" -#define PREF_CONTACT_SHEET_SAME_SIZE "/apps/gthumb/ext/contact_sheet/same_size" -#define PREF_CONTACT_SHEET_THUMBNAIL_SIZE "/apps/gthumb/ext/contact_sheet/thumbnail_size" -#define PREF_CONTACT_SHEET_SQUARED_THUMBNAIL "/apps/gthumb/ext/contact_sheet/squared_thumbnail" -#define PREF_CONTACT_SHEET_THUMBNAIL_CAPTION "/apps/gthumb/ext/contact_sheet/thumbnail_caption" - -#define PREF_IMAGE_WALL_DESTINATION "/apps/gthumb/ext/image_wall/destination" -#define PREF_IMAGE_WALL_TEMPLATE "/apps/gthumb/ext/image_wall/template" -#define PREF_IMAGE_WALL_MIME_TYPE "/apps/gthumb/ext/image_wall/mime_type" -#define PREF_IMAGE_WALL_IMAGES_PER_PAGE "/apps/gthumb/ext/image_wall/images_per_page" -#define PREF_IMAGE_WALL_SINGLE_PAGE "/apps/gthumb/ext/image_wall/single_page" -#define PREF_IMAGE_WALL_COLUMNS "/apps/gthumb/ext/image_wall/columns" -#define PREF_IMAGE_WALL_SORT_TYPE "/apps/gthumb/ext/image_wall/sort_type" -#define PREF_IMAGE_WALL_SORT_INVERSE "/apps/gthumb/ext/image_wall/sort_inverse" -#define PREF_IMAGE_WALL_THUMBNAIL_SIZE "/apps/gthumb/ext/image_wall/thumbnail_size" +/* schemas */ + +#define GTHUMB_CONTACT_SHEET_SCHEMA GTHUMB_SCHEMA ".contact-sheet.contact-sheet" +#define GTHUMB_IMAGE_WALL_SCHEMA GTHUMB_SCHEMA ".contact-sheet.image-wall" + +/* keys: contact sheet */ + +#define PREF_CONTACT_SHEET_HEADER "header" +#define PREF_CONTACT_SHEET_FOOTER "footer" +#define PREF_CONTACT_SHEET_DESTINATION "destination" +#define PREF_CONTACT_SHEET_TEMPLATE "template" +#define PREF_CONTACT_SHEET_MIME_TYPE "mime-type" +#define PREF_CONTACT_SHEET_HTML_IMAGE_MAP "html-image-map" +#define PREF_CONTACT_SHEET_THEME "theme" +#define PREF_CONTACT_SHEET_IMAGES_PER_PAGE "images-per-page" +#define PREF_CONTACT_SHEET_SINGLE_PAGE "single-page" +#define PREF_CONTACT_SHEET_COLUMNS "columns" +#define PREF_CONTACT_SHEET_SORT_TYPE "sort-type" +#define PREF_CONTACT_SHEET_SORT_INVERSE "sort-inverse" +#define PREF_CONTACT_SHEET_SAME_SIZE "same-size" +#define PREF_CONTACT_SHEET_THUMBNAIL_SIZE "thumbnail-size" +#define PREF_CONTACT_SHEET_SQUARED_THUMBNAIL "squared-thumbnail" +#define PREF_CONTACT_SHEET_THUMBNAIL_CAPTION "thumbnail-caption" + +/* keys: image wall */ + +#define PREF_IMAGE_WALL_DESTINATION "destination" +#define PREF_IMAGE_WALL_TEMPLATE "template" +#define PREF_IMAGE_WALL_MIME_TYPE "mime-type" +#define PREF_IMAGE_WALL_IMAGES_PER_PAGE "images-per-page" +#define PREF_IMAGE_WALL_SINGLE_PAGE "single-page" +#define PREF_IMAGE_WALL_COLUMNS "columns" +#define PREF_IMAGE_WALL_SORT_TYPE "sort-type" +#define PREF_IMAGE_WALL_SORT_INVERSE "sort-inverse" +#define PREF_IMAGE_WALL_THUMBNAIL_SIZE "thumbnail-size" G_END_DECLS diff -Nru gthumb-2.14.3/extensions/convert_format/convert_format.extension.in.in gthumb-3.0.0/extensions/convert_format/convert_format.extension.in.in --- gthumb-2.14.3/extensions/convert_format/convert_format.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/convert_format/convert_format.extension.in.in 2012-04-21 09:26:32.000000000 +0000 @@ -9,3 +9,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/convert_format/data/gthumb_convert_format.schemas.in gthumb-3.0.0/extensions/convert_format/data/gthumb_convert_format.schemas.in --- gthumb-2.14.3/extensions/convert_format/data/gthumb_convert_format.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/convert_format/data/gthumb_convert_format.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/convert_format/mime_type - /apps/gthumb/ext/convert_format/mime_type - gthumb - string - image/jpeg - - - - - - - - diff -Nru gthumb-2.14.3/extensions/convert_format/data/Makefile.am gthumb-3.0.0/extensions/convert_format/data/Makefile.am --- gthumb-2.14.3/extensions/convert_format/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/convert_format/data/Makefile.am 2012-02-19 15:01:31.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_convert_format.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/convert_format/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/convert_format/data/Makefile.in gthumb-3.0.0/extensions/convert_format/data/Makefile.in --- gthumb-2.14.3/extensions/convert_format/data/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/convert_format/data/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_convert_format.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/convert_format/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/convert_format/data/ui/convert-format.ui gthumb-3.0.0/extensions/convert_format/data/ui/convert-format.ui --- gthumb-2.14.3/extensions/convert_format/data/ui/convert-format.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/convert_format/data/ui/convert-format.ui 2012-02-19 15:01:31.000000000 +0000 @@ -1,28 +1,97 @@ - + - + False 6 Convert Format False dialog - + True + False + vertical 12 + + + True + False + end + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 0 + True + + + + + gtk-cancel + False + True + True + True + False + False + True + + + False + False + 1 + + + + + gtk-execute + False + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 6 12 True + False 6 True + False 0 New format @@ -38,10 +107,12 @@ True + False 12 True + False mime_type_liststore @@ -59,22 +130,27 @@ + True + True 1 False + True 0 True + False 6 True + False 0 Destination @@ -90,33 +166,43 @@ True + False 12 True + False 6 True - False + False select-folder + False False Choose destination folder + True + True 0 _Use the original image folder + False True True False + False True + 0 True + True + True 1 @@ -124,12 +210,15 @@ + True + True 1 False + True 1 @@ -140,62 +229,6 @@ 1 - - - True - end - - - gtk-help - True - True - True - False - True - - - False - False - 0 - True - - - - - gtk-cancel - True - True - True - False - True - - - False - False - 1 - - - - - gtk-execute - True - True - True - True - - - False - False - 2 - - - - - False - end - 0 - - @@ -204,10 +237,6 @@ ok_button - - True - gtk-ok - @@ -218,4 +247,9 @@ + + True + False + gtk-ok + diff -Nru gthumb-2.14.3/extensions/convert_format/data/ui/Makefile.in gthumb-3.0.0/extensions/convert_format/data/ui/Makefile.in --- gthumb-2.14.3/extensions/convert_format/data/ui/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/convert_format/data/ui/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/convert_format/dlg-convert-format.c gthumb-3.0.0/extensions/convert_format/dlg-convert-format.c --- gthumb-2.14.3/extensions/convert_format/dlg-convert-format.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/convert_format/dlg-convert-format.c 2012-02-19 15:01:31.000000000 +0000 @@ -39,6 +39,7 @@ typedef struct { GthBrowser *browser; + GSettings *settings; GList *file_list; GtkBuilder *builder; GtkWidget *dialog; @@ -52,6 +53,7 @@ { gth_browser_set_dialog (data->browser, "convert_format", NULL); + g_object_unref (data->settings); g_object_unref (data->builder); _g_object_list_unref (data->file_list); g_free (data); @@ -86,7 +88,7 @@ gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("mime_type_liststore")), &iter, MIME_TYPE_COLUMN_TYPE, &mime_type, -1); - eel_gconf_set_string (PREF_CONVERT_FORMAT_MIME_TYPE, mime_type); + g_settings_set_string (data->settings, PREF_CONVERT_FORMAT_MIME_TYPE, mime_type); convert_task = gth_pixbuf_task_new (_("Converting images"), TRUE, @@ -144,6 +146,7 @@ data = g_new0 (DialogData, 1); data->browser = browser; data->builder = _gtk_builder_new_from_file ("convert-format.ui", "convert_format"); + data->settings = g_settings_new (GTHUMB_CONVERT_FORMAT_SCHEMA); data->file_list = gth_file_data_list_dup (file_list); data->use_destination = TRUE; @@ -162,7 +165,7 @@ GtkListStore *list_store; int i; - default_mime_type = eel_gconf_get_string (PREF_CONVERT_FORMAT_MIME_TYPE, DEFAULT_MIME_TYPE); + default_mime_type = g_settings_get_string (data->settings, PREF_CONVERT_FORMAT_MIME_TYPE); icon_cache = gth_icon_cache_new_for_widget (data->dialog, GTK_ICON_SIZE_MENU); list_store = (GtkListStore *) GET_WIDGET ("mime_type_liststore"); for (i = 0; i < savers->len; i++) { diff -Nru gthumb-2.14.3/extensions/convert_format/Makefile.in gthumb-3.0.0/extensions/convert_format/Makefile.in --- gthumb-2.14.3/extensions/convert_format/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/convert_format/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -127,6 +144,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -206,10 +228,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -217,6 +237,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -256,6 +277,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -304,8 +327,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -336,6 +357,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -424,7 +446,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -432,6 +453,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -523,8 +546,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -707,13 +733,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/convert_format/preferences.h gthumb-3.0.0/extensions/convert_format/preferences.h --- gthumb-2.14.3/extensions/convert_format/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/convert_format/preferences.h 2012-02-19 15:01:31.000000000 +0000 @@ -26,7 +26,13 @@ G_BEGIN_DECLS -#define PREF_CONVERT_FORMAT_MIME_TYPE "/apps/gthumb/ext/convert_format/mime_type" +/* schema */ + +#define GTHUMB_CONVERT_FORMAT_SCHEMA GTHUMB_SCHEMA ".convert-format" + +/* keys */ + +#define PREF_CONVERT_FORMAT_MIME_TYPE "mime-type" G_END_DECLS diff -Nru gthumb-2.14.3/extensions/desktop_background/actions.c gthumb-3.0.0/extensions/desktop_background/actions.c --- gthumb-2.14.3/extensions/desktop_background/actions.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/desktop_background/actions.c 2012-02-19 15:01:31.000000000 +0000 @@ -26,9 +26,6 @@ #include -#ifdef HAVE_GNOME_3 - - #define DESKTOP_BACKGROUND_PROPERTIES_COMMAND "gnome-control-center background" #define DESKTOP_BACKGROUND_SCHEMA "org.gnome.desktop.background" #define DESKTOP_BACKGROUND_KEY "picture-uri" @@ -71,44 +68,6 @@ } -#else /* ! HAVE_GNOME_DESKTOP_3 */ - - -#define DESKTOP_BACKGROUND_PROPERTIES_COMMAND "gnome-appearance-properties --show-page=background" - - -static GFile * -get_current_wallpaper (void) -{ - GFile *file = NULL; - char *path; - - path = eel_gconf_get_string ("/desktop/gnome/background/picture_filename", NULL); - if (path != NULL) { - file = g_file_new_for_path (path); - g_free (path); - } - - return file; -} - - -static void -set_current_wallpaper_file (GFile *file) -{ - char *path; - - path = g_file_get_path (file); - if (path != NULL) - eel_gconf_set_string ("/desktop/gnome/background/picture_filename", path); - - g_free (path); -} - - -#endif - - typedef struct { GthBrowser *browser; GFile *old_file; diff -Nru gthumb-2.14.3/extensions/desktop_background/desktop_background.extension.in.in gthumb-3.0.0/extensions/desktop_background/desktop_background.extension.in.in --- gthumb-2.14.3/extensions/desktop_background/desktop_background.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/desktop_background/desktop_background.extension.in.in 2012-04-21 09:26:27.000000000 +0000 @@ -10,4 +10,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% After=image_viewer diff -Nru gthumb-2.14.3/extensions/desktop_background/Makefile.in gthumb-3.0.0/extensions/desktop_background/Makefile.in --- gthumb-2.14.3/extensions/desktop_background/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/desktop_background/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -121,6 +138,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libdesktop_background_la_SOURCES) DIST_SOURCES = $(libdesktop_background_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) ETAGS = etags CTAGS = ctags @@ -169,10 +191,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -180,6 +200,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -219,6 +240,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -267,8 +290,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -299,6 +320,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -384,7 +406,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -392,6 +413,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -475,8 +498,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/edit_metadata/actions.c gthumb-3.0.0/extensions/edit_metadata/actions.c --- gthumb-2.14.3/extensions/edit_metadata/actions.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/actions.c 2012-02-19 15:01:31.000000000 +0000 @@ -24,90 +24,27 @@ #include #include "dlg-edit-metadata.h" #include "gth-delete-metadata-task.h" -#include "gth-tag-chooser-dialog.h" -#include "gth-tag-task.h" +#include "gth-edit-comment-dialog.h" +#include "gth-edit-tags-dialog.h" void -gth_browser_activate_action_edit_metadata (GtkAction *action, - GthBrowser *browser) +gth_browser_activate_action_edit_comment (GtkAction *action, + GthBrowser *browser) { - GList *items; - GList *file_data_list; - GList *file_list; - - items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); - file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); - file_list = gth_file_data_list_to_file_list (file_data_list); - dlg_edit_metadata (browser, file_list); - - _g_object_list_unref (file_list); - _g_object_list_unref (file_data_list); - _gtk_tree_path_list_free (items); -} - - -static void -tag_chooser_dialog_response_cb (GtkDialog *dialog, - int response_id, - gpointer user_data) -{ - GthBrowser *browser = user_data; - - switch (response_id) { - case GTK_RESPONSE_HELP: - show_help_dialog (GTK_WINDOW (browser), "assign-tags"); - break; - - case GTK_RESPONSE_OK: - { - GList *items; - GList *file_data_list; - GList *file_list; - char **tags; - GthTask *task; - - items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); - file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); - file_list = gth_file_data_list_to_file_list (file_data_list); - tags = gth_tag_chooser_dialog_get_tags (GTH_TAG_CHOOSER_DIALOG (dialog)); - task = gth_tag_task_new (file_list, tags); - gth_browser_exec_task (browser, task, FALSE); - gtk_widget_destroy (GTK_WIDGET (dialog)); - - g_object_unref (task); - g_strfreev (tags); - _g_object_list_unref (file_list); - _g_object_list_unref (file_data_list); - _gtk_tree_path_list_free (items); - } - break; - - case GTK_RESPONSE_DELETE_EVENT: - case GTK_RESPONSE_CANCEL: - gtk_widget_destroy (GTK_WIDGET (dialog)); - break; - } + dlg_edit_metadata (browser, + GTH_TYPE_EDIT_COMMENT_DIALOG, + "edit-comment-dialog"); } void -gth_browser_activate_action_edit_tag_files (GtkAction *action, - GthBrowser *browser) +gth_browser_activate_action_edit_tags (GtkAction *action, + GthBrowser *browser) { - GtkWidget *dialog; - - dialog = gth_tag_chooser_dialog_new (); - g_signal_connect (dialog, - "delete-event", - G_CALLBACK (gtk_true), - NULL); - g_signal_connect (dialog, - "response", - G_CALLBACK (tag_chooser_dialog_response_cb), - browser); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (browser)); - gtk_window_present (GTK_WINDOW (dialog)); + dlg_edit_metadata (browser, + GTH_TYPE_EDIT_TAGS_DIALOG, + "edit-tags-dialog"); } diff -Nru gthumb-2.14.3/extensions/edit_metadata/actions.h gthumb-3.0.0/extensions/edit_metadata/actions.h --- gthumb-2.14.3/extensions/edit_metadata/actions.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/actions.h 2012-02-19 15:01:31.000000000 +0000 @@ -26,8 +26,8 @@ #define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data); -DEFINE_ACTION(gth_browser_activate_action_edit_metadata) -DEFINE_ACTION(gth_browser_activate_action_edit_tag_files) +DEFINE_ACTION(gth_browser_activate_action_edit_comment) +DEFINE_ACTION(gth_browser_activate_action_edit_tags) DEFINE_ACTION(gth_browser_activate_action_tool_delete_metadata) #endif /* ACTIONS_H */ diff -Nru gthumb-2.14.3/extensions/edit_metadata/callbacks.c gthumb-3.0.0/extensions/edit_metadata/callbacks.c --- gthumb-2.14.3/extensions/edit_metadata/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/callbacks.c 2012-03-21 10:44:32.000000000 +0000 @@ -41,6 +41,11 @@ " " " " " " +" " +" " +" " +" " +" " " " " " " " @@ -53,19 +58,13 @@ " " " " " " -" " -" " -" " -" " +" " " " " " " " " " " " -" " -" " -" " -" " +" " " " " " " " @@ -82,16 +81,6 @@ ""; -static const char *browser_ui_info = -"" -" " -" " -" " -" " -" " -""; - - static const char *viewer_ui_info = "" " " @@ -104,22 +93,25 @@ ""; -static GtkActionEntry edit_metadata_action_entries[] = { +static GthActionEntryExt edit_metadata_action_entries[] = { { "Edit_QuickTag", "tag", N_("T_ags") }, { "Edit_Metadata", GTK_STOCK_EDIT, N_("Comment"), "M", N_("Edit the comment and other information of the selected files"), - G_CALLBACK (gth_browser_activate_action_edit_metadata) }, + GTH_ACTION_FLAG_IS_IMPORTANT, + G_CALLBACK (gth_browser_activate_action_edit_comment) }, - { "Edit_QuickTagOther", NULL, - N_("Other..."), NULL, - N_("Choose another tag"), - G_CALLBACK (gth_browser_activate_action_edit_tag_files) }, + { "Edit_Tags", "tag", + N_("Tags"), NULL, + N_("Set the tags of the selected files"), + GTH_ACTION_FLAG_NONE, + G_CALLBACK (gth_browser_activate_action_edit_tags) }, { "Tool_DeleteMetadata", NULL, N_("Delete Metadata"), NULL, N_("Delete the comment and the embedded metadata of the selected files"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_tool_delete_metadata) } }; @@ -127,32 +119,17 @@ typedef struct { GthBrowser *browser; GtkActionGroup *actions; - guint browser_ui_merge_id; guint viewer_ui_merge_id; - gboolean tag_menu_loaded; - guint monitor_events; } BrowserData; static void browser_data_free (BrowserData *data) { - if (data->monitor_events != 0) { - g_signal_handler_disconnect (gth_main_get_default_monitor (), data->monitor_events); - data->monitor_events = 0; - } g_free (data); } -static void -monitor_tags_changed_cb (GthMonitor *monitor, - BrowserData *data) -{ - data->tag_menu_loaded = FALSE; -} - - void edit_metadata__gth_browser_construct_cb (GthBrowser *browser) { @@ -166,10 +143,10 @@ data->actions = gtk_action_group_new ("Edit Metadata Actions"); gtk_action_group_set_translation_domain (data->actions, NULL); - gtk_action_group_add_actions (data->actions, - edit_metadata_action_entries, - G_N_ELEMENTS (edit_metadata_action_entries), - browser); + _gtk_action_group_add_actions_with_flags (data->actions, + edit_metadata_action_entries, + G_N_ELEMENTS (edit_metadata_action_entries), + browser); gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->actions, 0); if (! gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), fixed_ui_info, -1, &error)) { @@ -182,13 +159,6 @@ g_error_free (error); } - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/Fullscreen_ToolBar/Edit_Actions/Edit_Metadata")), TRUE); - - data->monitor_events = g_signal_connect (gth_main_get_default_monitor (), - "tags-changed", - G_CALLBACK (monitor_tags_changed_cb), - data); - g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } @@ -208,21 +178,9 @@ gtk_ui_manager_remove_ui (gth_browser_get_ui_manager (browser), data->viewer_ui_merge_id); data->viewer_ui_merge_id = 0; } - if (data->browser_ui_merge_id != 0) - return; - data->browser_ui_merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), browser_ui_info, -1, &error); - if (data->browser_ui_merge_id == 0) { - g_warning ("ui building failed: %s", error->message); - g_clear_error (&error); - } - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ToolBar/Edit_Actions/Edit_Metadata")), TRUE); break; case GTH_BROWSER_PAGE_VIEWER: - if (data->browser_ui_merge_id != 0) { - gtk_ui_manager_remove_ui (gth_browser_get_ui_manager (browser), data->browser_ui_merge_id); - data->browser_ui_merge_id = 0; - } if (data->viewer_ui_merge_id != 0) return; data->viewer_ui_merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), viewer_ui_info, -1, &error); @@ -230,7 +188,6 @@ g_warning ("ui building failed: %s", error->message); g_clear_error (&error); } - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ViewerToolBar/Edit_Actions/Edit_Metadata")), TRUE); break; default: @@ -257,120 +214,6 @@ } -static void -tag_item_activate_cb (GtkMenuItem *menuitem, - gpointer user_data) -{ - GthBrowser *browser = user_data; - GList *items; - GList *file_data_list; - GList *file_list; - char *tag; - char **tags; - GthTask *task; - - if (gtk_menu_item_get_submenu (menuitem) != NULL) - return; - - items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); - file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); - file_list = gth_file_data_list_to_file_list (file_data_list); - - tag = g_object_get_data (G_OBJECT (menuitem), "tag"); - tags = g_new0 (char *, 2); - tags[0] = g_strdup (tag); - tags[1] = NULL; - - task = gth_tag_task_new (file_list, tags); - gth_browser_exec_task (browser, task, FALSE); - - g_object_unref (task); - g_strfreev (tags); - _g_object_list_unref (file_list); - _g_object_list_unref (file_data_list); - _gtk_tree_path_list_free (items); -} - - -static void -insert_tag_menu_item (BrowserData *data, - GtkWidget *menu, - const char *tag, - int pos) -{ - GtkWidget *item; - GtkWidget *image; - - item = gtk_image_menu_item_new_with_label (tag); - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE); - - image = gtk_image_new_from_icon_name ("tag", GTK_ICON_SIZE_MENU); - gtk_widget_show (image); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image); - gtk_widget_show (item); - gtk_menu_shell_insert (GTK_MENU_SHELL (menu), item, pos); - g_object_set_data_full (G_OBJECT (item), "tag", g_strdup (tag), g_free); - g_signal_connect (item, "activate", G_CALLBACK (tag_item_activate_cb), data->browser); -} - - -static void -update_tag_menu (BrowserData *data) -{ - GtkWidget *list_menu; - GtkWidget *file_menu; - GtkWidget *separator; - char **tags; - int i; - - list_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (data->browser), "/FileListPopup/File_LastActions/Edit_QuickTag"))); - separator = gtk_ui_manager_get_widget (gth_browser_get_ui_manager (data->browser), "/FileListPopup/File_LastActions/Edit_QuickTag/TagListSeparator"); - _gtk_container_remove_children (GTK_CONTAINER (list_menu), NULL, separator); - - file_menu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (data->browser), "/FilePopup/File_LastActions/Edit_QuickTag"))); - separator = gtk_ui_manager_get_widget (gth_browser_get_ui_manager (data->browser), "/FilePopup/File_LastActions/Edit_QuickTag/TagListSeparator"); - _gtk_container_remove_children (GTK_CONTAINER (file_menu), NULL, separator); - - tags = g_strdupv (gth_tags_file_get_tags (gth_main_get_default_tag_file ())); - for (i = 0; tags[i] != NULL; i++) { - insert_tag_menu_item (data, list_menu, tags[i], i); - insert_tag_menu_item (data, file_menu, tags[i], i); - } - - g_strfreev (tags); -} - - -void -edit_metadata__gth_browser_file_list_popup_before_cb (GthBrowser *browser) -{ - BrowserData *data; - - data = g_object_get_data (G_OBJECT (browser), BROWSER_DATA_KEY); - g_return_if_fail (data != NULL); - - if (! data->tag_menu_loaded) { - data->tag_menu_loaded = TRUE; - update_tag_menu (data); - } -} - - -void -edit_metadata__gth_browser_file_popup_before_cb (GthBrowser *browser) -{ - BrowserData *data; - - data = g_object_get_data (G_OBJECT (browser), BROWSER_DATA_KEY); - g_return_if_fail (data != NULL); - - if (! data->tag_menu_loaded) { - data->tag_menu_loaded = TRUE; - update_tag_menu (data); - } -} - - gpointer edit_metadata__gth_browser_file_list_key_press_cb (GthBrowser *browser, GdkEventKey *event) @@ -383,12 +226,16 @@ return NULL; switch (gdk_keyval_to_lower (event->keyval)) { - case GDK_c: - gth_browser_activate_action_edit_metadata (NULL, browser); + case GDK_KEY_c: + gth_browser_activate_action_edit_comment (NULL, browser); + result = GINT_TO_POINTER (1); + break; + + case GDK_KEY_t: + gth_browser_activate_action_edit_tags (NULL, browser); result = GINT_TO_POINTER (1); break; } return result; } - diff -Nru gthumb-2.14.3/extensions/edit_metadata/callbacks.h gthumb-3.0.0/extensions/edit_metadata/callbacks.h --- gthumb-2.14.3/extensions/edit_metadata/callbacks.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/callbacks.h 2012-02-19 15:01:32.000000000 +0000 @@ -27,8 +27,6 @@ void edit_metadata__gth_browser_construct_cb (GthBrowser *browser); void edit_metadata__gth_browser_set_current_page_cb (GthBrowser *browser); void edit_metadata__gth_browser_update_sensitivity_cb (GthBrowser *browser); -void edit_metadata__gth_browser_file_list_popup_before_cb (GthBrowser *browser); -void edit_metadata__gth_browser_file_popup_before_cb (GthBrowser *browser); gpointer edit_metadata__gth_browser_file_list_key_press_cb (GthBrowser *browser, GdkEventKey *event); diff -Nru gthumb-2.14.3/extensions/edit_metadata/data/Makefile.in gthumb-3.0.0/extensions/edit_metadata/data/Makefile.in --- gthumb-2.14.3/extensions/edit_metadata/data/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/data/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/edit_metadata/data/ui/edit-comment-page.ui gthumb-3.0.0/extensions/edit_metadata/data/ui/edit-comment-page.ui --- gthumb-2.14.3/extensions/edit_metadata/data/ui/edit-comment-page.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/data/ui/edit-comment-page.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,9 +1,9 @@ - + - True + False 6 2 6 @@ -11,6 +11,7 @@ True + False 0 0 D_escription: @@ -19,11 +20,13 @@ GTK_FILL + GTK_FILL True + False 0 _Date: True @@ -39,7 +42,7 @@ True True - + True @@ -56,8 +59,6 @@ 160 True True - automatic - automatic in @@ -70,12 +71,12 @@ 1 2 - GTK_FILL True + False 0 _Place: True @@ -91,7 +92,7 @@ True - vertical + False 6 @@ -108,10 +109,12 @@ True + False 2 True + False 0 0 T_ags: @@ -129,28 +132,34 @@ True + False 6 True + False + True + True 0 True - vertical + False 6 + True + True 1 @@ -166,15 +175,17 @@ True + False True True - + rating_adjustment False + True 0 @@ -190,6 +201,7 @@ True + False 0 0.60000002384185791 _Rating: @@ -199,6 +211,7 @@ 5 6 + GTK_FILL GTK_FILL @@ -206,7 +219,7 @@ True True - + True @@ -220,6 +233,7 @@ True + False 0 0.60000002384185791 _Title: @@ -229,6 +243,7 @@ 1 2 + GTK_FILL GTK_FILL diff -Nru gthumb-2.14.3/extensions/edit_metadata/data/ui/Makefile.in gthumb-3.0.0/extensions/edit_metadata/data/ui/Makefile.in --- gthumb-2.14.3/extensions/edit_metadata/data/ui/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/data/ui/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/edit_metadata/data/ui/tag-chooser.ui gthumb-3.0.0/extensions/edit_metadata/data/ui/tag-chooser.ui --- gthumb-2.14.3/extensions/edit_metadata/data/ui/tag-chooser.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/data/ui/tag-chooser.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,131 +1,46 @@ - + - - - - - - - - - True - vertical + False 6 True + False 0 T_ags: True - tags_treeview False + True 0 - + True - 12 - - - 250 - 300 - True - True - automatic - automatic - etched-in - - - True - True - tags_liststore - False - - - - - - 1 - - - - - - - column - 1 - - - tag - - - - - True - - - 0 - - - - - - - - - 0 - - + False + vertical - - True - vertical - 6 - start - - - gtk-new - True - True - True - True - - - False - False - 0 - - - - - gtk-remove - True - True - True - True - - - False - False - 1 - - - - - False - 1 - + + True + True 1 + + + + + + + + diff -Nru gthumb-2.14.3/extensions/edit_metadata/dlg-edit-metadata.c gthumb-3.0.0/extensions/edit_metadata/dlg-edit-metadata.c --- gthumb-2.14.3/extensions/edit_metadata/dlg-edit-metadata.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/dlg-edit-metadata.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,30 +26,87 @@ #include "gth-edit-metadata-dialog.h" +#define UPDATE_SELECTION_DELAY 300 + + typedef struct { + int ref; GthBrowser *browser; GtkWidget *dialog; - GList *files; /* GFile list */ + char *dialog_name; GList *file_list; /* GthFileData list */ GList *parents; + gboolean never_shown; + gboolean close_dialog; + GthTask *loader; + gulong file_selection_changed_event; + guint update_selectection_event; } DialogData; +static DialogData * +dialog_data_ref (DialogData *data) +{ + g_atomic_int_inc (&data->ref); + return data; +} + + static void -destroy_cb (GtkWidget *widget, - DialogData *data) +cancel_file_list_loading (DialogData *data) { + if (data->loader == NULL) + return; + gth_task_cancel (data->loader); + g_object_unref (data->loader); + data->loader = NULL; +} + + +static void +dialog_data_unref (DialogData *data) +{ + if (! g_atomic_int_dec_and_test (&data->ref)) + return; + + if (data->file_selection_changed_event != 0) { + g_signal_handler_disconnect (gth_browser_get_file_list_view (data->browser), + data->file_selection_changed_event); + data->file_selection_changed_event = 0; + } + if (data->update_selectection_event != 0) { + g_source_remove (data->update_selectection_event); + data->update_selectection_event = 0; + } + cancel_file_list_loading (data); + + gth_browser_set_dialog (data->browser, data->dialog_name, NULL); + gtk_widget_destroy (data->dialog); + + g_free (data->dialog_name); _g_object_list_unref (data->file_list); - _g_object_list_unref (data->files); _g_object_list_unref (data->parents); g_free (data); } static void -save_file_data_task_completed_cb (GthTask *task, - GError *error, - gpointer user_data) +close_dialog (DialogData *data) +{ + if (data->file_selection_changed_event != 0) { + g_signal_handler_disconnect (gth_browser_get_file_list_view (data->browser), + data->file_selection_changed_event); + data->file_selection_changed_event = 0; + } + gtk_widget_hide (data->dialog); + dialog_data_unref (data); +} + + +static void +saver_completed_cb (GthTask *task, + GError *error, + gpointer user_data) { DialogData *data = user_data; GthMonitor *monitor; @@ -60,28 +117,25 @@ gth_monitor_resume (monitor, (GFile *) scan->data); if (error != NULL) { - _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->dialog), _("Could not save the file metadata"), error); - return; + if (! g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->dialog), _("Could not save the file metadata"), error); } + else { + for (scan = data->file_list; scan; scan = scan->next) { + GthFileData *file_data = scan->data; + GList *files; - for (scan = data->file_list; scan; scan = scan->next) { - GthFileData *file_data = scan->data; - GFile *parent; - GList *files; - - parent = g_file_get_parent (file_data->file); - if (G_UNLIKELY (parent == NULL)) - continue; + files = g_list_prepend (NULL, g_object_ref (file_data->file)); + gth_monitor_metadata_changed (monitor, file_data); - files = g_list_prepend (NULL, g_object_ref (file_data->file)); - /*gth_monitor_folder_changed (monitor, parent, files, GTH_MONITOR_EVENT_CHANGED);*/ - gth_monitor_metadata_changed (monitor, file_data); - - _g_object_list_unref (files); - g_object_unref (parent); + _g_object_list_unref (files); + } } - gtk_widget_destroy (GTK_WIDGET (data->dialog)); + if (data->close_dialog) + close_dialog (data); + + dialog_data_unref (data); } @@ -96,11 +150,22 @@ GList *scan; GthTask *task; - if (response != GTK_RESPONSE_OK) { - gtk_widget_destroy (GTK_WIDGET (data->dialog)); + if (response == GTK_RESPONSE_HELP) { + show_help_dialog (GTK_WINDOW (dialog), data->dialog_name); return; } + if ((response != GTK_RESPONSE_OK) && (response != GTK_RESPONSE_APPLY)) { + cancel_file_list_loading (data); + close_dialog (data); + return; + } + + if (data->file_list == NULL) + return; + + data->close_dialog = (response == GTK_RESPONSE_OK); + /* get the parents list */ parents = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, g_object_unref, NULL); @@ -115,6 +180,7 @@ g_object_unref (parent); } } + _g_object_list_unref (data->parents); data->parents = g_hash_table_get_keys (parents); g_list_foreach (data->parents, (GFunc) g_object_ref, NULL); g_hash_table_unref (parents); @@ -127,10 +193,11 @@ gth_edit_metadata_dialog_update_info (GTH_EDIT_METADATA_DIALOG (data->dialog), data->file_list); + dialog_data_ref (data); task = gth_save_file_data_task_new (data->file_list, "*"); g_signal_connect (task, "completed", - G_CALLBACK (save_file_data_task_completed_cb), + G_CALLBACK (saver_completed_cb), data); gth_browser_exec_task (data->browser, task, FALSE); @@ -139,55 +206,133 @@ } +typedef struct { + DialogData *data; + GList *files; +} LoaderData; + + static void -load_file_data_task_completed_cb (GthTask *task, - GError *error, - gpointer user_data) +loader_data_free (LoaderData *loader_data) { - DialogData *data = user_data; + dialog_data_unref (loader_data->data); + _g_object_list_unref (loader_data->files); + g_free (loader_data); +} + + +static void +loader_completed_cb (GthTask *task, + GError *error, + gpointer user_data) +{ + LoaderData *loader_data = user_data; + DialogData *data = loader_data->data; if (error != NULL) { - _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Cannot read file information"), error); - gtk_widget_destroy (GTK_WIDGET (data->dialog)); + if (! g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + _gtk_error_dialog_from_gerror_show (GTK_WINDOW (data->browser), _("Cannot read file information"), error); + loader_data_free (loader_data); + if (data->never_shown) + close_dialog (data); return; } + _g_object_list_unref (data->file_list); data->file_list = _g_object_list_ref (gth_load_file_data_task_get_result (GTH_LOAD_FILE_DATA_TASK (task))); + gth_edit_metadata_dialog_set_file_list (GTH_EDIT_METADATA_DIALOG (data->dialog), data->file_list); gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (data->browser)); - gtk_window_set_modal (GTK_WINDOW (data->dialog), TRUE); + gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); gtk_window_present (GTK_WINDOW (data->dialog)); + + data->never_shown = FALSE; + + loader_data_free (loader_data); +} + + +static gboolean +update_file_list (gpointer user_data) +{ + DialogData *data = user_data; + LoaderData *loader_data; + GList *items; + GList *file_data_list; + + if (data->update_selectection_event != 0) { + g_source_remove (data->update_selectection_event); + data->update_selectection_event = 0; + } + + cancel_file_list_loading (data); + + loader_data = g_new0 (LoaderData, 1); + loader_data->data = dialog_data_ref (data); + + items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (data->browser))); + file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (data->browser)), items); + loader_data->files = gth_file_data_list_to_file_list (file_data_list); + + data->loader = gth_load_file_data_task_new (loader_data->files, "*"); + g_signal_connect (data->loader, + "completed", + G_CALLBACK (loader_completed_cb), + loader_data); + gth_browser_exec_task (data->browser, data->loader, FALSE); + + _g_object_list_unref (file_data_list); + _gtk_tree_path_list_free (items); + + return FALSE; +} + + +static void +file_selection_changed_cb (GthFileSelection *self, + DialogData *data) +{ + if (data->update_selectection_event != 0) + g_source_remove (data->update_selectection_event); + data->update_selectection_event = g_timeout_add (UPDATE_SELECTION_DELAY, update_file_list, data); } void dlg_edit_metadata (GthBrowser *browser, - GList *files) + GType dialog_type, + const char *dialog_name) { DialogData *data; - GthTask *task; + + if (gth_browser_get_dialog (browser, dialog_name)) { + gtk_window_present (GTK_WINDOW (gth_browser_get_dialog (browser, dialog_name))); + return; + } data = g_new0 (DialogData, 1); + data->ref = 1; data->browser = browser; - data->files = _g_object_list_ref (files); - data->dialog = gth_edit_metadata_dialog_new (); + data->dialog = g_object_new (dialog_type, 0); + data->dialog_name = g_strdup (dialog_name); + data->never_shown = TRUE; + + gth_browser_set_dialog (browser, data->dialog_name, data->dialog); g_signal_connect (G_OBJECT (data->dialog), - "destroy", - G_CALLBACK (destroy_cb), - data); + "delete-event", + G_CALLBACK (gtk_true), + NULL); g_signal_connect (data->dialog, "response", G_CALLBACK (edit_metadata_dialog__response_cb), data); + data->file_selection_changed_event = + g_signal_connect (gth_browser_get_file_list_view (data->browser), + "file-selection-changed", + G_CALLBACK (file_selection_changed_cb), + data); - task = gth_load_file_data_task_new (data->files, "*"); - g_signal_connect (task, - "completed", - G_CALLBACK (load_file_data_task_completed_cb), - data); - gth_browser_exec_task (browser, task, FALSE); - - g_object_unref (task); + update_file_list (data); } diff -Nru gthumb-2.14.3/extensions/edit_metadata/dlg-edit-metadata.h gthumb-3.0.0/extensions/edit_metadata/dlg-edit-metadata.h --- gthumb-2.14.3/extensions/edit_metadata/dlg-edit-metadata.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/dlg-edit-metadata.h 2012-02-19 15:01:32.000000000 +0000 @@ -25,6 +25,7 @@ #include void dlg_edit_metadata (GthBrowser *browser, - GList *files /* GFile list */); + GType dialog_type, + const char *dialog_name); #endif /* DLG_EDIT_METADATA_H */ diff -Nru gthumb-2.14.3/extensions/edit_metadata/edit_metadata.extension.in.in gthumb-3.0.0/extensions/edit_metadata/edit_metadata.extension.in.in --- gthumb-2.14.3/extensions/edit_metadata/edit_metadata.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/edit_metadata.extension.in.in 2012-04-21 09:26:22.000000000 +0000 @@ -10,4 +10,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% After=list_tools diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-delete-metadata-task.c gthumb-3.0.0/extensions/edit_metadata/gth-delete-metadata-task.c --- gthumb-2.14.3/extensions/edit_metadata/gth-delete-metadata-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-delete-metadata-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -31,7 +31,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthDeleteMetadataTask, gth_delete_metadata_task, GTH_TYPE_TASK) static void @@ -44,7 +44,7 @@ _g_object_unref (self->priv->file_data); _g_object_list_unref (self->priv->file_list); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_delete_metadata_task_parent_class)->finalize (object); } @@ -165,7 +165,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthDeleteMetadataTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -184,34 +183,6 @@ } -GType -gth_delete_metadata_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthDeleteMetadataTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_delete_metadata_task_class_init, - NULL, - NULL, - sizeof (GthDeleteMetadataTask), - 0, - (GInstanceInitFunc) gth_delete_metadata_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthDeleteMetadataTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_delete_metadata_task_new (GthBrowser *browser, GList *file_list) diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-edit-comment-dialog.c gthumb-3.0.0/extensions/edit_metadata/gth-edit-comment-dialog.c --- gthumb-2.14.3/extensions/edit_metadata/gth-edit-comment-dialog.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-edit-comment-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,217 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include "gth-edit-comment-dialog.h" +#include "gth-edit-metadata-dialog.h" + + +struct _GthEditCommentDialogPrivate { + GtkWidget *notebook; + GtkWidget *save_changed_checkbutton; +}; + + +static void gth_edit_comment_dialog_gth_edit_metadata_dialog_interface_init (GthEditMetadataDialogInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthEditCommentDialog, + gth_edit_comment_dialog, + GTK_TYPE_DIALOG, + G_IMPLEMENT_INTERFACE (GTH_TYPE_EDIT_METADATA_DIALOG, + gth_edit_comment_dialog_gth_edit_metadata_dialog_interface_init)) + + + +static void +gth_edit_comment_dialog_set_file_list (GthEditMetadataDialog *base, + GList *file_list) +{ + GthEditCommentDialog *self = GTH_EDIT_COMMENT_DIALOG (base); + int n_files; + char *title; + GList *pages; + GList *scan; + + n_files = g_list_length (file_list); + + /* update the title */ + + if (n_files == 1) { + GthFileData *file_data = file_list->data; + + /* Translators: the %s symbol in the string is a file name */ + title = g_strdup_printf (_("%s Metadata"), g_file_info_get_display_name (file_data->info)); + } + else + title = g_strdup_printf (g_dngettext (NULL, "%d file", "%d files", n_files), n_files); + gtk_window_set_title (GTK_WINDOW (self), title); + g_free (title); + + /* update the widgets */ + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->priv->save_changed_checkbutton), n_files > 1); + gtk_widget_set_sensitive (self->priv->save_changed_checkbutton, n_files > 1); + + pages = gtk_container_get_children (GTK_CONTAINER (self->priv->notebook)); + for (scan = pages; scan; scan = scan->next) + gth_edit_comment_page_set_file_list (GTH_EDIT_COMMENT_PAGE (scan->data), file_list); + + gtk_dialog_set_response_sensitive (GTK_DIALOG (self), + GTK_RESPONSE_APPLY, + n_files > 0); + gtk_dialog_set_response_sensitive (GTK_DIALOG (self), + GTK_RESPONSE_OK, + n_files > 0); + + g_list_free (pages); +} + + +static void +gth_edit_comment_dialog_update_info (GthEditMetadataDialog *base, + GList *file_list /* GthFileData list */) +{ + GthEditCommentDialog *self = GTH_EDIT_COMMENT_DIALOG (base); + gboolean only_modified_fields; + GList *pages; + GList *scan; + + only_modified_fields = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->priv->save_changed_checkbutton)); + pages = gtk_container_get_children (GTK_CONTAINER (self->priv->notebook)); + for (scan = pages; scan; scan = scan->next) { + GList *scan_file; + + for (scan_file = file_list; scan_file; scan_file = scan_file->next) { + GthFileData *file_data = scan_file->data; + gth_edit_comment_page_update_info (GTH_EDIT_COMMENT_PAGE (scan->data), file_data->info, only_modified_fields); + } + } + + g_list_free (pages); +} + + +static void +gth_edit_comment_dialog_gth_edit_metadata_dialog_interface_init (GthEditMetadataDialogInterface *iface) +{ + iface->set_file_list = gth_edit_comment_dialog_set_file_list; + iface->update_info = gth_edit_comment_dialog_update_info; +} + + +static void +gth_edit_comment_dialog_class_init (GthEditCommentDialogClass *klass) +{ + g_type_class_add_private (klass, sizeof (GthEditCommentDialogPrivate)); +} + + +static void +gth_edit_comment_dialog_init (GthEditCommentDialog *self) +{ + GtkWidget *vbox; + GArray *pages; + int i; + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_EDIT_COMMENT_DIALOG, GthEditCommentDialogPrivate); + + gtk_window_set_resizable (GTK_WINDOW (self), TRUE); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); + gtk_container_set_border_width (GTK_CONTAINER (self), 5); + + gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_SAVE, GTK_RESPONSE_APPLY); + gtk_dialog_add_button (GTK_DIALOG (self), _("Sa_ve and Close"), GTK_RESPONSE_OK); + gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_HELP, GTK_RESPONSE_HELP); + + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); + gtk_widget_show (vbox); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), vbox, TRUE, TRUE, 0); + + self->priv->notebook = gtk_notebook_new (); + gtk_widget_show (self->priv->notebook); + gtk_box_pack_start (GTK_BOX (vbox), self->priv->notebook, TRUE, TRUE, 0); + + self->priv->save_changed_checkbutton = gtk_check_button_new_with_mnemonic (_("Save only cha_nged fields")); + gtk_widget_show (self->priv->save_changed_checkbutton); + gtk_box_pack_start (GTK_BOX (vbox), self->priv->save_changed_checkbutton, FALSE, FALSE, 0); + + pages = gth_main_get_type_set ("edit-comment-dialog-page"); + if (pages == NULL) + return; + + for (i = 0; i < pages->len; i++) { + GType page_type; + GtkWidget *page; + + page_type = g_array_index (pages, GType, i); + page = g_object_new (page_type, NULL); + if (! GTH_IS_EDIT_COMMENT_PAGE (page)) { + g_object_unref (page); + continue; + } + + gtk_widget_show (page); + gtk_notebook_append_page (GTK_NOTEBOOK (self->priv->notebook), + page, + gtk_label_new (gth_edit_comment_page_get_name (GTH_EDIT_COMMENT_PAGE (page)))); + } +} + + +/* -- gth_edit_comment_dialog_page -- */ + + +G_DEFINE_INTERFACE (GthEditCommentPage, gth_edit_comment_page, 0) + + +static void +gth_edit_comment_page_default_init (GthEditCommentPageInterface *iface) +{ + /* void */ +} + + +void +gth_edit_comment_page_set_file_list (GthEditCommentPage *self, + GList *file_list) +{ + GTH_EDIT_COMMENT_PAGE_GET_INTERFACE (self)->set_file_list (self, file_list); +} + + +void +gth_edit_comment_page_update_info (GthEditCommentPage *self, + GFileInfo *info, + gboolean only_modified_fields) +{ + GTH_EDIT_COMMENT_PAGE_GET_INTERFACE (self)->update_info (self, info, only_modified_fields); +} + + +const char * +gth_edit_comment_page_get_name (GthEditCommentPage *self) +{ + return GTH_EDIT_COMMENT_PAGE_GET_INTERFACE (self)->get_name (self); +} diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-edit-comment-dialog.h gthumb-3.0.0/extensions/edit_metadata/gth-edit-comment-dialog.h --- gthumb-2.14.3/extensions/edit_metadata/gth-edit-comment-dialog.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-edit-comment-dialog.h 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,84 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_EDIT_COMMENT_DIALOG_H +#define GTH_EDIT_COMMENT_DIALOG_H + +#include +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_EDIT_COMMENT_DIALOG (gth_edit_comment_dialog_get_type ()) +#define GTH_EDIT_COMMENT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_EDIT_COMMENT_DIALOG, GthEditCommentDialog)) +#define GTH_EDIT_COMMENT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_EDIT_COMMENT_DIALOG, GthEditCommentDialogClass)) +#define GTH_IS_EDIT_COMMENT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_EDIT_COMMENT_DIALOG)) +#define GTH_IS_EDIT_COMMENT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_EDIT_COMMENT_DIALOG)) +#define GTH_EDIT_COMMENT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_EDIT_COMMENT_DIALOG, GthEditCommentDialogClass)) + +#define GTH_TYPE_EDIT_COMMENT_PAGE (gth_edit_comment_page_get_type ()) +#define GTH_EDIT_COMMENT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_EDIT_COMMENT_PAGE, GthEditCommentPage)) +#define GTH_IS_EDIT_COMMENT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_EDIT_COMMENT_PAGE)) +#define GTH_EDIT_COMMENT_PAGE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_EDIT_COMMENT_PAGE, GthEditCommentPageInterface)) + +typedef struct _GthEditCommentDialog GthEditCommentDialog; +typedef struct _GthEditCommentDialogClass GthEditCommentDialogClass; +typedef struct _GthEditCommentDialogPrivate GthEditCommentDialogPrivate; + +struct _GthEditCommentDialog { + GtkDialog parent_instance; + GthEditCommentDialogPrivate *priv; +}; + +struct _GthEditCommentDialogClass { + GtkDialogClass parent_class; +}; + +typedef struct _GthEditCommentPage GthEditCommentPage; +typedef struct _GthEditCommentPageInterface GthEditCommentPageInterface; + +struct _GthEditCommentPageInterface { + GTypeInterface parent_iface; + void (*set_file_list) (GthEditCommentPage *self, + GList *file_list /* GthFileData list */); + void (*update_info) (GthEditCommentPage *self, + GFileInfo *info, + gboolean only_modified_fields); + const char * (*get_name) (GthEditCommentPage *self); +}; + +/* GthEditCommentDialog */ + +GType gth_edit_comment_dialog_get_type (void); + +/* GthEditCommentPage */ + +GType gth_edit_comment_page_get_type (void); +void gth_edit_comment_page_set_file_list (GthEditCommentPage *self, + GList *file_list /* GthFileData list */); +void gth_edit_comment_page_update_info (GthEditCommentPage *self, + GFileInfo *info, + gboolean only_modified_fields); +const char * gth_edit_comment_page_get_name (GthEditCommentPage *self); + +G_END_DECLS + +#endif /* GTH_EDIT_COMMENT_DIALOG_H */ diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-edit-comment-page.c gthumb-3.0.0/extensions/edit_metadata/gth-edit-comment-page.c --- gthumb-2.14.3/extensions/edit_metadata/gth-edit-comment-page.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-edit-comment-page.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,540 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include "gth-edit-comment-page.h" -#include "gth-edit-metadata-dialog.h" - - -#define GTH_EDIT_COMMENT_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_EDIT_COMMENT_PAGE, GthEditCommentPagePrivate)) -#define GET_WIDGET(name) _gtk_builder_get_widget (self->priv->builder, (name)) - - -typedef enum { - NO_DATE = 0, - FOLLOWING_DATE, - CURRENT_DATE, - PHOTO_DATE, - LAST_MODIFIED_DATE, - CREATION_DATE, - NO_CHANGE -} DateOption; - - -static gpointer gth_edit_comment_page_parent_class = NULL; - - -struct _GthEditCommentPagePrivate { - GFileInfo *info; - GtkBuilder *builder; - GtkWidget *date_combobox; - GtkWidget *date_selector; - GtkWidget *tags_entry; - GTimeVal current_date; -}; - - -void -gth_edit_comment_page_real_set_file_list (GthEditMetadataPage *base, - GList *file_list) -{ - GthEditCommentPage *self; - GtkTextBuffer *buffer; - GthMetadata *metadata; - GthStringList *tags; - GthMetadataProvider *provider; - gboolean no_provider; - GthFileData *file_data; - const char *mime_type; - - self = GTH_EDIT_COMMENT_PAGE (base); - - _g_object_unref (self->priv->info); - self->priv->info = gth_file_data_list_get_common_info (file_list, "general::description,general::title,general::location,general::datetime,general::tags,general::rating"); - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (GET_WIDGET ("note_text"))); - metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "general::description"); - if (metadata != NULL) { - GtkTextIter iter; - - gtk_text_buffer_set_text (buffer, gth_metadata_get_formatted (metadata), -1); - gtk_text_buffer_get_iter_at_line (buffer, &iter, 0); - gtk_text_buffer_place_cursor (buffer, &iter); - } - else - gtk_text_buffer_set_text (buffer, "", -1); - - metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "general::title"); - if (metadata != NULL) - gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("title_entry")), gth_metadata_get_formatted (metadata)); - else - gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("title_entry")), ""); - - metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "general::location"); - if (metadata != NULL) - gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("place_entry")), gth_metadata_get_formatted (metadata)); - else - gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("place_entry")), ""); - - metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "general::datetime"); - if (metadata != NULL) { - gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->date_combobox), FOLLOWING_DATE); - gtk_widget_set_sensitive (self->priv->date_combobox, TRUE); - gth_time_selector_set_exif_date (GTH_TIME_SELECTOR (self->priv->date_selector), gth_metadata_get_raw (metadata)); - } - else { - if (file_list->next == NULL) - gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->date_combobox), NO_DATE); - else - gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->date_combobox), NO_CHANGE); - gtk_widget_set_sensitive (self->priv->date_combobox, FALSE); - gth_time_selector_set_exif_date (GTH_TIME_SELECTOR (self->priv->date_selector), ""); - } - - tags = (GthStringList *) g_file_info_get_attribute_object (self->priv->info, "general::tags"); - if (tags != NULL) { - char *value; - - value = gth_string_list_join (tags, ","); - gth_tags_entry_set_text (GTH_TAGS_ENTRY (self->priv->tags_entry), value); - - g_free (value); - } - else - gth_tags_entry_set_text (GTH_TAGS_ENTRY (self->priv->tags_entry), NULL); - - metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "general::rating"); - if (metadata != NULL) { - int v; - - sscanf (gth_metadata_get_raw (metadata), "%d", &v); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("rating_spinbutton")), v); - } - else - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("rating_spinbutton")), 0); - - gtk_widget_grab_focus (GET_WIDGET ("note_text")); - - no_provider = TRUE; - - if (file_list->next == NULL) { - GthFileData *first = file_list->data; - file_data = gth_file_data_new (first->file, first->info); - } - else - file_data = gth_file_data_new (NULL, ((GthFileData *) file_list->data)->info); - - mime_type = gth_file_data_get_mime_type (file_data); - - provider = gth_main_get_metadata_writer ("general::description", mime_type); - gtk_widget_set_sensitive (GET_WIDGET ("note_text"), provider != NULL); - if (no_provider && (provider != NULL)) - no_provider = FALSE; - _g_object_unref (provider); - - provider = gth_main_get_metadata_writer ("general::location", mime_type); - gtk_widget_set_sensitive (GET_WIDGET ("place_entry"), provider != NULL); - if (no_provider && (provider != NULL)) - no_provider = FALSE; - _g_object_unref (provider); - - provider = gth_main_get_metadata_writer ("general::datetime", mime_type); - gtk_widget_set_sensitive (self->priv->date_combobox, provider != NULL); - if (provider == NULL) - gtk_widget_set_sensitive (self->priv->date_selector, FALSE); - if (no_provider && (provider != NULL)) - no_provider = FALSE; - _g_object_unref (provider); - - provider = gth_main_get_metadata_writer ("general::tags", mime_type); - gtk_widget_set_sensitive (self->priv->tags_entry, provider != NULL); - if (no_provider && (provider != NULL)) - no_provider = FALSE; - _g_object_unref (provider); - - provider = gth_main_get_metadata_writer ("general::rating", mime_type); - gtk_widget_set_sensitive (GET_WIDGET ("rating_spinbutton"), provider != NULL); - if (no_provider && (provider != NULL)) - no_provider = FALSE; - _g_object_unref (provider); - - if (no_provider) - gtk_widget_hide (GTK_WIDGET (self)); - else - gtk_widget_show (GTK_WIDGET (self)); - - g_object_unref (file_data); -} - - -static char * -get_date_from_option (GthEditCommentPage *self, - DateOption option, - GFileInfo *info) -{ - GTimeVal timeval; - GthDateTime *date_time; - char *exif_date; - GthMetadata *metadata; - - _g_time_val_reset (&timeval); - - switch (option) { - case NO_DATE: - return g_strdup (""); - - case FOLLOWING_DATE: - date_time = gth_datetime_new (); - gth_time_selector_get_value (GTH_TIME_SELECTOR (self->priv->date_selector), date_time); - exif_date = gth_datetime_to_exif_date (date_time); - _g_time_val_from_exif_date (exif_date, &timeval); - g_free (exif_date); - gth_datetime_free (date_time); - break; - - case CURRENT_DATE: - g_get_current_time (&self->priv->current_date); - timeval = self->priv->current_date; - break; - - case PHOTO_DATE: - metadata = (GthMetadata *) g_file_info_get_attribute_object (info, "Embedded::Photo::DateTimeOriginal"); - if (metadata != NULL) - _g_time_val_from_exif_date (gth_metadata_get_raw (metadata), &timeval); - else - return g_strdup (""); - break; - - case LAST_MODIFIED_DATE: - timeval.tv_sec = g_file_info_get_attribute_uint64 (info, "time::modified"); - timeval.tv_usec = g_file_info_get_attribute_uint32 (info, "time::modified-usec"); - break; - - case CREATION_DATE: - timeval.tv_sec = g_file_info_get_attribute_uint64 (info, "time::created"); - timeval.tv_usec = g_file_info_get_attribute_uint32 (info, "time::created-usec"); - break; - - case NO_CHANGE: - metadata = (GthMetadata *) g_file_info_get_attribute_object (info, "general::datetime"); - if (metadata != NULL) - _g_time_val_from_exif_date (gth_metadata_get_raw (metadata), &timeval); - else - return g_strdup (""); - break; - } - - return _g_time_val_to_exif_date (&timeval); -} - - -void -gth_edit_comment_page_real_update_info (GthEditMetadataPage *base, - GFileInfo *info, - gboolean only_modified_fields) -{ - GthEditCommentPage *self; - GthFileData *file_data; - GtkTextBuffer *buffer; - GtkTextIter start; - GtkTextIter end; - char *text; - GthMetadata *metadata; - int i; - char **tagv; - GList *tags; - GthStringList *string_list; - char *s; - - self = GTH_EDIT_COMMENT_PAGE (base); - - file_data = gth_file_data_new (NULL, self->priv->info); - - /* caption */ - - if (! only_modified_fields || ! gth_file_data_attribute_equal (file_data, "general::title", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("title_entry"))))) { - metadata = g_object_new (GTH_TYPE_METADATA, - "id", "general::title", - "raw", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("title_entry"))), - "formatted", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("title_entry"))), - NULL); - g_file_info_set_attribute_object (info, "general::title", G_OBJECT (metadata)); - g_object_unref (metadata); - } - - /* comment */ - - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (GET_WIDGET ("note_text"))); - gtk_text_buffer_get_bounds (buffer, &start, &end); - text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); - if (! only_modified_fields || ! gth_file_data_attribute_equal (file_data, "general::description", text)) { - metadata = g_object_new (GTH_TYPE_METADATA, - "id", "general::description", - "raw", text, - "formatted", text, - NULL); - g_file_info_set_attribute_object (info, "general::description", G_OBJECT (metadata)); - g_object_unref (metadata); - } - g_free (text); - - /* location */ - - if (! only_modified_fields || ! gth_file_data_attribute_equal (file_data, "general::location", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("place_entry"))))) { - metadata = g_object_new (GTH_TYPE_METADATA, - "id", "general::location", - "raw", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("place_entry"))), - "formatted", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("place_entry"))), - NULL); - g_file_info_set_attribute_object (info, "general::location", G_OBJECT (metadata)); - g_object_unref (metadata); - } - - /* date */ - - switch (gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->date_combobox))) { - case NO_CHANGE: - break; - case NO_DATE: - g_file_info_remove_attribute (info, "general::datetime"); - break; - default: - { - char *exif_date; - - if (gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->date_combobox)) == CURRENT_DATE) - exif_date = _g_time_val_to_exif_date (&self->priv->current_date); - else - exif_date = get_date_from_option (self, gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->date_combobox)), info); - if (! only_modified_fields - || ! gth_file_data_attribute_equal (file_data, "general::datetime", exif_date)) - { - metadata = g_object_new (GTH_TYPE_METADATA, - "id", "general::datetime", - "raw", exif_date, - "formatted", exif_date, - NULL); - g_file_info_set_attribute_object (info, "general::datetime", G_OBJECT (metadata)); - g_object_unref (metadata); - } - - g_free (exif_date); - - break; - } - } - - /* tags */ - - tagv = gth_tags_entry_get_tags (GTH_TAGS_ENTRY (self->priv->tags_entry), TRUE); - tags = NULL; - for (i = 0; tagv[i] != NULL; i++) - tags = g_list_prepend (tags, tagv[i]); - tags = g_list_reverse (tags); - if (tags != NULL) - string_list = gth_string_list_new (tags); - else - string_list = NULL; - if (! only_modified_fields || ! gth_file_data_attribute_equal_string_list (file_data, "general::tags", string_list)) { - if (string_list != NULL) - g_file_info_set_attribute_object (info, "general::tags", G_OBJECT (string_list)); - else - g_file_info_remove_attribute (info, "general::tags"); - } - - /* rating */ - - s = g_strdup_printf ("%d", gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("rating_spinbutton")))); - if (! only_modified_fields || ! gth_file_data_attribute_equal_int (file_data, "general::rating", s)) { - if (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("rating_spinbutton"))) > 0) { - metadata = g_object_new (GTH_TYPE_METADATA, - "id", "general::rating", - "raw", s, - "formatted", s, - NULL); - g_file_info_set_attribute_object (info, "general::rating", G_OBJECT (metadata)); - g_object_unref (metadata); - } - else - g_file_info_remove_attribute (info, "general::rating"); - } - - g_free (s); - _g_object_unref (string_list); - g_strfreev (tagv); - g_list_free (tags); - g_object_unref (file_data); -} - - -const char * -gth_edit_comment_page_real_get_name (GthEditMetadataPage *self) -{ - return _("General"); -} - - -static void -gth_edit_comment_page_finalize (GObject *object) -{ - GthEditCommentPage *self; - - self = GTH_EDIT_COMMENT_PAGE (object); - - _g_object_unref (self->priv->info); - g_object_unref (self->priv->builder); - - G_OBJECT_CLASS (gth_edit_comment_page_parent_class)->finalize (object); -} - - -static void -gth_edit_comment_page_class_init (GthEditCommentPageClass *klass) -{ - gth_edit_comment_page_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (GthEditCommentPagePrivate)); - - G_OBJECT_CLASS (klass)->finalize = gth_edit_comment_page_finalize; -} - - -static void -date_combobox_changed_cb (GtkComboBox *widget, - gpointer user_data) -{ - GthEditCommentPage *self = user_data; - char *value; - - value = get_date_from_option (self, gtk_combo_box_get_active (widget), self->priv->info); - gth_time_selector_set_exif_date (GTH_TIME_SELECTOR (self->priv->date_selector), value); - gtk_widget_set_sensitive (self->priv->date_selector, ! g_str_equal (value, "")); - - g_free (value); -} - - -static void -tags_entry_list_collapsed_cb (GthTagsEntry *widget, - gpointer user_data) -{ - GtkWidget *toplevel; - int width; - - /* collapse the dialog height */ - - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (widget)); - if (! gtk_widget_is_toplevel (toplevel)) - return; - - gtk_window_get_size (GTK_WINDOW (toplevel), &width, NULL); - gtk_window_resize (GTK_WINDOW (toplevel), width, 1); -} - - -static void -gth_edit_comment_page_init (GthEditCommentPage *self) -{ - self->priv = GTH_EDIT_COMMENT_PAGE_GET_PRIVATE (self); - self->priv->info = NULL; - - gtk_container_set_border_width (GTK_CONTAINER (self), 12); - - self->priv->builder = _gtk_builder_new_from_file ("edit-comment-page.ui", "edit_metadata"); - gtk_box_pack_start (GTK_BOX (self), _gtk_builder_get_widget (self->priv->builder, "content"), TRUE, TRUE, 0); - - self->priv->date_combobox = gtk_combo_box_text_new (); - _gtk_combo_box_append_texts (GTK_COMBO_BOX_TEXT (self->priv->date_combobox), - _("No date"), - _("The following date"), - _("Current date"), - _("Date photo was taken"), - _("Last modified date"), - _("File creation date"), - _("Do not modify"), - NULL); - gtk_widget_show (self->priv->date_combobox); - gtk_box_pack_start (GTK_BOX (GET_WIDGET ("date_combobox_container")), self->priv->date_combobox, TRUE, TRUE, 0); - - g_signal_connect (self->priv->date_combobox, - "changed", - G_CALLBACK (date_combobox_changed_cb), - self); - - self->priv->date_selector = gth_time_selector_new (); - gtk_widget_show (self->priv->date_selector); - gtk_box_pack_start (GTK_BOX (GET_WIDGET ("date_selector_container")), self->priv->date_selector, FALSE, FALSE, 0); - gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("date_label")), self->priv->date_combobox); - - self->priv->tags_entry = gth_tags_entry_new (); - gtk_widget_show (self->priv->tags_entry); - gtk_box_pack_start (GTK_BOX (GET_WIDGET ("tags_entry_container")), self->priv->tags_entry, FALSE, FALSE, 0); - gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("tags_label")), self->priv->tags_entry); - - g_signal_connect (self->priv->tags_entry, - "list-collapsed", - G_CALLBACK (tags_entry_list_collapsed_cb), - self); -} - - -static void -gth_edit_comment_page_gth_edit_comment_page_interface_init (GthEditMetadataPageIface *iface) -{ - iface->set_file_list = gth_edit_comment_page_real_set_file_list; - iface->update_info = gth_edit_comment_page_real_update_info; - iface->get_name = gth_edit_comment_page_real_get_name; -} - - -GType -gth_edit_comment_page_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthEditCommentPageClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_edit_comment_page_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthEditCommentPage), - 0, - (GInstanceInitFunc) gth_edit_comment_page_init, - NULL - }; - static const GInterfaceInfo gth_edit_comment_page_info = { - (GInterfaceInitFunc) gth_edit_comment_page_gth_edit_comment_page_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - type = g_type_register_static (GTK_TYPE_VBOX, - "GthEditCommentPage", - &g_define_type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_EDIT_METADATA_PAGE, >h_edit_comment_page_info); - } - - return type; -} diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-edit-comment-page.h gthumb-3.0.0/extensions/edit_metadata/gth-edit-comment-page.h --- gthumb-2.14.3/extensions/edit_metadata/gth-edit-comment-page.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-edit-comment-page.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_EDIT_COMMENT_PAGE_H -#define GTH_EDIT_COMMENT_PAGE_H - -#include -#include -#include - -#define GTH_TYPE_EDIT_COMMENT_PAGE (gth_edit_comment_page_get_type ()) -#define GTH_EDIT_COMMENT_PAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_EDIT_COMMENT_PAGE, GthEditCommentPage)) -#define GTH_EDIT_COMMENT_PAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GTH_TYPE_EDIT_COMMENT_PAGE, GthEditCommentPageClass)) -#define GTH_IS_EDIT_COMMENT_PAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTH_TYPE_EDIT_COMMENT_PAGE)) -#define GTH_IS_EDIT_COMMENT_PAGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTH_TYPE_EDIT_COMMENT_PAGE)) -#define GTH_EDIT_COMMENT_PAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GTH_TYPE_EDIT_COMMENT_PAGE, GthEditCommentPageClass)) - -typedef struct _GthEditCommentPage GthEditCommentPage; -typedef struct _GthEditCommentPagePrivate GthEditCommentPagePrivate; -typedef struct _GthEditCommentPageClass GthEditCommentPageClass; - -struct _GthEditCommentPage -{ - GtkVBox __parent; - GthEditCommentPagePrivate *priv; -}; - -struct _GthEditCommentPageClass -{ - GtkVBoxClass __parent_class; -}; - -GType gth_edit_comment_page_get_type (void) G_GNUC_CONST; - -#endif /* GTH_EDIT_COMMENT_PAGE_H */ diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-edit-general-page.c gthumb-3.0.0/extensions/edit_metadata/gth-edit-general-page.c --- gthumb-2.14.3/extensions/edit_metadata/gth-edit-general-page.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-edit-general-page.c 2012-03-06 15:26:06.000000000 +0000 @@ -0,0 +1,586 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "gth-edit-comment-dialog.h" +#include "gth-edit-general-page.h" +#include "utils.h" + + +#define GET_WIDGET(name) _gtk_builder_get_widget (self->priv->builder, (name)) + + +typedef enum { + NO_DATE = 0, + FOLLOWING_DATE, + CURRENT_DATE, + PHOTO_DATE, + LAST_MODIFIED_DATE, + CREATION_DATE, + NO_CHANGE +} DateOption; + + +struct _GthEditGeneralPagePrivate { + GFileInfo *info; + GtkBuilder *builder; + GtkWidget *date_combobox; + GtkWidget *date_selector; + GtkWidget *tags_entry; + GTimeVal current_date; +}; + + +static void gth_edit_general_page_gth_edit_general_page_interface_init (GthEditCommentPageInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthEditGeneralPage, + gth_edit_general_page, + GTK_TYPE_BOX, + G_IMPLEMENT_INTERFACE (GTH_TYPE_EDIT_COMMENT_PAGE, + gth_edit_general_page_gth_edit_general_page_interface_init)) + + +void +gth_edit_general_page_real_set_file_list (GthEditCommentPage *base, + GList *file_list) +{ + GthEditGeneralPage *self; + GtkTextBuffer *buffer; + GthMetadata *metadata; + GthMetadataProvider *provider; + GHashTable *common_tags; + GHashTable *no_common_tags; + GList *common_tags_list; + GList *no_common_tags_list; + gboolean no_provider; + GthFileData *file_data; + const char *mime_type; + + self = GTH_EDIT_GENERAL_PAGE (base); + + /* get the metadata common to the seleted files */ + + _g_object_unref (self->priv->info); + self->priv->info = gth_file_data_list_get_common_info (file_list, "general::description,general::title,general::location,general::datetime,general::tags,general::rating"); + + /* description */ + + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (GET_WIDGET ("note_text"))); + metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "general::description"); + if (metadata != NULL) { + GtkTextIter iter; + + gtk_text_buffer_set_text (buffer, gth_metadata_get_formatted (metadata), -1); + gtk_text_buffer_get_iter_at_line (buffer, &iter, 0); + gtk_text_buffer_place_cursor (buffer, &iter); + } + else + gtk_text_buffer_set_text (buffer, "", -1); + + /* title */ + + metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "general::title"); + if (metadata != NULL) + gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("title_entry")), gth_metadata_get_formatted (metadata)); + else + gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("title_entry")), ""); + + /* location */ + + metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "general::location"); + if (metadata != NULL) + gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("place_entry")), gth_metadata_get_formatted (metadata)); + else + gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("place_entry")), ""); + + /* date */ + + metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "general::datetime"); + if (metadata != NULL) { + gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->date_combobox), FOLLOWING_DATE); + gtk_widget_set_sensitive (self->priv->date_combobox, TRUE); + gth_time_selector_set_exif_date (GTH_TIME_SELECTOR (self->priv->date_selector), gth_metadata_get_raw (metadata)); + } + else { + if ((file_list != NULL) && (file_list->next == NULL)) + gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->date_combobox), NO_DATE); + else + gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->date_combobox), NO_CHANGE); + gtk_widget_set_sensitive (self->priv->date_combobox, FALSE); + gth_time_selector_set_exif_date (GTH_TIME_SELECTOR (self->priv->date_selector), ""); + } + + /* tags */ + + utils_get_common_tags (file_list, &common_tags, &no_common_tags); + common_tags_list = g_hash_table_get_keys (common_tags); + no_common_tags_list = g_hash_table_get_keys (no_common_tags); + gth_tags_entry_set_tag_list (GTH_TAGS_ENTRY (self->priv->tags_entry), + common_tags_list, + no_common_tags_list); + + g_list_free (no_common_tags_list); + g_list_free (common_tags_list); + g_hash_table_unref (no_common_tags); + g_hash_table_unref (common_tags); + + /* rating */ + + metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "general::rating"); + if (metadata != NULL) { + int v; + + sscanf (gth_metadata_get_raw (metadata), "%d", &v); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("rating_spinbutton")), v); + } + else + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("rating_spinbutton")), 0); + + gtk_widget_grab_focus (GET_WIDGET ("note_text")); + + /* set a widget insensitive if there is no way to save the relative + * metadata */ + + no_provider = TRUE; + + if (file_list == NULL) { + file_data = gth_file_data_new (NULL, NULL); + } + else if (file_list->next == NULL) { + GthFileData *first = file_list->data; + file_data = gth_file_data_new (first->file, first->info); + } + else + file_data = gth_file_data_new (NULL, ((GthFileData *) file_list->data)->info); + + mime_type = gth_file_data_get_mime_type (file_data); + + provider = gth_main_get_metadata_writer ("general::description", mime_type); + gtk_widget_set_sensitive (GET_WIDGET ("note_text"), provider != NULL); + if (no_provider && (provider != NULL)) + no_provider = FALSE; + _g_object_unref (provider); + + provider = gth_main_get_metadata_writer ("general::location", mime_type); + gtk_widget_set_sensitive (GET_WIDGET ("place_entry"), provider != NULL); + if (no_provider && (provider != NULL)) + no_provider = FALSE; + _g_object_unref (provider); + + provider = gth_main_get_metadata_writer ("general::datetime", mime_type); + gtk_widget_set_sensitive (self->priv->date_combobox, provider != NULL); + if (provider == NULL) + gtk_widget_set_sensitive (self->priv->date_selector, FALSE); + if (no_provider && (provider != NULL)) + no_provider = FALSE; + _g_object_unref (provider); + + provider = gth_main_get_metadata_writer ("general::tags", mime_type); + gtk_widget_set_sensitive (self->priv->tags_entry, provider != NULL); + if (no_provider && (provider != NULL)) + no_provider = FALSE; + _g_object_unref (provider); + + provider = gth_main_get_metadata_writer ("general::rating", mime_type); + gtk_widget_set_sensitive (GET_WIDGET ("rating_spinbutton"), provider != NULL); + if (no_provider && (provider != NULL)) + no_provider = FALSE; + _g_object_unref (provider); + + /* hide the whole page if no metadata can be saved */ + + if (no_provider) + gtk_widget_hide (GTK_WIDGET (self)); + else + gtk_widget_show (GTK_WIDGET (self)); + + g_object_unref (file_data); +} + + +static char * +get_date_from_option (GthEditGeneralPage *self, + DateOption option, + GFileInfo *info) +{ + GTimeVal timeval; + GthDateTime *date_time; + char *exif_date; + GthMetadata *metadata; + + _g_time_val_reset (&timeval); + + switch (option) { + case NO_DATE: + return g_strdup (""); + + case FOLLOWING_DATE: + date_time = gth_datetime_new (); + gth_time_selector_get_value (GTH_TIME_SELECTOR (self->priv->date_selector), date_time); + exif_date = gth_datetime_to_exif_date (date_time); + _g_time_val_from_exif_date (exif_date, &timeval); + g_free (exif_date); + gth_datetime_free (date_time); + break; + + case CURRENT_DATE: + g_get_current_time (&self->priv->current_date); + timeval = self->priv->current_date; + break; + + case PHOTO_DATE: + metadata = (GthMetadata *) g_file_info_get_attribute_object (info, "Embedded::Photo::DateTimeOriginal"); + if (metadata != NULL) + _g_time_val_from_exif_date (gth_metadata_get_raw (metadata), &timeval); + else + return g_strdup (""); + break; + + case LAST_MODIFIED_DATE: + timeval.tv_sec = g_file_info_get_attribute_uint64 (info, "time::modified"); + timeval.tv_usec = g_file_info_get_attribute_uint32 (info, "time::modified-usec"); + break; + + case CREATION_DATE: + timeval.tv_sec = g_file_info_get_attribute_uint64 (info, "time::created"); + timeval.tv_usec = g_file_info_get_attribute_uint32 (info, "time::created-usec"); + break; + + case NO_CHANGE: + metadata = (GthMetadata *) g_file_info_get_attribute_object (info, "general::datetime"); + if (metadata != NULL) + _g_time_val_from_exif_date (gth_metadata_get_raw (metadata), &timeval); + else + return g_strdup (""); + break; + } + + return _g_time_val_to_exif_date (&timeval); +} + + +void +gth_edit_general_page_real_update_info (GthEditCommentPage *base, + GFileInfo *info, + gboolean only_modified_fields) +{ + GthEditGeneralPage *self; + GthFileData *file_data; + GtkTextBuffer *buffer; + GtkTextIter start; + GtkTextIter end; + char *text; + GthMetadata *metadata; + char *s; + + self = GTH_EDIT_GENERAL_PAGE (base); + + file_data = gth_file_data_new (NULL, self->priv->info); + + /* caption */ + + if (! only_modified_fields || ! gth_file_data_attribute_equal (file_data, "general::title", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("title_entry"))))) { + metadata = g_object_new (GTH_TYPE_METADATA, + "id", "general::title", + "raw", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("title_entry"))), + "formatted", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("title_entry"))), + NULL); + g_file_info_set_attribute_object (info, "general::title", G_OBJECT (metadata)); + g_object_unref (metadata); + } + + /* comment */ + + buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (GET_WIDGET ("note_text"))); + gtk_text_buffer_get_bounds (buffer, &start, &end); + text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); + if (! only_modified_fields || ! gth_file_data_attribute_equal (file_data, "general::description", text)) { + metadata = g_object_new (GTH_TYPE_METADATA, + "id", "general::description", + "raw", text, + "formatted", text, + NULL); + g_file_info_set_attribute_object (info, "general::description", G_OBJECT (metadata)); + g_object_unref (metadata); + } + g_free (text); + + /* location */ + + if (! only_modified_fields || ! gth_file_data_attribute_equal (file_data, "general::location", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("place_entry"))))) { + metadata = g_object_new (GTH_TYPE_METADATA, + "id", "general::location", + "raw", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("place_entry"))), + "formatted", gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("place_entry"))), + NULL); + g_file_info_set_attribute_object (info, "general::location", G_OBJECT (metadata)); + g_object_unref (metadata); + } + + /* date */ + + switch (gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->date_combobox))) { + case NO_CHANGE: + break; + + case NO_DATE: + g_file_info_remove_attribute (info, "general::datetime"); + break; + + default: + { + char *exif_date; + + if (gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->date_combobox)) == CURRENT_DATE) + exif_date = _g_time_val_to_exif_date (&self->priv->current_date); + else + exif_date = get_date_from_option (self, gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->date_combobox)), info); + if (! only_modified_fields + || ! gth_file_data_attribute_equal (file_data, "general::datetime", exif_date)) + { + metadata = g_object_new (GTH_TYPE_METADATA, + "id", "general::datetime", + "raw", exif_date, + "formatted", exif_date, + NULL); + g_file_info_set_attribute_object (info, "general::datetime", G_OBJECT (metadata)); + g_object_unref (metadata); + } + + g_free (exif_date); + + break; + } + } + + /* tags */ + + if (only_modified_fields) { + GList *checked_tags; + GList *inconsistent_tags; + GList *new_tags; + GHashTable *old_tags; + GList *scan_tags; + + gth_tags_entry_get_tag_list (GTH_TAGS_ENTRY (self->priv->tags_entry), + TRUE, + &checked_tags, + &inconsistent_tags); + + new_tags = _g_string_list_dup (checked_tags); + + /* keep the inconsistent tags */ + + old_tags = _g_hash_table_from_string_list ((GthStringList *) g_file_info_get_attribute_object (info, "general::tags")); + for (scan_tags = inconsistent_tags; scan_tags; scan_tags = scan_tags->next) { + char *inconsistent_tag = scan_tags->data; + + if (g_hash_table_lookup (old_tags, inconsistent_tag) != NULL) + new_tags = g_list_prepend (new_tags, g_strdup (inconsistent_tag)); + } + g_hash_table_unref (old_tags); + + /* update the general::tags attribute */ + + if (new_tags != NULL) { + GthStringList *file_tags; + + new_tags = g_list_sort (new_tags, (GCompareFunc) g_strcmp0); + file_tags = gth_string_list_new (new_tags); + g_file_info_set_attribute_object (info, "general::tags", G_OBJECT (file_tags)); + + _g_object_unref (file_tags); + _g_string_list_free (new_tags); + } + else + g_file_info_remove_attribute (info, "general::tags"); + + g_list_free (inconsistent_tags); + _g_string_list_free (checked_tags); + } + else { + char **tagv; + GList *tags; + int i; + GthStringList *string_list; + + tagv = gth_tags_entry_get_tags (GTH_TAGS_ENTRY (self->priv->tags_entry), TRUE); + tags = NULL; + for (i = 0; tagv[i] != NULL; i++) + tags = g_list_prepend (tags, tagv[i]); + tags = g_list_reverse (tags); + if (tags != NULL) + string_list = gth_string_list_new (tags); + else + string_list = NULL; + + if (string_list != NULL) + g_file_info_set_attribute_object (info, "general::tags", G_OBJECT (string_list)); + else + g_file_info_remove_attribute (info, "general::tags"); + + _g_object_unref (string_list); + g_list_free (tags); + g_strfreev (tagv); + } + + /* rating */ + + s = g_strdup_printf ("%d", gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("rating_spinbutton")))); + if (! only_modified_fields || ! gth_file_data_attribute_equal_int (file_data, "general::rating", s)) { + if (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("rating_spinbutton"))) > 0) { + metadata = g_object_new (GTH_TYPE_METADATA, + "id", "general::rating", + "raw", s, + "formatted", s, + NULL); + g_file_info_set_attribute_object (info, "general::rating", G_OBJECT (metadata)); + g_object_unref (metadata); + } + else + g_file_info_remove_attribute (info, "general::rating"); + } + + g_free (s); + g_object_unref (file_data); +} + + +const char * +gth_edit_general_page_real_get_name (GthEditCommentPage *self) +{ + return _("General"); +} + + +static void +gth_edit_general_page_finalize (GObject *object) +{ + GthEditGeneralPage *self; + + self = GTH_EDIT_GENERAL_PAGE (object); + + _g_object_unref (self->priv->info); + g_object_unref (self->priv->builder); + + G_OBJECT_CLASS (gth_edit_general_page_parent_class)->finalize (object); +} + + +static void +gth_edit_general_page_class_init (GthEditGeneralPageClass *klass) +{ + g_type_class_add_private (klass, sizeof (GthEditGeneralPagePrivate)); + + G_OBJECT_CLASS (klass)->finalize = gth_edit_general_page_finalize; +} + + +static void +date_combobox_changed_cb (GtkComboBox *widget, + gpointer user_data) +{ + GthEditGeneralPage *self = user_data; + char *value; + + value = get_date_from_option (self, gtk_combo_box_get_active (widget), self->priv->info); + gth_time_selector_set_exif_date (GTH_TIME_SELECTOR (self->priv->date_selector), value); + gtk_widget_set_sensitive (self->priv->date_selector, ! g_str_equal (value, "")); + + g_free (value); +} + + +static void +tags_entry_list_collapsed_cb (GthTagsEntry *widget, + gpointer user_data) +{ + GtkWidget *toplevel; + int width; + + /* collapse the dialog height */ + + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (widget)); + if (! gtk_widget_is_toplevel (toplevel)) + return; + + gtk_window_get_size (GTK_WINDOW (toplevel), &width, NULL); + gtk_window_resize (GTK_WINDOW (toplevel), width, 1); +} + + +static void +gth_edit_general_page_init (GthEditGeneralPage *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_EDIT_GENERAL_PAGE, GthEditGeneralPagePrivate); + self->priv->info = NULL; + + gtk_container_set_border_width (GTK_CONTAINER (self), 12); + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL); + + self->priv->builder = _gtk_builder_new_from_file ("edit-comment-page.ui", "edit_metadata"); + gtk_box_pack_start (GTK_BOX (self), _gtk_builder_get_widget (self->priv->builder, "content"), TRUE, TRUE, 0); + + self->priv->date_combobox = gtk_combo_box_text_new (); + _gtk_combo_box_append_texts (GTK_COMBO_BOX_TEXT (self->priv->date_combobox), + _("No date"), + _("The following date"), + _("Current date"), + _("Date photo was taken"), + _("Last modified date"), + _("File creation date"), + _("Do not modify"), + NULL); + gtk_widget_show (self->priv->date_combobox); + gtk_box_pack_start (GTK_BOX (GET_WIDGET ("date_combobox_container")), self->priv->date_combobox, TRUE, TRUE, 0); + + g_signal_connect (self->priv->date_combobox, + "changed", + G_CALLBACK (date_combobox_changed_cb), + self); + + self->priv->date_selector = gth_time_selector_new (); + gtk_widget_show (self->priv->date_selector); + gtk_box_pack_start (GTK_BOX (GET_WIDGET ("date_selector_container")), self->priv->date_selector, FALSE, FALSE, 0); + gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("date_label")), self->priv->date_combobox); + + self->priv->tags_entry = gth_tags_entry_new (); + gtk_widget_show (self->priv->tags_entry); + gtk_box_pack_start (GTK_BOX (GET_WIDGET ("tags_entry_container")), self->priv->tags_entry, TRUE, TRUE, 0); + gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("tags_label")), self->priv->tags_entry); + + g_signal_connect (self->priv->tags_entry, + "list-collapsed", + G_CALLBACK (tags_entry_list_collapsed_cb), + self); +} + + +static void +gth_edit_general_page_gth_edit_general_page_interface_init (GthEditCommentPageInterface *iface) +{ + iface->set_file_list = gth_edit_general_page_real_set_file_list; + iface->update_info = gth_edit_general_page_real_update_info; + iface->get_name = gth_edit_general_page_real_get_name; +} diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-edit-general-page.h gthumb-3.0.0/extensions/edit_metadata/gth-edit-general-page.h --- gthumb-2.14.3/extensions/edit_metadata/gth-edit-general-page.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-edit-general-page.h 2012-03-06 15:26:06.000000000 +0000 @@ -0,0 +1,53 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_EDIT_GENERAL_PAGE_H +#define GTH_EDIT_GENERAL_PAGE_H + +#include +#include +#include + +#define GTH_TYPE_EDIT_GENERAL_PAGE (gth_edit_general_page_get_type ()) +#define GTH_EDIT_GENERAL_PAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_EDIT_GENERAL_PAGE, GthEditGeneralPage)) +#define GTH_EDIT_GENERAL_PAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GTH_TYPE_EDIT_GENERAL_PAGE, GthEditGeneralPageClass)) +#define GTH_IS_EDIT_GENERAL_PAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTH_TYPE_EDIT_GENERAL_PAGE)) +#define GTH_IS_EDIT_GENERAL_PAGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTH_TYPE_EDIT_GENERAL_PAGE)) +#define GTH_EDIT_GENERAL_PAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GTH_TYPE_EDIT_GENERAL_PAGE, GthEditGeneralPageClass)) + +typedef struct _GthEditGeneralPage GthEditGeneralPage; +typedef struct _GthEditGeneralPagePrivate GthEditGeneralPagePrivate; +typedef struct _GthEditGeneralPageClass GthEditGeneralPageClass; + +struct _GthEditGeneralPage +{ + GtkBox __parent; + GthEditGeneralPagePrivate *priv; +}; + +struct _GthEditGeneralPageClass +{ + GtkBoxClass __parent_class; +}; + +GType gth_edit_general_page_get_type (void) G_GNUC_CONST; + +#endif /* GTH_EDIT_GENERAL_PAGE_H */ diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-edit-metadata-dialog.c gthumb-3.0.0/extensions/edit_metadata/gth-edit-metadata-dialog.c --- gthumb-2.14.3/extensions/edit_metadata/gth-edit-metadata-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-edit-metadata-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -3,7 +3,7 @@ /* * GThumb * - * Copyright (C) 2009 Free Software Foundation, Inc. + * Copyright (C) 2011 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,231 +20,30 @@ */ #include -#include #include "gth-edit-metadata-dialog.h" -#define GTH_EDIT_METADATA_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_EDIT_METADATA_DIALOG, GthEditMetadataDialogPrivate)) - - -static gpointer gth_edit_metadata_dialog_parent_class = NULL; - - -struct _GthEditMetadataDialogPrivate { - GtkWidget *notebook; - GtkWidget *save_changed_checkbutton; -}; - - -static void -gth_edit_metadata_dialog_class_init (GthEditMetadataDialogClass *klass) -{ - gth_edit_metadata_dialog_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (GthEditMetadataDialogPrivate)); -} - - -static void -gth_edit_metadata_dialog_init (GthEditMetadataDialog *edit_metadata_dialog) -{ - edit_metadata_dialog->priv = GTH_EDIT_METADATA_DIALOG_GET_PRIVATE (edit_metadata_dialog); -} - - -GType -gth_edit_metadata_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthEditMetadataDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_edit_metadata_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthEditMetadataDialog), - 0, - (GInstanceInitFunc) gth_edit_metadata_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthEditMetadataDialog", - &g_define_type_info, - 0); - } - - return type; -} +G_DEFINE_INTERFACE (GthEditMetadataDialog, gth_edit_metadata_dialog, 0) static void -gth_edit_metadata_dialog_construct (GthEditMetadataDialog *self) +gth_edit_metadata_dialog_default_init (GthEditMetadataDialogInterface *iface) { - GtkWidget *vbox; - GArray *pages; - int i; - - gtk_window_set_resizable (GTK_WINDOW (self), TRUE); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); - gtk_container_set_border_width (GTK_CONTAINER (self), 5); - - gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_SAVE, GTK_RESPONSE_OK); - - vbox = gtk_vbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - gtk_widget_show (vbox); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), vbox, TRUE, TRUE, 0); - - self->priv->notebook = gtk_notebook_new (); - gtk_widget_show (self->priv->notebook); - gtk_box_pack_start (GTK_BOX (vbox), self->priv->notebook, TRUE, TRUE, 0); - - self->priv->save_changed_checkbutton = gtk_check_button_new_with_mnemonic (_("Save only cha_nged fields")); - gtk_widget_show (self->priv->save_changed_checkbutton); - gtk_box_pack_start (GTK_BOX (vbox), self->priv->save_changed_checkbutton, FALSE, FALSE, 0); - - pages = gth_main_get_type_set ("edit-metadata-dialog-page"); - if (pages == NULL) - return; - - for (i = 0; i < pages->len; i++) { - GType page_type; - GtkWidget *page; - - page_type = g_array_index (pages, GType, i); - page = g_object_new (page_type, NULL); - if (! GTH_IS_EDIT_METADATA_PAGE (page)) { - g_object_unref (page); - continue; - } - - gtk_widget_show (page); - gtk_notebook_append_page (GTK_NOTEBOOK (self->priv->notebook), - page, - gtk_label_new (gth_edit_metadata_page_get_name (GTH_EDIT_METADATA_PAGE (page)))); - } -} - - -GtkWidget * -gth_edit_metadata_dialog_new (void) -{ - GthEditMetadataDialog *self; - - self = g_object_new (GTH_TYPE_EDIT_METADATA_DIALOG, NULL); - gth_edit_metadata_dialog_construct (self); - - return (GtkWidget *) self; + /* void */ } void -gth_edit_metadata_dialog_set_file_list (GthEditMetadataDialog *dialog, - GList *file_list) +gth_edit_metadata_dialog_set_file_list (GthEditMetadataDialog *self, + GList *file_list) { - int n_files; - char *title; - GList *pages; - GList *scan; - - if (file_list == NULL) - return; - - n_files = g_list_length (file_list); - if (n_files == 1) { - GthFileData *file_data = file_list->data; - - /* Translators: the %s symbol in the string is a file name */ - title = g_strdup_printf (_("%s Metadata"), g_file_info_get_display_name (file_data->info)); - gtk_window_set_title (GTK_WINDOW (dialog), title); - } - else { - title = g_strdup_printf (g_dngettext (NULL, "%d file", "%d files", n_files), n_files); - gtk_window_set_title (GTK_WINDOW (dialog), title); - } - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->save_changed_checkbutton), n_files > 1); - gtk_widget_set_sensitive (dialog->priv->save_changed_checkbutton, n_files > 1); - - pages = gtk_container_get_children (GTK_CONTAINER (dialog->priv->notebook)); - for (scan = pages; scan; scan = scan->next) - gth_edit_metadata_page_set_file_list (GTH_EDIT_METADATA_PAGE (scan->data), file_list); - - g_list_free (pages); - g_free (title); + GTH_EDIT_METADATA_DIALOG_GET_INTERFACE (self)->set_file_list (self, file_list); } void -gth_edit_metadata_dialog_update_info (GthEditMetadataDialog *dialog, - GList *file_list /* GthFileData list */) -{ - gboolean only_modified_fields; - GList *pages; - GList *scan; - - only_modified_fields = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->priv->save_changed_checkbutton)); - pages = gtk_container_get_children (GTK_CONTAINER (dialog->priv->notebook)); - for (scan = pages; scan; scan = scan->next) { - GList *scan_file; - - for (scan_file = file_list; scan_file; scan_file = scan_file->next) { - GthFileData *file_data = scan_file->data; - gth_edit_metadata_page_update_info (GTH_EDIT_METADATA_PAGE (scan->data), file_data->info, only_modified_fields); - } - } - - g_list_free (pages); -} - - -/* -- gth_edit_metadata_dialog_page -- */ - - -GType -gth_edit_metadata_page_get_type (void) { - static GType gth_edit_metadata_page_type_id = 0; - if (gth_edit_metadata_page_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthEditMetadataPageIface), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) NULL, - (GClassFinalizeFunc) NULL, - NULL, - 0, - 0, - (GInstanceInitFunc) NULL, - NULL - }; - gth_edit_metadata_page_type_id = g_type_register_static (G_TYPE_INTERFACE, "GthEditMetadataPageIface", &g_define_type_info, 0); - } - return gth_edit_metadata_page_type_id; -} - - -void -gth_edit_metadata_page_set_file_list (GthEditMetadataPage *self, - GList *file_list) -{ - GTH_EDIT_METADATA_PAGE_GET_INTERFACE (self)->set_file_list (self, file_list); -} - - -void -gth_edit_metadata_page_update_info (GthEditMetadataPage *self, - GFileInfo *info, - gboolean only_modified_fields) -{ - GTH_EDIT_METADATA_PAGE_GET_INTERFACE (self)->update_info (self, info, only_modified_fields); -} - - -const char * -gth_edit_metadata_page_get_name (GthEditMetadataPage *self) +gth_edit_metadata_dialog_update_info (GthEditMetadataDialog *self, + GList *file_list) { - return GTH_EDIT_METADATA_PAGE_GET_INTERFACE (self)->get_name (self); + GTH_EDIT_METADATA_DIALOG_GET_INTERFACE (self)->update_info (self, file_list); } diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-edit-metadata-dialog.h gthumb-3.0.0/extensions/edit_metadata/gth-edit-metadata-dialog.h --- gthumb-2.14.3/extensions/edit_metadata/gth-edit-metadata-dialog.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-edit-metadata-dialog.h 2012-02-19 15:01:32.000000000 +0000 @@ -3,7 +3,7 @@ /* * GThumb * - * Copyright (C) 2009 Free Software Foundation, Inc. + * Copyright (C) 2011 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,72 +18,40 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - + #ifndef GTH_EDIT_METADATA_DIALOG_H #define GTH_EDIT_METADATA_DIALOG_H #include -#include G_BEGIN_DECLS -#define GTH_TYPE_EDIT_METADATA_DIALOG (gth_edit_metadata_dialog_get_type ()) -#define GTH_EDIT_METADATA_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_EDIT_METADATA_DIALOG, GthEditMetadataDialog)) -#define GTH_EDIT_METADATA_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_EDIT_METADATA_DIALOG, GthEditMetadataDialogClass)) -#define GTH_IS_EDIT_METADATA_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_EDIT_METADATA_DIALOG)) -#define GTH_IS_EDIT_METADATA_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_EDIT_METADATA_DIALOG)) -#define GTH_EDIT_METADATA_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_EDIT_METADATA_DIALOG, GthEditMetadataDialogClass)) - -#define GTH_TYPE_EDIT_METADATA_PAGE (gth_edit_metadata_page_get_type ()) -#define GTH_EDIT_METADATA_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_EDIT_METADATA_PAGE, GthEditMetadataPage)) -#define GTH_IS_EDIT_METADATA_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_EDIT_METADATA_PAGE)) -#define GTH_EDIT_METADATA_PAGE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_EDIT_METADATA_PAGE, GthEditMetadataPageIface)) +#define GTH_TYPE_EDIT_METADATA_DIALOG (gth_edit_metadata_dialog_get_type ()) +#define GTH_EDIT_METADATA_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_EDIT_METADATA_DIALOG, GthEditMetadataDialog)) +#define GTH_IS_EDIT_METADATA_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_EDIT_METADATA_DIALOG)) +#define GTH_EDIT_METADATA_DIALOG_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_EDIT_METADATA_DIALOG, GthEditMetadataDialogInterface)) typedef struct _GthEditMetadataDialog GthEditMetadataDialog; -typedef struct _GthEditMetadataDialogClass GthEditMetadataDialogClass; -typedef struct _GthEditMetadataDialogPrivate GthEditMetadataDialogPrivate; - -struct _GthEditMetadataDialog { - GtkDialog parent_instance; - GthEditMetadataDialogPrivate *priv; -}; - -struct _GthEditMetadataDialogClass { - GtkDialogClass parent_class; -}; - -typedef struct _GthEditMetadataPage GthEditMetadataPage; -typedef struct _GthEditMetadataPageIface GthEditMetadataPageIface; +typedef struct _GthEditMetadataDialogInterface GthEditMetadataDialogInterface; -struct _GthEditMetadataPageIface { +struct _GthEditMetadataDialogInterface { GTypeInterface parent_iface; - void (*set_file_list) (GthEditMetadataPage *self, - GList *file_list /* GthFileData list */); - void (*update_info) (GthEditMetadataPage *self, - GFileInfo *info, - gboolean only_modified_fields); - const char * (*get_name) (GthEditMetadataPage *self); + + void (*set_file_list) (GthEditMetadataDialog *dialog, + GList *file_list /* GthFileData list */); + void (*update_info) (GthEditMetadataDialog *dialog, + GList *file_list /* GthFileData list */); }; /* GthEditMetadataDialog */ GType gth_edit_metadata_dialog_get_type (void); -GtkWidget * gth_edit_metadata_dialog_new (void); void gth_edit_metadata_dialog_set_file_list (GthEditMetadataDialog *dialog, GList *file_list /* GthFileData list */); void gth_edit_metadata_dialog_update_info (GthEditMetadataDialog *dialog, - GList *file_list /* GthFileData list */); - -/* GthEditMetadataPage */ - -GType gth_edit_metadata_page_get_type (void); -void gth_edit_metadata_page_set_file_list (GthEditMetadataPage *self, - GList *file_list /* GthFileData list */); -void gth_edit_metadata_page_update_info (GthEditMetadataPage *self, - GFileInfo *info, - gboolean only_modified_fields); -const char * gth_edit_metadata_page_get_name (GthEditMetadataPage *self); + GList *file_list /* GthFileData list */); G_END_DECLS + #endif /* GTH_EDIT_METADATA_DIALOG_H */ diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-edit-tags-dialog.c gthumb-3.0.0/extensions/edit_metadata/gth-edit-tags-dialog.c --- gthumb-2.14.3/extensions/edit_metadata/gth-edit-tags-dialog.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-edit-tags-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,201 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include "gth-edit-metadata-dialog.h" +#include "gth-edit-tags-dialog.h" +#include "utils.h" + + +#define GET_WIDGET(name) _gtk_builder_get_widget (self->priv->builder, (name)) + + +struct _GthEditTagsDialogPrivate { + GtkBuilder *builder; + GtkWidget *tags_entry; +}; + + +static void gth_edit_tags_dialog_gth_edit_metadata_dialog_interface_init (GthEditMetadataDialogInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthEditTagsDialog, + gth_edit_tags_dialog, + GTK_TYPE_DIALOG, + G_IMPLEMENT_INTERFACE (GTH_TYPE_EDIT_METADATA_DIALOG, + gth_edit_tags_dialog_gth_edit_metadata_dialog_interface_init)) + + +static void +gth_edit_tags_dialog_finalize (GObject *object) +{ + GthEditTagsDialog *self; + + self = GTH_EDIT_TAGS_DIALOG (object); + _g_object_unref (self->priv->builder); + + G_OBJECT_CLASS (gth_edit_tags_dialog_parent_class)->finalize (object); +} + + +static void +gth_edit_tags_dialog_set_file_list (GthEditMetadataDialog *base, + GList *file_list) +{ + GthEditTagsDialog *self = GTH_EDIT_TAGS_DIALOG (base); + int n_files; + char *title; + GHashTable *common_tags; + GHashTable *no_common_tags; + GList *common_tags_list; + GList *no_common_tags_list; + + n_files = g_list_length (file_list); + + /* update the title */ + + if (n_files == 1) { + GthFileData *file_data = file_list->data; + + /* Translators: the %s symbol in the string is a file name */ + title = g_strdup_printf (_("%s Tags"), g_file_info_get_display_name (file_data->info)); + } + else + title = g_strdup_printf (g_dngettext (NULL, "%d file", "%d files", n_files), n_files); + gtk_window_set_title (GTK_WINDOW (self), title); + + g_free (title); + + /* update the tag entry */ + + utils_get_common_tags (file_list, &common_tags, &no_common_tags); + common_tags_list = g_hash_table_get_keys (common_tags); + no_common_tags_list = g_hash_table_get_keys (no_common_tags); + gth_tags_entry_set_tag_list (GTH_TAGS_ENTRY (self->priv->tags_entry), + common_tags_list, + no_common_tags_list); + + g_list_free (no_common_tags_list); + g_list_free (common_tags_list); + g_hash_table_unref (no_common_tags); + g_hash_table_unref (common_tags); +} + + +static void +gth_edit_tags_dialog_update_info (GthEditMetadataDialog *base, + GList *file_list /* GthFileData list */) +{ + GthEditTagsDialog *self = GTH_EDIT_TAGS_DIALOG (base); + GList *checked_tags; + GList *inconsistent_tags; + GList *scan; + + gth_tags_entry_get_tag_list (GTH_TAGS_ENTRY (self->priv->tags_entry), + TRUE, + &checked_tags, + &inconsistent_tags); + + for (scan = file_list; scan; scan = scan->next) { + GthFileData *file_data = scan->data; + GList *new_tags; + GHashTable *old_tags; + GList *scan_tags; + + new_tags = _g_string_list_dup (checked_tags); + + /* keep the inconsistent tags */ + + old_tags = _g_hash_table_from_string_list ((GthStringList *) g_file_info_get_attribute_object (file_data->info, "general::tags")); + for (scan_tags = inconsistent_tags; scan_tags; scan_tags = scan_tags->next) { + char *inconsistent_tag = scan_tags->data; + + if (g_hash_table_lookup (old_tags, inconsistent_tag) != NULL) + new_tags = g_list_prepend (new_tags, g_strdup (inconsistent_tag)); + } + g_hash_table_unref (old_tags); + + /* update the general::tags attribute */ + + if (new_tags != NULL) { + GthStringList *file_tags; + + new_tags = g_list_sort (new_tags, (GCompareFunc) g_strcmp0); + file_tags = gth_string_list_new (new_tags); + g_file_info_set_attribute_object (file_data->info, "general::tags", G_OBJECT (file_tags)); + + _g_object_unref (file_tags); + _g_string_list_free (new_tags); + } + else + g_file_info_remove_attribute (file_data->info, "general::tags"); + } + + g_list_free (inconsistent_tags); + _g_string_list_free (checked_tags); +} + + +static void +gth_edit_tags_dialog_gth_edit_metadata_dialog_interface_init (GthEditMetadataDialogInterface *iface) +{ + iface->set_file_list = gth_edit_tags_dialog_set_file_list; + iface->update_info = gth_edit_tags_dialog_update_info; +} + + +static void +gth_edit_tags_dialog_class_init (GthEditTagsDialogClass *klass) +{ + GObjectClass *object_class; + + g_type_class_add_private (klass, sizeof (GthEditTagsDialogPrivate)); + + object_class = (GObjectClass*) klass; + object_class->finalize = gth_edit_tags_dialog_finalize; +} + + +static void +gth_edit_tags_dialog_init (GthEditTagsDialog *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_EDIT_TAGS_DIALOG, GthEditTagsDialogPrivate); + self->priv->builder = _gtk_builder_new_from_file ("tag-chooser.ui", "edit_metadata"); + + gtk_window_set_title (GTK_WINDOW (self), _("Assign Tags")); + gtk_window_set_resizable (GTK_WINDOW (self), TRUE); + gtk_window_set_default_size (GTK_WINDOW (self), -1, 500); + gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); + gtk_container_set_border_width (GTK_CONTAINER (self), 5); + + gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); + gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_SAVE, GTK_RESPONSE_APPLY); + gtk_dialog_add_button (GTK_DIALOG (self), _("Sa_ve and Close"), GTK_RESPONSE_OK); + + self->priv->tags_entry = gth_tags_entry_new (); + gth_tags_entry_set_expanded (GTH_TAGS_ENTRY (self->priv->tags_entry), TRUE); + gtk_widget_show (self->priv->tags_entry); + gtk_box_pack_start (GTK_BOX (GET_WIDGET ("tag_entry_box")), self->priv->tags_entry, TRUE, TRUE, 0); + + gtk_container_set_border_width (GTK_CONTAINER (GET_WIDGET ("content")), 5); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), GET_WIDGET ("content"), TRUE, TRUE, 0); +} diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-edit-tags-dialog.h gthumb-3.0.0/extensions/edit_metadata/gth-edit-tags-dialog.h --- gthumb-2.14.3/extensions/edit_metadata/gth-edit-tags-dialog.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-edit-tags-dialog.h 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_EDIT_TAGS_DIALOG_H +#define GTH_EDIT_TAGS_DIALOG_H + +#include +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_EDIT_TAGS_DIALOG (gth_edit_tags_dialog_get_type ()) +#define GTH_EDIT_TAGS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_EDIT_TAGS_DIALOG, GthEditTagsDialog)) +#define GTH_EDIT_TAGS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_EDIT_TAGS_DIALOG, GthEditTagsDialogClass)) +#define GTH_IS_EDIT_TAGS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_EDIT_TAGS_DIALOG)) +#define GTH_IS_EDIT_TAGS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_EDIT_TAGS_DIALOG)) +#define GTH_EDIT_TAGS_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_EDIT_TAGS_DIALOG, GthEditTagsDialogClass)) + +typedef struct _GthEditTagsDialog GthEditTagsDialog; +typedef struct _GthEditTagsDialogClass GthEditTagsDialogClass; +typedef struct _GthEditTagsDialogPrivate GthEditTagsDialogPrivate; + +struct _GthEditTagsDialog { + GtkDialog parent_instance; + GthEditTagsDialogPrivate *priv; +}; + +struct _GthEditTagsDialogClass { + GtkDialogClass parent_class; +}; + +GType gth_edit_tags_dialog_get_type (void); +GtkWidget * gth_edit_tags_dialog_new (void); + + +G_END_DECLS + +#endif /* GTH_EDIT_TAGS_DIALOG_H */ diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-tag-chooser-dialog.c gthumb-3.0.0/extensions/edit_metadata/gth-tag-chooser-dialog.c --- gthumb-2.14.3/extensions/edit_metadata/gth-tag-chooser-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-tag-chooser-dialog.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,337 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include "gth-tag-chooser-dialog.h" - -#define GTH_TAG_CHOOSER_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_TAG_CHOOSER_DIALOG, GthTagChooserDialogPrivate)) -#define GET_WIDGET(name) _gtk_builder_get_widget (self->priv->builder, (name)) - - -enum { - NAME_COLUMN = 0, - SELECTED_COLUMN -}; - - -static gpointer parent_class = NULL; - - -struct _GthTagChooserDialogPrivate { - GtkBuilder *builder; -}; - - -static void -gth_tag_chooser_dialog_finalize (GObject *object) -{ - GthTagChooserDialog *self; - - self = GTH_TAG_CHOOSER_DIALOG (object); - - _g_object_unref (self->priv->builder); - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - - -static void -gth_tag_chooser_dialog_class_init (GthTagChooserDialogClass *klass) -{ - GObjectClass *object_class; - - parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (GthTagChooserDialogPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = gth_tag_chooser_dialog_finalize; -} - - -static void -new_button_clicked_cb (GtkButton *button, - gpointer user_data) -{ - GthTagChooserDialog *self = user_data; - GtkTreeIter iter; - GtkTreePath *path; - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("tags_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("tags_liststore")), &iter, - SELECTED_COLUMN, TRUE, - NAME_COLUMN, _("New tag"), - -1); - - path = gtk_tree_model_get_path (GTK_TREE_MODEL (GET_WIDGET ("tags_liststore")), &iter); - gtk_tree_view_set_cursor_on_cell (GTK_TREE_VIEW (GET_WIDGET ("tags_treeview")), - path, - GTK_TREE_VIEW_COLUMN (GET_WIDGET ("treeviewcolumn2")), - GTK_CELL_RENDERER (GET_WIDGET ("name_cellrenderertext")), - TRUE); - - gtk_tree_path_free (path); -} - - -static void -delete_button_clicked_cb (GtkButton *button, - gpointer user_data) -{ - GthTagChooserDialog *self = user_data; - GtkTreeIter iter; - char *selected_tag; - GthTagsFile *tags; - - if (! gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (GET_WIDGET ("tags_treeview"))), NULL, &iter)) - return; - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("tags_liststore")), &iter, - NAME_COLUMN, &selected_tag, - -1); - - tags = gth_main_get_default_tag_file (); - gth_tags_file_remove (tags, selected_tag); - gth_main_tags_changed (); - - gtk_list_store_remove (GTK_LIST_STORE (GET_WIDGET ("tags_liststore")), &iter); - - g_free (selected_tag); -} - - -static void -selected_cellrenderertoggle_toggled_cb (GtkCellRendererToggle *cell_renderer, - char *path, - gpointer user_data) -{ - GthTagChooserDialog *self = user_data; - GtkTreePath *tpath; - GtkTreeIter iter; - - tpath = gtk_tree_path_new_from_string (path); - if (tpath == NULL) - return; - - if (gtk_tree_model_get_iter (GTK_TREE_MODEL (GET_WIDGET ("tags_liststore")), &iter, tpath)) { - gboolean selected; - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("tags_liststore")), &iter, - SELECTED_COLUMN, &selected, - -1); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("tags_liststore")), &iter, - SELECTED_COLUMN, ! selected, - -1); - } - - gtk_tree_path_free (tpath); -} - - -static void -name_cellrenderertext_edited_cb (GtkCellRendererText *renderer, - char *path, - char *new_text, - gpointer user_data) -{ - GthTagChooserDialog *self = user_data; - GtkTreePath *tree_path; - GtkTreeIter iter; - char *old_text; - GthTagsFile *tags; - - tree_path = gtk_tree_path_new_from_string (path); - if (! gtk_tree_model_get_iter (GTK_TREE_MODEL (GET_WIDGET ("tags_liststore")), - &iter, - tree_path)) - { - gtk_tree_path_free (tree_path); - return; - } - gtk_tree_path_free (tree_path); - - gtk_tree_model_get (GTK_TREE_MODEL (GET_WIDGET ("tags_liststore")), - &iter, - NAME_COLUMN, &old_text, - -1); - - tags = gth_main_get_default_tag_file (); - if (old_text != NULL) - gth_tags_file_remove (tags, old_text); - if (new_text != NULL) - gth_tags_file_add (tags, new_text); - gth_main_tags_changed (); - - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("tags_liststore")), - &iter, - NAME_COLUMN, new_text, - -1); - - g_free (old_text); -} - - -static int -tags_liststore_sort_func (GtkTreeModel *model, - GtkTreeIter *a, - GtkTreeIter *b, - gpointer user_data) -{ - char *name_a; - char *name_b; - int result; - - gtk_tree_model_get (model, a, NAME_COLUMN, &name_a, -1); - gtk_tree_model_get (model, b, NAME_COLUMN, &name_b, -1); - result = g_utf8_collate (name_a, name_b); - - g_free (name_a); - g_free (name_b); - - return result; -} - - -static void -gth_tag_chooser_dialog_init (GthTagChooserDialog *self) -{ - GtkWidget *content; - char **tags; - int i; - - self->priv = GTH_TAG_CHOOSER_DIALOG_GET_PRIVATE (self); - self->priv->builder = _gtk_builder_new_from_file ("tag-chooser.ui", "edit_metadata"); - - gtk_window_set_title (GTK_WINDOW (self), _("Assign Tags")); - gtk_window_set_resizable (GTK_WINDOW (self), FALSE); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 5); - gtk_container_set_border_width (GTK_CONTAINER (self), 5); - - gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK); - gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_HELP, GTK_RESPONSE_HELP); - - content = _gtk_builder_get_widget (self->priv->builder, "content"); - gtk_container_set_border_width (GTK_CONTAINER (content), 5); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), content, TRUE, TRUE, 0); - - gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (GET_WIDGET ("tags_liststore")), tags_liststore_sort_func, self, NULL); - gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (GET_WIDGET ("tags_liststore")), GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING); - - g_signal_connect (GET_WIDGET ("selected_cellrenderertoggle"), - "toggled", - G_CALLBACK (selected_cellrenderertoggle_toggled_cb), - self); - g_signal_connect (GET_WIDGET ("name_cellrenderertext"), - "edited", - G_CALLBACK (name_cellrenderertext_edited_cb), - self); - g_signal_connect (GET_WIDGET ("new_button"), - "clicked", - G_CALLBACK (new_button_clicked_cb), - self); - g_signal_connect (GET_WIDGET ("delete_button"), - "clicked", - G_CALLBACK (delete_button_clicked_cb), - self); - - tags = g_strdupv (gth_tags_file_get_tags (gth_main_get_default_tag_file ())); - for (i = 0; tags[i] != NULL; i++) { - GtkTreeIter iter; - - gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("tags_liststore")), &iter); - gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("tags_liststore")), &iter, - NAME_COLUMN, tags[i], - SELECTED_COLUMN, 0, - -1); - } - - g_strfreev (tags); -} - - -GType -gth_tag_chooser_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthTagChooserDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_tag_chooser_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthTagChooserDialog), - 0, - (GInstanceInitFunc) gth_tag_chooser_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthTagChooserDialog", - &g_define_type_info, - 0); - } - - return type; -} - - -GtkWidget * -gth_tag_chooser_dialog_new (void) -{ - return (GtkWidget *) g_object_new (GTH_TYPE_TAG_CHOOSER_DIALOG, NULL); -} - - -char ** -gth_tag_chooser_dialog_get_tags (GthTagChooserDialog *self) -{ - GtkTreeModel *model; - GtkTreeIter iter; - GList *tag_list; - char **tags; - - tag_list = NULL; - model = GTK_TREE_MODEL (GET_WIDGET ("tags_liststore")); - if (gtk_tree_model_get_iter_first (model, &iter)) { - do { - gboolean selected; - char *name; - - gtk_tree_model_get (model, &iter, - SELECTED_COLUMN, &selected, - NAME_COLUMN, &name, - -1); - if (selected) - tag_list = g_list_append (tag_list, name); - else - g_free (name); - } - while (gtk_tree_model_iter_next (model, &iter)); - } - - tags = _g_string_list_to_strv (tag_list); - _g_string_list_free (tag_list); - - return tags; -} diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-tag-chooser-dialog.h gthumb-3.0.0/extensions/edit_metadata/gth-tag-chooser-dialog.h --- gthumb-2.14.3/extensions/edit_metadata/gth-tag-chooser-dialog.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-tag-chooser-dialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2010 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_TAG_CHOOSER_DIALOG_H -#define GTH_TAG_CHOOSER_DIALOG_H - -#include -#include - -G_BEGIN_DECLS - -#define GTH_TYPE_TAG_CHOOSER_DIALOG (gth_tag_chooser_dialog_get_type ()) -#define GTH_TAG_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_TAG_CHOOSER_DIALOG, GthTagChooserDialog)) -#define GTH_TAG_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_TAG_CHOOSER_DIALOG, GthTagChooserDialogClass)) -#define GTH_IS_TAG_CHOOSER_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_TAG_CHOOSER_DIALOG)) -#define GTH_IS_TAG_CHOOSER_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_TAG_CHOOSER_DIALOG)) -#define GTH_TAG_CHOOSER_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_TAG_CHOOSER_DIALOG, GthTagChooserDialogClass)) - -typedef struct _GthTagChooserDialog GthTagChooserDialog; -typedef struct _GthTagChooserDialogClass GthTagChooserDialogClass; -typedef struct _GthTagChooserDialogPrivate GthTagChooserDialogPrivate; - -struct _GthTagChooserDialog { - GtkDialog parent_instance; - GthTagChooserDialogPrivate *priv; -}; - -struct _GthTagChooserDialogClass { - GtkDialogClass parent_class; -}; - -/* GthTagChooserDialog */ - -GType gth_tag_chooser_dialog_get_type (void); -GtkWidget * gth_tag_chooser_dialog_new (void); -char ** gth_tag_chooser_dialog_get_tags (GthTagChooserDialog *dialog); - -G_END_DECLS - -#endif /* GTH_TAG_CHOOSER_DIALOG_H */ diff -Nru gthumb-2.14.3/extensions/edit_metadata/gth-tag-task.c gthumb-3.0.0/extensions/edit_metadata/gth-tag-task.c --- gthumb-2.14.3/extensions/edit_metadata/gth-tag-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/gth-tag-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -30,7 +30,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthTagTask, gth_tag_task, GTH_TYPE_TASK) static void @@ -44,7 +44,7 @@ _g_object_list_unref (self->priv->file_list); _g_object_list_unref (self->priv->file_data_list); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_tag_task_parent_class)->finalize (object); } @@ -145,7 +145,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthTagTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -165,34 +164,6 @@ } -GType -gth_tag_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTagTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_tag_task_class_init, - NULL, - NULL, - sizeof (GthTagTask), - 0, - (GInstanceInitFunc) gth_tag_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthTagTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_tag_task_new (GList *file_list, char **tags) diff -Nru gthumb-2.14.3/extensions/edit_metadata/main.c gthumb-3.0.0/extensions/edit_metadata/main.c --- gthumb-2.14.3/extensions/edit_metadata/main.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/main.c 2012-02-19 15:01:32.000000000 +0000 @@ -24,7 +24,7 @@ #include #include #include "callbacks.h" -#include "gth-edit-comment-page.h" +#include "gth-edit-general-page.h" G_MODULE_EXPORT void @@ -39,12 +39,10 @@ **/ gth_hook_register ("delete-metadata", 3); - gth_main_register_type ("edit-metadata-dialog-page", GTH_TYPE_EDIT_COMMENT_PAGE); + gth_main_register_type ("edit-comment-dialog-page", GTH_TYPE_EDIT_GENERAL_PAGE); gth_hook_add_callback ("gth-browser-construct", 7, G_CALLBACK (edit_metadata__gth_browser_construct_cb), NULL); gth_hook_add_callback ("gth-browser-set-current-page", 5, G_CALLBACK (edit_metadata__gth_browser_set_current_page_cb), NULL); gth_hook_add_callback ("gth-browser-update-sensitivity", 10, G_CALLBACK (edit_metadata__gth_browser_update_sensitivity_cb), NULL); - gth_hook_add_callback ("gth-browser-file-list-popup-before", 5, G_CALLBACK (edit_metadata__gth_browser_file_list_popup_before_cb), NULL); - gth_hook_add_callback ("gth-browser-file-popup-before", 5, G_CALLBACK (edit_metadata__gth_browser_file_popup_before_cb), NULL); gth_hook_add_callback ("gth-browser-file-list-key-press", 10, G_CALLBACK (edit_metadata__gth_browser_file_list_key_press_cb), NULL); } diff -Nru gthumb-2.14.3/extensions/edit_metadata/Makefile.am gthumb-3.0.0/extensions/edit_metadata/Makefile.am --- gthumb-2.14.3/extensions/edit_metadata/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/Makefile.am 2012-02-19 15:01:31.000000000 +0000 @@ -12,15 +12,19 @@ dlg-edit-metadata.h \ gth-delete-metadata-task.c \ gth-delete-metadata-task.h \ - gth-edit-comment-page.c \ - gth-edit-comment-page.h \ + gth-edit-comment-dialog.c \ + gth-edit-comment-dialog.h \ + gth-edit-general-page.c \ + gth-edit-general-page.h \ gth-edit-metadata-dialog.c \ gth-edit-metadata-dialog.h \ - gth-tag-chooser-dialog.c \ - gth-tag-chooser-dialog.h \ + gth-edit-tags-dialog.c \ + gth-edit-tags-dialog.h \ gth-tag-task.c \ gth-tag-task.h \ - main.c + main.c \ + utils.c \ + utils.h libedit_metadata_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libedit_metadata_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) diff -Nru gthumb-2.14.3/extensions/edit_metadata/Makefile.in gthumb-3.0.0/extensions/edit_metadata/Makefile.in --- gthumb-2.14.3/extensions/edit_metadata/Makefile.in 2012-03-25 18:34:09.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/Makefile.in 2012-04-23 18:09:45.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -84,11 +101,12 @@ libedit_metadata_la-callbacks.lo \ libedit_metadata_la-dlg-edit-metadata.lo \ libedit_metadata_la-gth-delete-metadata-task.lo \ - libedit_metadata_la-gth-edit-comment-page.lo \ + libedit_metadata_la-gth-edit-comment-dialog.lo \ + libedit_metadata_la-gth-edit-general-page.lo \ libedit_metadata_la-gth-edit-metadata-dialog.lo \ - libedit_metadata_la-gth-tag-chooser-dialog.lo \ + libedit_metadata_la-gth-edit-tags-dialog.lo \ libedit_metadata_la-gth-tag-task.lo \ - libedit_metadata_la-main.lo + libedit_metadata_la-main.lo libedit_metadata_la-utils.lo libedit_metadata_la_OBJECTS = $(am_libedit_metadata_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -132,6 +150,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -211,10 +234,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -222,6 +243,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -261,6 +283,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -309,8 +333,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -341,6 +363,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -383,15 +406,19 @@ dlg-edit-metadata.h \ gth-delete-metadata-task.c \ gth-delete-metadata-task.h \ - gth-edit-comment-page.c \ - gth-edit-comment-page.h \ + gth-edit-comment-dialog.c \ + gth-edit-comment-dialog.h \ + gth-edit-general-page.c \ + gth-edit-general-page.h \ gth-edit-metadata-dialog.c \ gth-edit-metadata-dialog.h \ - gth-tag-chooser-dialog.c \ - gth-tag-chooser-dialog.h \ + gth-edit-tags-dialog.c \ + gth-edit-tags-dialog.h \ gth-tag-task.c \ gth-tag-task.h \ - main.c + main.c \ + utils.c \ + utils.h libedit_metadata_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libedit_metadata_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) @@ -438,7 +465,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -446,6 +472,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -480,11 +508,13 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-callbacks.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-dlg-edit-metadata.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-gth-delete-metadata-task.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-gth-edit-comment-page.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-gth-edit-comment-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-gth-edit-general-page.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-gth-edit-metadata-dialog.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-gth-tag-chooser-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-gth-edit-tags-dialog.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-gth-tag-task.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-main.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libedit_metadata_la-utils.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -535,12 +565,19 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -c -o libedit_metadata_la-gth-delete-metadata-task.lo `test -f 'gth-delete-metadata-task.c' || echo '$(srcdir)/'`gth-delete-metadata-task.c -libedit_metadata_la-gth-edit-comment-page.lo: gth-edit-comment-page.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -MT libedit_metadata_la-gth-edit-comment-page.lo -MD -MP -MF $(DEPDIR)/libedit_metadata_la-gth-edit-comment-page.Tpo -c -o libedit_metadata_la-gth-edit-comment-page.lo `test -f 'gth-edit-comment-page.c' || echo '$(srcdir)/'`gth-edit-comment-page.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_metadata_la-gth-edit-comment-page.Tpo $(DEPDIR)/libedit_metadata_la-gth-edit-comment-page.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-edit-comment-page.c' object='libedit_metadata_la-gth-edit-comment-page.lo' libtool=yes @AMDEPBACKSLASH@ +libedit_metadata_la-gth-edit-comment-dialog.lo: gth-edit-comment-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -MT libedit_metadata_la-gth-edit-comment-dialog.lo -MD -MP -MF $(DEPDIR)/libedit_metadata_la-gth-edit-comment-dialog.Tpo -c -o libedit_metadata_la-gth-edit-comment-dialog.lo `test -f 'gth-edit-comment-dialog.c' || echo '$(srcdir)/'`gth-edit-comment-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_metadata_la-gth-edit-comment-dialog.Tpo $(DEPDIR)/libedit_metadata_la-gth-edit-comment-dialog.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-edit-comment-dialog.c' object='libedit_metadata_la-gth-edit-comment-dialog.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -c -o libedit_metadata_la-gth-edit-comment-dialog.lo `test -f 'gth-edit-comment-dialog.c' || echo '$(srcdir)/'`gth-edit-comment-dialog.c + +libedit_metadata_la-gth-edit-general-page.lo: gth-edit-general-page.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -MT libedit_metadata_la-gth-edit-general-page.lo -MD -MP -MF $(DEPDIR)/libedit_metadata_la-gth-edit-general-page.Tpo -c -o libedit_metadata_la-gth-edit-general-page.lo `test -f 'gth-edit-general-page.c' || echo '$(srcdir)/'`gth-edit-general-page.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_metadata_la-gth-edit-general-page.Tpo $(DEPDIR)/libedit_metadata_la-gth-edit-general-page.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-edit-general-page.c' object='libedit_metadata_la-gth-edit-general-page.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -c -o libedit_metadata_la-gth-edit-comment-page.lo `test -f 'gth-edit-comment-page.c' || echo '$(srcdir)/'`gth-edit-comment-page.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -c -o libedit_metadata_la-gth-edit-general-page.lo `test -f 'gth-edit-general-page.c' || echo '$(srcdir)/'`gth-edit-general-page.c libedit_metadata_la-gth-edit-metadata-dialog.lo: gth-edit-metadata-dialog.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -MT libedit_metadata_la-gth-edit-metadata-dialog.lo -MD -MP -MF $(DEPDIR)/libedit_metadata_la-gth-edit-metadata-dialog.Tpo -c -o libedit_metadata_la-gth-edit-metadata-dialog.lo `test -f 'gth-edit-metadata-dialog.c' || echo '$(srcdir)/'`gth-edit-metadata-dialog.c @@ -549,12 +586,12 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -c -o libedit_metadata_la-gth-edit-metadata-dialog.lo `test -f 'gth-edit-metadata-dialog.c' || echo '$(srcdir)/'`gth-edit-metadata-dialog.c -libedit_metadata_la-gth-tag-chooser-dialog.lo: gth-tag-chooser-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -MT libedit_metadata_la-gth-tag-chooser-dialog.lo -MD -MP -MF $(DEPDIR)/libedit_metadata_la-gth-tag-chooser-dialog.Tpo -c -o libedit_metadata_la-gth-tag-chooser-dialog.lo `test -f 'gth-tag-chooser-dialog.c' || echo '$(srcdir)/'`gth-tag-chooser-dialog.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_metadata_la-gth-tag-chooser-dialog.Tpo $(DEPDIR)/libedit_metadata_la-gth-tag-chooser-dialog.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-tag-chooser-dialog.c' object='libedit_metadata_la-gth-tag-chooser-dialog.lo' libtool=yes @AMDEPBACKSLASH@ +libedit_metadata_la-gth-edit-tags-dialog.lo: gth-edit-tags-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -MT libedit_metadata_la-gth-edit-tags-dialog.lo -MD -MP -MF $(DEPDIR)/libedit_metadata_la-gth-edit-tags-dialog.Tpo -c -o libedit_metadata_la-gth-edit-tags-dialog.lo `test -f 'gth-edit-tags-dialog.c' || echo '$(srcdir)/'`gth-edit-tags-dialog.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_metadata_la-gth-edit-tags-dialog.Tpo $(DEPDIR)/libedit_metadata_la-gth-edit-tags-dialog.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-edit-tags-dialog.c' object='libedit_metadata_la-gth-edit-tags-dialog.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -c -o libedit_metadata_la-gth-tag-chooser-dialog.lo `test -f 'gth-tag-chooser-dialog.c' || echo '$(srcdir)/'`gth-tag-chooser-dialog.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -c -o libedit_metadata_la-gth-edit-tags-dialog.lo `test -f 'gth-edit-tags-dialog.c' || echo '$(srcdir)/'`gth-edit-tags-dialog.c libedit_metadata_la-gth-tag-task.lo: gth-tag-task.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -MT libedit_metadata_la-gth-tag-task.lo -MD -MP -MF $(DEPDIR)/libedit_metadata_la-gth-tag-task.Tpo -c -o libedit_metadata_la-gth-tag-task.lo `test -f 'gth-tag-task.c' || echo '$(srcdir)/'`gth-tag-task.c @@ -570,6 +607,13 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -c -o libedit_metadata_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c +libedit_metadata_la-utils.lo: utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -MT libedit_metadata_la-utils.lo -MD -MP -MF $(DEPDIR)/libedit_metadata_la-utils.Tpo -c -o libedit_metadata_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libedit_metadata_la-utils.Tpo $(DEPDIR)/libedit_metadata_la-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='libedit_metadata_la-utils.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libedit_metadata_la_CFLAGS) $(CFLAGS) -c -o libedit_metadata_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c + mostlyclean-libtool: -rm -f *.lo @@ -577,8 +621,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -761,13 +808,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/edit_metadata/utils.c gthumb-3.0.0/extensions/edit_metadata/utils.c --- gthumb-2.14.3/extensions/edit_metadata/utils.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/utils.c 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,99 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include "utils.h" + + +static gboolean +remove_tag_if_not_present (gpointer key, + gpointer value, + gpointer user_data) +{ + GthStringList *file_tags = user_data; + + return g_list_find_custom (gth_string_list_get_list (file_tags), key, (GCompareFunc) g_strcmp0) == NULL; +} + + +void +utils_get_common_tags (GList *file_list, /* GthFileData list */ + GHashTable **common_tags_out, + GHashTable **other_tags_out) +{ + GHashTable *all_tags; + GHashTable *common_tags; + GList *scan; + GHashTable *no_common_tags; + GList *all_tags_list; + GList *scan_tags; + + all_tags = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + common_tags = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + for (scan = file_list; scan; scan = scan->next) { + GthFileData *file_data = scan->data; + GthStringList *file_tags; + + file_tags = (GthStringList *) g_file_info_get_attribute_object (file_data->info, "general::tags"); + if (file_tags != NULL) { + for (scan_tags = gth_string_list_get_list (file_tags); + scan_tags != NULL; + scan_tags = scan_tags->next) + { + char *tag = scan_tags->data; + + /* update the all tags set */ + + if (g_hash_table_lookup (all_tags, tag) == NULL) + g_hash_table_insert (all_tags, g_strdup (tag), GINT_TO_POINTER (1)); + + /* update the common tags set */ + + if (scan == file_list) + g_hash_table_insert (common_tags, g_strdup (tag), GINT_TO_POINTER (1)); + else + g_hash_table_foreach_remove (common_tags, remove_tag_if_not_present, file_tags); + } + } + else + g_hash_table_remove_all (common_tags); + } + + no_common_tags = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + all_tags_list = g_hash_table_get_keys (all_tags); + for (scan_tags = all_tags_list; scan_tags; scan_tags = scan_tags->next) { + char *tag = scan_tags->data; + + if (g_hash_table_lookup (common_tags, tag) == NULL) + g_hash_table_insert (no_common_tags, g_strdup (tag), GINT_TO_POINTER (1)); + } + + if (common_tags_out != NULL) + *common_tags_out = g_hash_table_ref (common_tags); + + if (other_tags_out != NULL) + *other_tags_out = g_hash_table_ref (no_common_tags); + + g_list_free (all_tags_list); + g_hash_table_unref (no_common_tags); + g_hash_table_unref (common_tags); + g_hash_table_unref (all_tags); +} diff -Nru gthumb-2.14.3/extensions/edit_metadata/utils.h gthumb-3.0.0/extensions/edit_metadata/utils.h --- gthumb-2.14.3/extensions/edit_metadata/utils.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/edit_metadata/utils.h 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,31 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 The Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef UTILS_H +#define UTILS_H + +#include + +void utils_get_common_tags (GList *file_list, /* GthFileData list */ + GHashTable **common_tags_out, + GHashTable **other_tags_out); + +#endif /* UTILS_H */ diff -Nru gthumb-2.14.3/extensions/example/src/example.extension.in.in gthumb-3.0.0/extensions/example/src/example.extension.in.in --- gthumb-2.14.3/extensions/example/src/example.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/example/src/example.extension.in.in 2012-04-21 09:26:12.000000000 +0000 @@ -3,9 +3,10 @@ _Description=Extension example. Authors=gthumb development team Copyright=Copyright © 2010 The Free Software Foundation, Inc. -Version=%VERSION% +Version=1.0 Category=Browser [Loader] Type=module File=%LIBRARY% +API=3.0 diff -Nru gthumb-2.14.3/extensions/exiv2_tools/data/Makefile.in gthumb-3.0.0/extensions/exiv2_tools/data/Makefile.in --- gthumb-2.14.3/extensions/exiv2_tools/data/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/data/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/exiv2_tools/data/ui/edit-exiv2-page.ui gthumb-3.0.0/extensions/exiv2_tools/data/ui/edit-exiv2-page.ui --- gthumb-2.14.3/extensions/exiv2_tools/data/ui/edit-exiv2-page.ui 2011-10-17 08:57:03.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/data/ui/edit-exiv2-page.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,9 +1,9 @@ - + - True + False 11 2 6 @@ -13,7 +13,7 @@ True True 128 - + True @@ -25,6 +25,7 @@ True + False 0 C_opyright: True @@ -38,6 +39,7 @@ True + False 0 Co_untry: True @@ -52,27 +54,32 @@ True + False 6 True True 64 - + + True + True 0 True + False 0 _Code: True False + True 1 @@ -80,11 +87,12 @@ True True - + 5 False + True 2 @@ -102,7 +110,7 @@ True True 32 - + 1 @@ -115,6 +123,7 @@ True + False 0 Cr_edit: True @@ -131,7 +140,7 @@ True True 1024 - + 1 @@ -144,6 +153,7 @@ True + False 0 _Destination: True @@ -160,7 +170,7 @@ True True 1024 - + 1 @@ -173,6 +183,7 @@ True + False 0 _Source: True @@ -187,15 +198,17 @@ True + False True True - + urgency_adjustment False + True 0 @@ -211,6 +224,7 @@ True + False 0 _Urgency: True @@ -225,6 +239,7 @@ True + False 0 _Object Name: True @@ -241,7 +256,7 @@ True True 1024 - + 1 @@ -254,22 +269,26 @@ True + False 6 True True 32 - + True + True + True 0 True + False 0 Byline _Title: True @@ -277,6 +296,7 @@ False + True 1 @@ -285,12 +305,13 @@ True True 32 - + True 16 False + True 2 @@ -306,6 +327,7 @@ True + False 0 _Byline: True @@ -322,7 +344,7 @@ True True 32 - + True @@ -336,6 +358,7 @@ True + False 0 _City: True @@ -351,6 +374,7 @@ True + False 0 _Language: True @@ -365,16 +389,18 @@ True + False True True 3 - + 3 False + True 0 @@ -391,24 +417,28 @@ True True - + 1 2 4 5 + GTK_FILL True + False 0 State/Province: 4 5 + GTK_FILL + GTK_FILL diff -Nru gthumb-2.14.3/extensions/exiv2_tools/data/ui/Makefile.in gthumb-3.0.0/extensions/exiv2_tools/data/ui/Makefile.in --- gthumb-2.14.3/extensions/exiv2_tools/data/ui/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/data/ui/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/exiv2_tools/exiv2_tools.extension.in.in gthumb-3.0.0/extensions/exiv2_tools/exiv2_tools.extension.in.in --- gthumb-2.14.3/extensions/exiv2_tools/exiv2_tools.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/exiv2_tools.extension.in.in 2012-04-21 09:25:55.000000000 +0000 @@ -9,4 +9,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% After=image_rotation;comments;edit_metadata diff -Nru gthumb-2.14.3/extensions/exiv2_tools/exiv2-utils.cpp gthumb-3.0.0/extensions/exiv2_tools/exiv2-utils.cpp --- gthumb-2.14.3/extensions/exiv2_tools/exiv2-utils.cpp 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/exiv2-utils.cpp 2012-03-24 14:35:19.000000000 +0000 @@ -171,6 +171,12 @@ NULL }; +const char *_RATING_TAG_NAMES[] = { + "Xmp::xmp::Rating", + NULL +}; + + /* Some evil camera fill in the ImageDescription or UserComment fields with useless fluff. Try to filter these out, so they do not show up as comments */ @@ -529,6 +535,7 @@ set_attribute_from_tagset (info, "general::location", _LOCATION_TAG_NAMES); set_string_list_attribute_from_tagset (info, "general::tags", _KEYWORDS_TAG_NAMES); + set_attribute_from_tagset (info, "general::rating", _RATING_TAG_NAMES); set_attribute_from_tagset (info, "Embedded::Photo::DateTimeOriginal", _ORIGINAL_DATE_TAG_NAMES); set_attribute_from_tagset (info, "Embedded::Image::Orientation", _ORIENTATION_TAG_NAMES); } @@ -687,7 +694,8 @@ *error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_FAILED, _("Invalid file format")); return FALSE; } - + // Set the log level to only show errors (and suppress warnings, informational and debug messages) + Exiv2::LogMsg::setLevel(Exiv2::LogMsg::error); exiv2_read_metadata (image, info); } catch (Exiv2::AnyError& e) { @@ -957,11 +965,13 @@ mandatory_string (ed, "Exif.Photo.ComponentsConfiguration", "1 2 3 0"); mandatory_string (ed, "Exif.Photo.FlashpixVersion", "48 49 48 48"); - // Overwrite the software tag + // Overwrite the software tag if the image content was modified - if (software_name == NULL) - software_name = g_strconcat (g_get_application_name (), " ", VERSION, NULL); - ed["Exif.Image.Software"] = software_name; + if (g_file_info_get_attribute_boolean (info, "gth::file::image-changed")) { + if (software_name == NULL) + software_name = g_strconcat (g_get_application_name (), " ", VERSION, NULL); + ed["Exif.Image.ProcessingSoftware"] = software_name; + } // Update the dimension tags with actual image values diff -Nru gthumb-2.14.3/extensions/exiv2_tools/exiv2-utils.h gthumb-3.0.0/extensions/exiv2_tools/exiv2-utils.h --- gthumb-2.14.3/extensions/exiv2_tools/exiv2-utils.h 2011-10-25 12:21:14.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/exiv2-utils.h 2012-02-19 15:01:32.000000000 +0000 @@ -34,6 +34,7 @@ extern const char *_TITLE_TAG_NAMES[]; extern const char *_LOCATION_TAG_NAMES[]; extern const char *_KEYWORDS_TAG_NAMES[]; +extern const char *_RATING_TAG_NAMES[]; gboolean exiv2_read_metadata_from_file (GFile *file, GFileInfo *info, diff -Nru gthumb-2.14.3/extensions/exiv2_tools/gth-edit-exiv2-page.c gthumb-3.0.0/extensions/exiv2_tools/gth-edit-exiv2-page.c --- gthumb-2.14.3/extensions/exiv2_tools/gth-edit-exiv2-page.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/gth-edit-exiv2-page.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,273 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include "exiv2-utils.h" -#include "gth-edit-exiv2-page.h" - - -#define GTH_EDIT_EXIV2_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_EDIT_EXIV2_PAGE, GthEditExiv2PagePrivate)) -#define GET_WIDGET(name) _gtk_builder_get_widget (self->priv->builder, (name)) - - -static gpointer gth_edit_exiv2_page_parent_class = NULL; - - -struct _GthEditExiv2PagePrivate { - GtkBuilder *builder; - gboolean supported; - GFileInfo *info; -}; - - -static void -set_entry_value (GthEditExiv2Page *self, - GFileInfo *info, - const char *attribute, - const char *widget_id) -{ - GthMetadata *metadata; - - metadata = (GthMetadata *) g_file_info_get_attribute_object (info, attribute); - if (metadata != NULL) - gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (widget_id)), gth_metadata_get_formatted (metadata)); - else - gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (widget_id)), ""); -} - - -void -gth_edit_exiv2_page_real_set_file_list (GthEditMetadataPage *base, - GList *file_data_list) -{ - GthEditExiv2Page *self; - GList *scan; - GthMetadata *metadata; - - self = GTH_EDIT_EXIV2_PAGE (base); - - self->priv->supported = TRUE; - for (scan = file_data_list; self->priv->supported && scan; scan = scan->next) { - GthFileData *file_data = scan->data; - self->priv->supported = exiv2_supports_writes (gth_file_data_get_mime_type (file_data)); - } - - if (! self->priv->supported) { - gtk_widget_hide (GTK_WIDGET (base)); - return; - } - - _g_object_unref (self->priv->info); - self->priv->info = gth_file_data_list_get_common_info (file_data_list, "Iptc::Application2::Copyright,Iptc::Application2::Credit,Iptc::Application2::Byline,Iptc::Application2::BylineTitle,Iptc::Application2::CountryName,Iptc::Application2::CountryCode,Iptc::Application2::City,Iptc::Application2::Language,Iptc::Application2::ObjectName,Iptc::Application2::Source,Iptc::Envelope::Destination,Iptc::Application2::Urgency,Iptc::Application2:ProvinceState"); - - set_entry_value (self, self->priv->info, "Iptc::Application2::Copyright", "copyright_entry"); - set_entry_value (self, self->priv->info, "Iptc::Application2::Credit", "credit_entry"); - set_entry_value (self, self->priv->info, "Iptc::Application2::Byline", "byline_entry"); - set_entry_value (self, self->priv->info, "Iptc::Application2::BylineTitle", "byline_title_entry"); - set_entry_value (self, self->priv->info, "Iptc::Application2::CountryName", "country_name_entry"); - set_entry_value (self, self->priv->info, "Iptc::Application2::CountryCode", "country_code_entry"); - set_entry_value (self, self->priv->info, "Iptc::Application2::ProvinceState", "state_name_entry"); - set_entry_value (self, self->priv->info, "Iptc::Application2::City", "city_entry"); - set_entry_value (self, self->priv->info, "Iptc::Application2::Language", "language_entry"); - set_entry_value (self, self->priv->info, "Iptc::Application2::ObjectName", "object_name_entry"); - set_entry_value (self, self->priv->info, "Iptc::Application2::Source", "source_entry"); - set_entry_value (self, self->priv->info, "Iptc::Envelope::Destination", "destination_entry"); - - metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "Iptc::Application2::Urgency"); - if (metadata != NULL) { - float v; - - if (sscanf (gth_metadata_get_formatted (metadata), "%f", &v) == 1) - gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("urgency_adjustment")), (double) v); - else - gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("urgency_adjustment")), 0.0); - } - else - gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("urgency_adjustment")), 0.0); - - gtk_widget_show (GTK_WIDGET (base)); -} - - -static void -set_attribute_from_entry (GthEditExiv2Page *self, - GFileInfo *info, - GthFileData *file_data, - gboolean only_modified_fields, - const char *attribute, - const char *widget_id) -{ - GthMetadata *metadata; - const char *value; - - value = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET (widget_id))); - if (only_modified_fields && gth_file_data_attribute_equal (file_data, attribute, value)) - return; - - metadata = g_object_new (GTH_TYPE_METADATA, - "id", attribute, - "raw", value, - "formatted", value, - NULL); - g_file_info_set_attribute_object (info, attribute, G_OBJECT (metadata)); - g_object_unref (metadata); -} - - -void -gth_edit_exiv2_page_real_update_info (GthEditMetadataPage *base, - GFileInfo *info, - gboolean only_modified_fields) -{ - GthEditExiv2Page *self; - GthFileData *file_data; - double v; - char *s; - - self = GTH_EDIT_EXIV2_PAGE (base); - - if (! self->priv->supported) - return; - - file_data = gth_file_data_new (NULL, self->priv->info); - - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::Copyright", "copyright_entry"); - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::Credit", "credit_entry"); - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::Byline", "byline_entry"); - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::BylineTitle", "byline_title_entry"); - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::CountryName", "country_name_entry"); - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::CountryCode", "country_code_entry"); - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::City", "city_entry"); - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::Language", "language_entry"); - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::ObjectName", "object_name_entry"); - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::Source", "source_entry"); - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Envelope::Destination", "destination_entry"); - set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::ProvinceState", "state_name_entry"); - - /* urgency */ - - v = gtk_adjustment_get_value (GTK_ADJUSTMENT (GET_WIDGET ("urgency_adjustment"))); - s = g_strdup_printf ("%1.g", v); - if (! only_modified_fields || ! gth_file_data_attribute_equal_int (file_data, "Iptc::Application2::Urgency", s)) { - GthMetadata *metadata; - - metadata = g_object_new (GTH_TYPE_METADATA, - "id", "Iptc::Application2::Urgency", - "raw", s, - "formatted", s, - NULL); - g_file_info_set_attribute_object (info, "Iptc::Application2::Urgency", G_OBJECT (metadata)); - g_object_unref (metadata); - } - g_free (s); - - g_object_unref (file_data); -} - - -const char * -gth_edit_exiv2_page_real_get_name (GthEditMetadataPage *self) -{ - return _("Other"); -} - - -static void -gth_edit_exiv2_page_finalize (GObject *object) -{ - GthEditExiv2Page *self; - - self = GTH_EDIT_EXIV2_PAGE (object); - - _g_object_unref (self->priv->info); - g_object_unref (self->priv->builder); - - G_OBJECT_CLASS (gth_edit_exiv2_page_parent_class)->finalize (object); -} - - -static void -gth_edit_exiv2_page_class_init (GthEditExiv2PageClass *klass) -{ - gth_edit_exiv2_page_parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (GthEditExiv2PagePrivate)); - - G_OBJECT_CLASS (klass)->finalize = gth_edit_exiv2_page_finalize; -} - - -static void -gth_edit_exiv2_page_init (GthEditExiv2Page *self) -{ - self->priv = GTH_EDIT_EXIV2_PAGE_GET_PRIVATE (self); - self->priv->info = NULL; - - gtk_container_set_border_width (GTK_CONTAINER (self), 12); - - self->priv->builder = _gtk_builder_new_from_file ("edit-exiv2-page.ui", "exiv2_tools"); - gtk_box_pack_start (GTK_BOX (self), _gtk_builder_get_widget (self->priv->builder, "content"), TRUE, TRUE, 0); -} - - -static void -gth_edit_exiv2_page_gth_edit_exiv2_page_interface_init (GthEditMetadataPageIface *iface) -{ - iface->set_file_list = gth_edit_exiv2_page_real_set_file_list; - iface->update_info = gth_edit_exiv2_page_real_update_info; - iface->get_name = gth_edit_exiv2_page_real_get_name; -} - - -GType -gth_edit_exiv2_page_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthEditExiv2PageClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_edit_exiv2_page_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthEditExiv2Page), - 0, - (GInstanceInitFunc) gth_edit_exiv2_page_init, - NULL - }; - static const GInterfaceInfo gth_edit_exiv2_page_info = { - (GInterfaceInitFunc) gth_edit_exiv2_page_gth_edit_exiv2_page_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - type = g_type_register_static (GTK_TYPE_VBOX, - "GthEditExiv2Page", - &g_define_type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_EDIT_METADATA_PAGE, >h_edit_exiv2_page_info); - } - - return type; -} diff -Nru gthumb-2.14.3/extensions/exiv2_tools/gth-edit-exiv2-page.h gthumb-3.0.0/extensions/exiv2_tools/gth-edit-exiv2-page.h --- gthumb-2.14.3/extensions/exiv2_tools/gth-edit-exiv2-page.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/gth-edit-exiv2-page.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2009 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_EDIT_EXIV2_PAGE_H -#define GTH_EDIT_EXIV2_PAGE_H - -#include -#include -#include - -#define GTH_TYPE_EDIT_EXIV2_PAGE (gth_edit_exiv2_page_get_type ()) -#define GTH_EDIT_EXIV2_PAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_EDIT_EXIV2_PAGE, GthEditExiv2Page)) -#define GTH_EDIT_EXIV2_PAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GTH_TYPE_EDIT_EXIV2_PAGE, GthEditExiv2PageClass)) -#define GTH_IS_EDIT_EXIV2_PAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTH_TYPE_EDIT_EXIV2_PAGE)) -#define GTH_IS_EDIT_EXIV2_PAGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTH_TYPE_EDIT_EXIV2_PAGE)) -#define GTH_EDIT_EXIV2_PAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GTH_TYPE_EDIT_EXIV2_PAGE, GthEditExiv2PageClass)) - -typedef struct _GthEditExiv2Page GthEditExiv2Page; -typedef struct _GthEditExiv2PagePrivate GthEditExiv2PagePrivate; -typedef struct _GthEditExiv2PageClass GthEditExiv2PageClass; - -struct _GthEditExiv2Page -{ - GtkVBox __parent; - GthEditExiv2PagePrivate *priv; -}; - -struct _GthEditExiv2PageClass -{ - GtkVBoxClass __parent_class; -}; - -GType gth_edit_exiv2_page_get_type (void) G_GNUC_CONST; - -#endif /* GTH_EDIT_EXIV2_PAGE_H */ diff -Nru gthumb-2.14.3/extensions/exiv2_tools/gth-edit-iptc-page.c gthumb-3.0.0/extensions/exiv2_tools/gth-edit-iptc-page.c --- gthumb-2.14.3/extensions/exiv2_tools/gth-edit-iptc-page.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/gth-edit-iptc-page.c 2012-03-06 15:26:06.000000000 +0000 @@ -0,0 +1,244 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include "exiv2-utils.h" +#include "gth-edit-iptc-page.h" + + +#define GET_WIDGET(name) _gtk_builder_get_widget (self->priv->builder, (name)) + + +static void gth_edit_iptc_page_gth_edit_comment_page_interface_init (GthEditCommentPageInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthEditIptcPage, + gth_edit_iptc_page, + GTK_TYPE_BOX, + G_IMPLEMENT_INTERFACE (GTH_TYPE_EDIT_COMMENT_PAGE, + gth_edit_iptc_page_gth_edit_comment_page_interface_init)) + + +struct _GthEditIptcPagePrivate { + GtkBuilder *builder; + gboolean supported; + GFileInfo *info; +}; + + +static void +set_entry_value (GthEditIptcPage *self, + GFileInfo *info, + const char *attribute, + const char *widget_id) +{ + GthMetadata *metadata; + + metadata = (GthMetadata *) g_file_info_get_attribute_object (info, attribute); + if (metadata != NULL) + gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (widget_id)), gth_metadata_get_formatted (metadata)); + else + gtk_entry_set_text (GTK_ENTRY (GET_WIDGET (widget_id)), ""); +} + + +void +gth_edit_iptc_page_real_set_file_list (GthEditCommentPage *base, + GList *file_data_list) +{ + GthEditIptcPage *self; + GList *scan; + GthMetadata *metadata; + + self = GTH_EDIT_IPTC_PAGE (base); + + self->priv->supported = TRUE; + for (scan = file_data_list; self->priv->supported && scan; scan = scan->next) { + GthFileData *file_data = scan->data; + self->priv->supported = exiv2_supports_writes (gth_file_data_get_mime_type (file_data)); + } + + if (! self->priv->supported) { + gtk_widget_hide (GTK_WIDGET (base)); + return; + } + + _g_object_unref (self->priv->info); + self->priv->info = gth_file_data_list_get_common_info (file_data_list, "Iptc::Application2::Copyright,Iptc::Application2::Credit,Iptc::Application2::Byline,Iptc::Application2::BylineTitle,Iptc::Application2::CountryName,Iptc::Application2::CountryCode,Iptc::Application2::City,Iptc::Application2::Language,Iptc::Application2::ObjectName,Iptc::Application2::Source,Iptc::Envelope::Destination,Iptc::Application2::Urgency,Iptc::Application2:ProvinceState"); + + set_entry_value (self, self->priv->info, "Iptc::Application2::Copyright", "copyright_entry"); + set_entry_value (self, self->priv->info, "Iptc::Application2::Credit", "credit_entry"); + set_entry_value (self, self->priv->info, "Iptc::Application2::Byline", "byline_entry"); + set_entry_value (self, self->priv->info, "Iptc::Application2::BylineTitle", "byline_title_entry"); + set_entry_value (self, self->priv->info, "Iptc::Application2::CountryName", "country_name_entry"); + set_entry_value (self, self->priv->info, "Iptc::Application2::CountryCode", "country_code_entry"); + set_entry_value (self, self->priv->info, "Iptc::Application2::ProvinceState", "state_name_entry"); + set_entry_value (self, self->priv->info, "Iptc::Application2::City", "city_entry"); + set_entry_value (self, self->priv->info, "Iptc::Application2::Language", "language_entry"); + set_entry_value (self, self->priv->info, "Iptc::Application2::ObjectName", "object_name_entry"); + set_entry_value (self, self->priv->info, "Iptc::Application2::Source", "source_entry"); + set_entry_value (self, self->priv->info, "Iptc::Envelope::Destination", "destination_entry"); + + metadata = (GthMetadata *) g_file_info_get_attribute_object (self->priv->info, "Iptc::Application2::Urgency"); + if (metadata != NULL) { + float v; + + if (sscanf (gth_metadata_get_formatted (metadata), "%f", &v) == 1) + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("urgency_adjustment")), (double) v); + else + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("urgency_adjustment")), 0.0); + } + else + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("urgency_adjustment")), 0.0); + + gtk_widget_show (GTK_WIDGET (base)); +} + + +static void +set_attribute_from_entry (GthEditIptcPage *self, + GFileInfo *info, + GthFileData *file_data, + gboolean only_modified_fields, + const char *attribute, + const char *widget_id) +{ + GthMetadata *metadata; + const char *value; + + value = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET (widget_id))); + if (only_modified_fields && gth_file_data_attribute_equal (file_data, attribute, value)) + return; + + metadata = g_object_new (GTH_TYPE_METADATA, + "id", attribute, + "raw", value, + "formatted", value, + NULL); + g_file_info_set_attribute_object (info, attribute, G_OBJECT (metadata)); + g_object_unref (metadata); +} + + +void +gth_edit_iptc_page_real_update_info (GthEditCommentPage *base, + GFileInfo *info, + gboolean only_modified_fields) +{ + GthEditIptcPage *self; + GthFileData *file_data; + double v; + char *s; + + self = GTH_EDIT_IPTC_PAGE (base); + + if (! self->priv->supported) + return; + + file_data = gth_file_data_new (NULL, self->priv->info); + + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::Copyright", "copyright_entry"); + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::Credit", "credit_entry"); + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::Byline", "byline_entry"); + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::BylineTitle", "byline_title_entry"); + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::CountryName", "country_name_entry"); + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::CountryCode", "country_code_entry"); + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::City", "city_entry"); + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::Language", "language_entry"); + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::ObjectName", "object_name_entry"); + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::Source", "source_entry"); + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Envelope::Destination", "destination_entry"); + set_attribute_from_entry (self, info, file_data, only_modified_fields, "Iptc::Application2::ProvinceState", "state_name_entry"); + + /* urgency */ + + v = gtk_adjustment_get_value (GTK_ADJUSTMENT (GET_WIDGET ("urgency_adjustment"))); + s = g_strdup_printf ("%1.g", v); + if (! only_modified_fields || ! gth_file_data_attribute_equal_int (file_data, "Iptc::Application2::Urgency", s)) { + GthMetadata *metadata; + + metadata = g_object_new (GTH_TYPE_METADATA, + "id", "Iptc::Application2::Urgency", + "raw", s, + "formatted", s, + NULL); + g_file_info_set_attribute_object (info, "Iptc::Application2::Urgency", G_OBJECT (metadata)); + g_object_unref (metadata); + } + g_free (s); + + g_object_unref (file_data); +} + + +const char * +gth_edit_iptc_page_real_get_name (GthEditCommentPage *self) +{ + return _("Other"); +} + + +static void +gth_edit_iptc_page_finalize (GObject *object) +{ + GthEditIptcPage *self; + + self = GTH_EDIT_IPTC_PAGE (object); + + _g_object_unref (self->priv->info); + g_object_unref (self->priv->builder); + + G_OBJECT_CLASS (gth_edit_iptc_page_parent_class)->finalize (object); +} + + +static void +gth_edit_iptc_page_class_init (GthEditIptcPageClass *klass) +{ + g_type_class_add_private (klass, sizeof (GthEditIptcPagePrivate)); + G_OBJECT_CLASS (klass)->finalize = gth_edit_iptc_page_finalize; +} + + +static void +gth_edit_iptc_page_init (GthEditIptcPage *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_EDIT_IPTC_PAGE, GthEditIptcPagePrivate); + self->priv->info = NULL; + + gtk_container_set_border_width (GTK_CONTAINER (self), 12); + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL); + + self->priv->builder = _gtk_builder_new_from_file ("edit-exiv2-page.ui", "exiv2_tools"); + gtk_box_pack_start (GTK_BOX (self), _gtk_builder_get_widget (self->priv->builder, "content"), TRUE, TRUE, 0); +} + + +static void +gth_edit_iptc_page_gth_edit_comment_page_interface_init (GthEditCommentPageInterface *iface) +{ + iface->set_file_list = gth_edit_iptc_page_real_set_file_list; + iface->update_info = gth_edit_iptc_page_real_update_info; + iface->get_name = gth_edit_iptc_page_real_get_name; +} diff -Nru gthumb-2.14.3/extensions/exiv2_tools/gth-edit-iptc-page.h gthumb-3.0.0/extensions/exiv2_tools/gth-edit-iptc-page.h --- gthumb-2.14.3/extensions/exiv2_tools/gth-edit-iptc-page.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/gth-edit-iptc-page.h 2012-03-06 15:26:06.000000000 +0000 @@ -0,0 +1,53 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_EDIT_IPTC_PAGE_H +#define GTH_EDIT_IPTC_PAGE_H + +#include +#include +#include + +#define GTH_TYPE_EDIT_IPTC_PAGE (gth_edit_iptc_page_get_type ()) +#define GTH_EDIT_IPTC_PAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_EDIT_IPTC_PAGE, GthEditIptcPage)) +#define GTH_EDIT_IPTC_PAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GTH_TYPE_EDIT_IPTC_PAGE, GthEditIptcPageClass)) +#define GTH_IS_EDIT_IPTC_PAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTH_TYPE_EDIT_IPTC_PAGE)) +#define GTH_IS_EDIT_IPTC_PAGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTH_TYPE_EDIT_IPTC_PAGE)) +#define GTH_EDIT_IPTC_PAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GTH_TYPE_EDIT_IPTC_PAGE, GthEditIptcPageClass)) + +typedef struct _GthEditIptcPage GthEditIptcPage; +typedef struct _GthEditIptcPagePrivate GthEditIptcPagePrivate; +typedef struct _GthEditIptcPageClass GthEditIptcPageClass; + +struct _GthEditIptcPage +{ + GtkBox __parent; + GthEditIptcPagePrivate *priv; +}; + +struct _GthEditIptcPageClass +{ + GtkBoxClass __parent_class; +}; + +GType gth_edit_iptc_page_get_type (void) G_GNUC_CONST; + +#endif /* GTH_EDIT_IPTC_PAGE_H */ diff -Nru gthumb-2.14.3/extensions/exiv2_tools/gth-metadata-provider-exiv2.c gthumb-3.0.0/extensions/exiv2_tools/gth-metadata-provider-exiv2.c --- gthumb-2.14.3/extensions/exiv2_tools/gth-metadata-provider-exiv2.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/gth-metadata-provider-exiv2.c 2012-02-19 15:01:32.000000000 +0000 @@ -28,7 +28,25 @@ #include "gth-metadata-provider-exiv2.h" -static GthMetadataProviderClass *parent_class = NULL; +struct _GthMetadataProviderExiv2Private { + GSettings *general_settings; +}; + + +G_DEFINE_TYPE (GthMetadataProviderExiv2, gth_metadata_provider_exiv2, GTH_TYPE_METADATA_PROVIDER) + + +static void +gth_metadata_provider_exiv2_finalize (GObject *object) +{ + GthMetadataProviderExiv2 *self; + + self = GTH_METADATA_PROVIDER_EXIV2 (object); + + _g_object_unref (self->priv->general_settings); + + G_OBJECT_CLASS (gth_metadata_provider_exiv2_parent_class)->finalize (object); +} static gboolean @@ -108,19 +126,23 @@ static void -gth_metadata_provider_exiv2_write (GthMetadataProvider *self, +gth_metadata_provider_exiv2_write (GthMetadataProvider *base, GthMetadataWriteFlags flags, GthFileData *file_data, const char *attributes, GCancellable *cancellable) { - void *buffer = NULL; - gsize size; - GError *error = NULL; - GObject *metadata; - int i; + GthMetadataProviderExiv2 *self = GTH_METADATA_PROVIDER_EXIV2 (base); + void *buffer = NULL; + gsize size; + GError *error = NULL; + GObject *metadata; + int i; - if (((flags & GTH_METADATA_WRITE_FORCE_EMBEDDED) != GTH_METADATA_WRITE_FORCE_EMBEDDED) && ! eel_gconf_get_boolean (PREF_STORE_METADATA_IN_FILES, TRUE)) + if (self->priv->general_settings == NULL) + self->priv->general_settings = g_settings_new (GTHUMB_GENERAL_SCHEMA); + + if (! (flags & GTH_METADATA_WRITE_FORCE_EMBEDDED) && ! g_settings_get_boolean (self->priv->general_settings, PREF_GENERAL_STORE_METADATA_IN_FILES)) return; if (! exiv2_supports_writes (gth_file_data_get_mime_type (file_data))) @@ -207,6 +229,18 @@ g_file_info_remove_attribute (file_data->info, _KEYWORDS_TAG_NAMES[i]); } + metadata = g_file_info_get_attribute_object (file_data->info, "general::rating"); + if (metadata != NULL) { + if (GTH_IS_METADATA (metadata)) + g_object_set (metadata, "value-type", NULL, NULL); + for (i = 0; _RATING_TAG_NAMES[i] != NULL; i++) + g_file_info_set_attribute_object (file_data->info, _RATING_TAG_NAMES[i], metadata); + } + else { + for (i = 0; _RATING_TAG_NAMES[i] != NULL; i++) + g_file_info_remove_attribute (file_data->info, _RATING_TAG_NAMES[i]); + } + metadata = g_file_info_get_attribute_object (file_data->info, "general::datetime"); if (metadata != NULL) { GthMetadata *xmp_metadata = NULL; @@ -283,38 +317,25 @@ static void gth_metadata_provider_exiv2_class_init (GthMetadataProviderExiv2Class *klass) { - parent_class = g_type_class_peek_parent (klass); + GObjectClass *object_class; + GthMetadataProviderClass *mp_class; - GTH_METADATA_PROVIDER_CLASS (klass)->can_read = gth_metadata_provider_exiv2_can_read; - GTH_METADATA_PROVIDER_CLASS (klass)->can_write = gth_metadata_provider_exiv2_can_write; - GTH_METADATA_PROVIDER_CLASS (klass)->read = gth_metadata_provider_exiv2_read; - GTH_METADATA_PROVIDER_CLASS (klass)->write = gth_metadata_provider_exiv2_write; -} + g_type_class_add_private (klass, sizeof (GthMetadataProviderExiv2Private)); + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = gth_metadata_provider_exiv2_finalize; -GType -gth_metadata_provider_exiv2_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthMetadataProviderExiv2Class), - NULL, - NULL, - (GClassInitFunc) gth_metadata_provider_exiv2_class_init, - NULL, - NULL, - sizeof (GthMetadataProviderExiv2), - 0, - (GInstanceInitFunc) NULL - }; + mp_class = GTH_METADATA_PROVIDER_CLASS (klass); + mp_class->can_read = gth_metadata_provider_exiv2_can_read; + mp_class->can_write = gth_metadata_provider_exiv2_can_write; + mp_class->read = gth_metadata_provider_exiv2_read; + mp_class->write = gth_metadata_provider_exiv2_write; +} - type = g_type_register_static (GTH_TYPE_METADATA_PROVIDER, - "GthMetadataProviderExiv2", - &type_info, - 0); - } - return type; +static void +gth_metadata_provider_exiv2_init (GthMetadataProviderExiv2 *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_METADATA_PROVIDER_EXIV2, GthMetadataProviderExiv2Private); + self->priv->general_settings = NULL; } diff -Nru gthumb-2.14.3/extensions/exiv2_tools/gth-metadata-provider-exiv2.h gthumb-3.0.0/extensions/exiv2_tools/gth-metadata-provider-exiv2.h --- gthumb-2.14.3/extensions/exiv2_tools/gth-metadata-provider-exiv2.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/gth-metadata-provider-exiv2.h 2012-02-19 15:01:32.000000000 +0000 @@ -35,10 +35,12 @@ typedef struct _GthMetadataProviderExiv2 GthMetadataProviderExiv2; typedef struct _GthMetadataProviderExiv2Class GthMetadataProviderExiv2Class; +typedef struct _GthMetadataProviderExiv2Private GthMetadataProviderExiv2Private; struct _GthMetadataProviderExiv2 { GthMetadataProvider __parent; + GthMetadataProviderExiv2Private *priv; }; struct _GthMetadataProviderExiv2Class diff -Nru gthumb-2.14.3/extensions/exiv2_tools/main.c gthumb-3.0.0/extensions/exiv2_tools/main.c --- gthumb-2.14.3/extensions/exiv2_tools/main.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/main.c 2012-02-19 15:01:32.000000000 +0000 @@ -24,7 +24,7 @@ #include #include #include -#include "gth-edit-exiv2-page.h" +#include "gth-edit-iptc-page.h" #include "gth-metadata-provider-exiv2.h" #include "exiv2-utils.h" @@ -152,6 +152,7 @@ { "Xmp::iptc::Location", NULL, "Xmp::Embedded", 0, "XmpText", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, { "Xmp::iptc::Keywords", NULL, "Xmp::Embedded", 0, "XmpBag", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, { "Xmp::exif::DateTimeOriginal", NULL, "Xmp::Embedded", 0, "XmpText", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, + { "Xmp::xmp::Rating", NULL, "Xmp::Embedded", 0, "XmpText", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, { "Iptc::Application2::Headline", NULL, "Iptc", 1, "String", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, { "Iptc::Application2::Caption", NULL, "Iptc", 2, "String", GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW }, @@ -275,7 +276,7 @@ gth_main_register_metadata_info_v (exiv2_metadata_info); gth_main_register_metadata_provider (GTH_TYPE_METADATA_PROVIDER_EXIV2); if (gth_main_extension_is_active ("edit_metadata")) { - gth_main_register_type ("edit-metadata-dialog-page", GTH_TYPE_EDIT_EXIV2_PAGE); + gth_main_register_type ("edit-comment-dialog-page", GTH_TYPE_EDIT_IPTC_PAGE); gth_hook_add_callback ("delete-metadata", 10, G_CALLBACK (exiv2_delete_metadata_cb), NULL); } gth_hook_add_callback ("save-pixbuf", 10, G_CALLBACK (exiv2_write_metadata), NULL); diff -Nru gthumb-2.14.3/extensions/exiv2_tools/Makefile.am gthumb-3.0.0/extensions/exiv2_tools/Makefile.am --- gthumb-2.14.3/extensions/exiv2_tools/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -8,8 +8,8 @@ libexiv2_tools_la_SOURCES = \ exiv2-utils.h \ exiv2-utils.cpp \ - gth-edit-exiv2-page.c \ - gth-edit-exiv2-page.h \ + gth-edit-iptc-page.c \ + gth-edit-iptc-page.h \ gth-metadata-provider-exiv2.c \ gth-metadata-provider-exiv2.h \ main.c diff -Nru gthumb-2.14.3/extensions/exiv2_tools/Makefile.in gthumb-3.0.0/extensions/exiv2_tools/Makefile.in --- gthumb-2.14.3/extensions/exiv2_tools/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/exiv2_tools/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -81,12 +98,12 @@ LTLIBRARIES = $(extension_LTLIBRARIES) am__DEPENDENCIES_1 = am__libexiv2_tools_la_SOURCES_DIST = exiv2-utils.h exiv2-utils.cpp \ - gth-edit-exiv2-page.c gth-edit-exiv2-page.h \ + gth-edit-iptc-page.c gth-edit-iptc-page.h \ gth-metadata-provider-exiv2.c gth-metadata-provider-exiv2.h \ main.c @ENABLE_EXIV2_TRUE@am_libexiv2_tools_la_OBJECTS = \ @ENABLE_EXIV2_TRUE@ libexiv2_tools_la-exiv2-utils.lo \ -@ENABLE_EXIV2_TRUE@ libexiv2_tools_la-gth-edit-exiv2-page.lo \ +@ENABLE_EXIV2_TRUE@ libexiv2_tools_la-gth-edit-iptc-page.lo \ @ENABLE_EXIV2_TRUE@ libexiv2_tools_la-gth-metadata-provider-exiv2.lo \ @ENABLE_EXIV2_TRUE@ libexiv2_tools_la-main.lo libexiv2_tools_la_OBJECTS = $(am_libexiv2_tools_la_OBJECTS) @@ -149,6 +166,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -228,10 +250,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -239,6 +259,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -278,6 +299,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -326,8 +349,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -358,6 +379,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -394,8 +416,8 @@ @ENABLE_EXIV2_TRUE@libexiv2_tools_la_SOURCES = \ @ENABLE_EXIV2_TRUE@ exiv2-utils.h \ @ENABLE_EXIV2_TRUE@ exiv2-utils.cpp \ -@ENABLE_EXIV2_TRUE@ gth-edit-exiv2-page.c \ -@ENABLE_EXIV2_TRUE@ gth-edit-exiv2-page.h \ +@ENABLE_EXIV2_TRUE@ gth-edit-iptc-page.c \ +@ENABLE_EXIV2_TRUE@ gth-edit-iptc-page.h \ @ENABLE_EXIV2_TRUE@ gth-metadata-provider-exiv2.c \ @ENABLE_EXIV2_TRUE@ gth-metadata-provider-exiv2.h \ @ENABLE_EXIV2_TRUE@ main.c @@ -445,7 +467,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -453,6 +474,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -484,7 +507,7 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexiv2_tools_la-exiv2-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexiv2_tools_la-gth-edit-exiv2-page.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexiv2_tools_la-gth-edit-iptc-page.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexiv2_tools_la-gth-metadata-provider-exiv2.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libexiv2_tools_la-main.Plo@am__quote@ @@ -509,12 +532,12 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< -libexiv2_tools_la-gth-edit-exiv2-page.lo: gth-edit-exiv2-page.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexiv2_tools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexiv2_tools_la-gth-edit-exiv2-page.lo -MD -MP -MF $(DEPDIR)/libexiv2_tools_la-gth-edit-exiv2-page.Tpo -c -o libexiv2_tools_la-gth-edit-exiv2-page.lo `test -f 'gth-edit-exiv2-page.c' || echo '$(srcdir)/'`gth-edit-exiv2-page.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libexiv2_tools_la-gth-edit-exiv2-page.Tpo $(DEPDIR)/libexiv2_tools_la-gth-edit-exiv2-page.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-edit-exiv2-page.c' object='libexiv2_tools_la-gth-edit-exiv2-page.lo' libtool=yes @AMDEPBACKSLASH@ +libexiv2_tools_la-gth-edit-iptc-page.lo: gth-edit-iptc-page.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexiv2_tools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexiv2_tools_la-gth-edit-iptc-page.lo -MD -MP -MF $(DEPDIR)/libexiv2_tools_la-gth-edit-iptc-page.Tpo -c -o libexiv2_tools_la-gth-edit-iptc-page.lo `test -f 'gth-edit-iptc-page.c' || echo '$(srcdir)/'`gth-edit-iptc-page.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libexiv2_tools_la-gth-edit-iptc-page.Tpo $(DEPDIR)/libexiv2_tools_la-gth-edit-iptc-page.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-edit-iptc-page.c' object='libexiv2_tools_la-gth-edit-iptc-page.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexiv2_tools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexiv2_tools_la-gth-edit-exiv2-page.lo `test -f 'gth-edit-exiv2-page.c' || echo '$(srcdir)/'`gth-edit-exiv2-page.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexiv2_tools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libexiv2_tools_la-gth-edit-iptc-page.lo `test -f 'gth-edit-iptc-page.c' || echo '$(srcdir)/'`gth-edit-iptc-page.c libexiv2_tools_la-gth-metadata-provider-exiv2.lo: gth-metadata-provider-exiv2.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libexiv2_tools_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libexiv2_tools_la-gth-metadata-provider-exiv2.lo -MD -MP -MF $(DEPDIR)/libexiv2_tools_la-gth-metadata-provider-exiv2.Tpo -c -o libexiv2_tools_la-gth-metadata-provider-exiv2.lo `test -f 'gth-metadata-provider-exiv2.c' || echo '$(srcdir)/'`gth-metadata-provider-exiv2.c @@ -565,8 +588,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -749,13 +775,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/export_tools/callbacks.c gthumb-3.0.0/extensions/export_tools/callbacks.c --- gthumb-2.14.3/extensions/export_tools/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/export_tools/callbacks.c 2012-02-19 15:01:32.000000000 +0000 @@ -27,8 +27,16 @@ #include "callbacks.h" +#define BROWSER_DATA_KEY "export-tools-browser-data" + + static const char *ui_info = "" +" " +" " +" " +" " +" " " " " " " " @@ -37,31 +45,75 @@ ""; +typedef struct { + GthBrowser *browser; + GtkActionGroup *action_group; + gboolean menu_initialized; +} BrowserData; + + +static void +browser_data_free (BrowserData *data) +{ + g_free (data); +} + + +static void +export_tools_show_menu_func (GtkAction *action, + gpointer user_data) +{ + BrowserData *data = user_data; + GtkWidget *menu; + + if (data->menu_initialized) + return; + + data->menu_initialized = TRUE; + + menu = gtk_ui_manager_get_widget (gth_browser_get_ui_manager (data->browser), "/ExportPopup"); + g_object_set (action, "menu", menu, NULL); +} + + void export_tools__gth_browser_construct_cb (GthBrowser *browser) { + BrowserData *data; + GtkAction *action; GError *error = NULL; guint merge_id; - GtkToolItem *tool_item; g_return_if_fail (GTH_IS_BROWSER (browser)); + data = g_new0 (BrowserData, 1); + data->browser = browser; + data->action_group = gtk_action_group_new ("Export Tools Actions"); + gtk_action_group_set_translation_domain (data->action_group, NULL); + + /* tools menu action */ + + action = g_object_new (GTH_TYPE_TOGGLE_MENU_ACTION, + "name", "ExportTools", + "icon-name", "share", + "label", _("Share"), + /*"tooltip", _("Export files"),*/ + "is-important", TRUE, + NULL); + gth_toggle_menu_action_set_show_menu_func (GTH_TOGGLE_MENU_ACTION (action), + export_tools_show_menu_func, + data, + NULL); + gtk_action_group_add_action (data->action_group, action); + g_object_unref (action); + + gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->action_group, 0); + merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), ui_info, -1, &error); if (merge_id == 0) { g_warning ("building ui failed: %s", error->message); g_clear_error (&error); } - /* export tools menu button */ - - tool_item = g_object_new (GTH_TYPE_TOGGLE_MENU_TOOL_BUTTON, - "icon-name", "share", - "label", _("Share"), - NULL); - /*gtk_widget_set_tooltip_text (GTK_WIDGET (tool_item), _("Export files"));*/ - gth_toggle_menu_tool_button_set_menu (GTH_TOGGLE_MENU_TOOL_BUTTON (tool_item), - gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ExportPopup")); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (tool_item), TRUE); - gtk_widget_show (GTK_WIDGET (tool_item)); - gtk_toolbar_insert (GTK_TOOLBAR (gth_browser_get_browser_toolbar (browser)), tool_item, -1); + g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } diff -Nru gthumb-2.14.3/extensions/export_tools/export_tools.extension.in.in gthumb-3.0.0/extensions/export_tools/export_tools.extension.in.in --- gthumb-2.14.3/extensions/export_tools/export_tools.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/export_tools/export_tools.extension.in.in 2012-04-21 09:25:50.000000000 +0000 @@ -4,3 +4,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/export_tools/Makefile.in gthumb-3.0.0/extensions/export_tools/Makefile.in --- gthumb-2.14.3/extensions/export_tools/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/export_tools/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -118,6 +135,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libexport_tools_la_SOURCES) DIST_SOURCES = $(libexport_tools_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) ETAGS = etags CTAGS = ctags @@ -166,10 +188,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -177,6 +197,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -216,6 +237,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -264,8 +287,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -296,6 +317,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -378,7 +400,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -386,6 +407,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -461,8 +484,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/facebook/callbacks.c gthumb-3.0.0/extensions/facebook/callbacks.c --- gthumb-2.14.3/extensions/facebook/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/callbacks.c 2012-02-19 15:01:32.000000000 +0000 @@ -49,10 +49,11 @@ ""; -static GtkActionEntry action_entries[] = { +static GthActionEntryExt action_entries[] = { { "File_Export_Facebook", "site-facebook", N_("Face_book..."), NULL, N_("Upload photos to Facebook"), + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, G_CALLBACK (gth_browser_activate_action_export_facebook) }, }; @@ -82,10 +83,10 @@ data->action_group = gtk_action_group_new ("Facebook Actions"); gtk_action_group_set_translation_domain (data->action_group, NULL); - gtk_action_group_add_actions (data->action_group, - action_entries, - G_N_ELEMENTS (action_entries), - browser); + _gtk_action_group_add_actions_with_flags (data->action_group, + action_entries, + G_N_ELEMENTS (action_entries), + browser); gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->action_group, 0); merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), ui_info, -1, &error); @@ -94,8 +95,5 @@ g_clear_error (&error); } - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Export/Web_Services/File_Export_Facebook")), TRUE); - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ExportPopup/Web_Services/File_Export_Facebook")), TRUE); - g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } diff -Nru gthumb-2.14.3/extensions/facebook/data/gthumb-facebook.schemas.in gthumb-3.0.0/extensions/facebook/data/gthumb-facebook.schemas.in --- gthumb-2.14.3/extensions/facebook/data/gthumb-facebook.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/data/gthumb-facebook.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/facebook/max_resolution - /apps/gthumb/ext/facebook/max_resolution - gthumb - int - 2048 - - - - - - - - diff -Nru gthumb-2.14.3/extensions/facebook/data/Makefile.am gthumb-3.0.0/extensions/facebook/data/Makefile.am --- gthumb-2.14.3/extensions/facebook/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-facebook.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/facebook/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/facebook/data/Makefile.in gthumb-3.0.0/extensions/facebook/data/Makefile.in --- gthumb-2.14.3/extensions/facebook/data/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/data/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-facebook.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/facebook/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/facebook/data/ui/export-to-facebook.ui gthumb-3.0.0/extensions/facebook/data/ui/export-to-facebook.ui --- gthumb-2.14.3/extensions/facebook/data/ui/export-to-facebook.ui 2011-10-17 08:57:03.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/data/ui/export-to-facebook.ui 2012-02-19 15:01:32.000000000 +0000 @@ -40,6 +40,7 @@ gtk-cancel + False True True True @@ -55,6 +56,7 @@ _Upload + False True True True @@ -71,6 +73,7 @@ gtk-help + False True True True @@ -156,6 +159,7 @@ GTK_FILL + GTK_FILL @@ -189,6 +193,7 @@ + False True True True @@ -210,7 +215,7 @@ - True + False True 0 @@ -219,6 +224,7 @@ 1 2 + GTK_FILL @@ -233,6 +239,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -254,6 +261,7 @@ + False True True True @@ -279,6 +287,7 @@ 2 1 2 + GTK_FILL @@ -294,6 +303,7 @@ 2 3 GTK_FILL + GTK_FILL @@ -314,6 +324,7 @@ 2 2 3 + GTK_FILL diff -Nru gthumb-2.14.3/extensions/facebook/data/ui/facebook-account-chooser.ui gthumb-3.0.0/extensions/facebook/data/ui/facebook-account-chooser.ui --- gthumb-2.14.3/extensions/facebook/data/ui/facebook-account-chooser.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/data/ui/facebook-account-chooser.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,24 +1,39 @@ - + + + + + + + + + + + + True + False 5 6 True + False 6 True + False 0 A_ccount: True False + True 0 @@ -26,28 +41,21 @@ 300 True + False account_liststore + True + True 1 + False + True 0 - - - - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/facebook/data/ui/facebook-account-manager.ui gthumb-3.0.0/extensions/facebook/data/ui/facebook-account-manager.ui --- gthumb-2.14.3/extensions/facebook/data/ui/facebook-account-manager.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/data/ui/facebook-account-manager.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,6 @@ - + - @@ -12,11 +11,12 @@ True + False 5 - vertical True + False 0 A_ccounts: True @@ -24,24 +24,24 @@ False + True 0 True + False 6 + 300 + 150 True True - automatic - automatic in - 300 - 150 True True accounts_liststore @@ -49,6 +49,9 @@ False True 1 + + + @@ -63,39 +66,48 @@ + True + True 0 True - vertical + False 6 + False True True True + False True + False gtk-delete False + True 0 False + True 1 + True + True 1 diff -Nru gthumb-2.14.3/extensions/facebook/data/ui/facebook-album-properties.ui gthumb-3.0.0/extensions/facebook/data/ui/facebook-album-properties.ui --- gthumb-2.14.3/extensions/facebook/data/ui/facebook-album-properties.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/data/ui/facebook-album-properties.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,12 +1,35 @@ - + + + + + + + + + + Public photos + 0 + + + Private photos, visible to friends + 3 + + + Private + 4 + + + True + False True + False 4 2 6 @@ -14,6 +37,7 @@ True + False 0 _Name: True @@ -21,6 +45,7 @@ GTK_FILL + GTK_FILL @@ -33,11 +58,13 @@ 1 2 + GTK_FILL True + False 0 _Visibility: True @@ -46,14 +73,17 @@ 3 4 GTK_FILL + GTK_FILL True + False True + False visibility_liststore 0 @@ -65,6 +95,7 @@ False + True 0 @@ -74,6 +105,7 @@ 2 3 4 + GTK_FILL @@ -87,11 +119,13 @@ 2 2 3 + GTK_FILL True + False 0 D_escription: True @@ -100,6 +134,7 @@ 2 3 + GTK_FILL @@ -115,11 +150,13 @@ 2 1 2 + GTK_FILL True + False 0 _Location: True @@ -129,35 +166,15 @@ 1 2 GTK_FILL + GTK_FILL False + True 0 - - - - - - - - - - Public photos - 0 - - - Private photos, visible to friends - 3 - - - Private - 4 - - - diff -Nru gthumb-2.14.3/extensions/facebook/data/ui/facebook-ask-authorization.ui gthumb-3.0.0/extensions/facebook/data/ui/facebook-ask-authorization.ui --- gthumb-2.14.3/extensions/facebook/data/ui/facebook-ask-authorization.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/data/ui/facebook-ask-authorization.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,8 +1,13 @@ - + + True + False + gtk-dialog-authentication + + False 5 False True @@ -11,19 +16,24 @@ other icon_image - + True + False + vertical 2 - + True + False end gtk-cancel + False True True True + False True @@ -35,9 +45,11 @@ _Authorize... + False True True True + False button_image True @@ -50,6 +62,7 @@ False + True end 0 @@ -61,12 +74,9 @@ authorize_button - - True - gtk-dialog-authentication - True + False 0 gtk-dialog-authentication 6 diff -Nru gthumb-2.14.3/extensions/facebook/data/ui/facebook-complete-authorization.ui gthumb-3.0.0/extensions/facebook/data/ui/facebook-complete-authorization.ui --- gthumb-2.14.3/extensions/facebook/data/ui/facebook-complete-authorization.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/data/ui/facebook-complete-authorization.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,8 +1,13 @@ - + + True + False + gtk-dialog-authentication + + False 5 False True @@ -12,19 +17,24 @@ Once you're done, click the 'Continue' button below. icon_image1 - + True + False + vertical 2 - + True + False end gtk-cancel + False True True True + False True 0.50999999046325684 @@ -37,9 +47,11 @@ C_ontinue + False True True True + False button_image1 True @@ -52,6 +64,7 @@ False + True end 0 @@ -65,12 +78,9 @@ True + False 0 gtk-dialog-authentication 6 - - True - gtk-dialog-authentication - diff -Nru gthumb-2.14.3/extensions/facebook/data/ui/facebook-export-completed.ui gthumb-3.0.0/extensions/facebook/data/ui/facebook-export-completed.ui --- gthumb-2.14.3/extensions/facebook/data/ui/facebook-export-completed.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/data/ui/facebook-export-completed.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,8 +1,14 @@ - + + True + False + 0 + gtk-jump-to + + False 5 False True @@ -10,19 +16,24 @@ True Files successfully uploaded to the server. - + True + False + vertical 2 - + True + False end _Open in the Browser + False True True True + False icon_image True @@ -35,9 +46,11 @@ gtk-close + False True True True + False True @@ -49,6 +62,7 @@ False + True end 0 @@ -60,9 +74,4 @@ button2 - - True - 0 - gtk-jump-to - diff -Nru gthumb-2.14.3/extensions/facebook/data/ui/Makefile.in gthumb-3.0.0/extensions/facebook/data/ui/Makefile.in --- gthumb-2.14.3/extensions/facebook/data/ui/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/data/ui/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -342,8 +364,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/facebook/dlg-export-to-facebook.c gthumb-3.0.0/extensions/facebook/dlg-export-to-facebook.c --- gthumb-2.14.3/extensions/facebook/dlg-export-to-facebook.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/dlg-export-to-facebook.c 2012-02-19 15:01:32.000000000 +0000 @@ -60,6 +60,7 @@ GthFileData *location; GList *file_list; GtkBuilder *builder; + GSettings *settings; GtkWidget *dialog; GtkWidget *list_view; GtkWidget *progress_dialog; @@ -89,6 +90,7 @@ _g_object_unref (data->service); _g_object_unref (data->auth); _g_object_unref (data->conn); + _g_object_unref (data->settings); _g_object_unref (data->builder); _g_object_list_unref (data->file_list); _g_object_unref (data->location); @@ -229,7 +231,7 @@ -1); } - eel_gconf_set_integer (PREF_FACEBOOK_MAX_RESOLUTION, max_resolution); + g_settings_set_int (data->settings, PREF_FACEBOOK_MAX_RESOLUTION, max_resolution); file_list = gth_file_data_list_to_file_list (data->file_list); facebook_service_upload_photos (data->service, @@ -497,6 +499,7 @@ data = g_new0 (DialogData, 1); data->browser = browser; + data->settings = g_settings_new (GTHUMB_FACEBOOK_SCHEMA); data->location = gth_file_data_dup (gth_browser_get_location_data (browser)); data->builder = _gtk_builder_new_from_file ("export-to-facebook.ui", "facebook"); data->dialog = _gtk_builder_get_widget (data->builder, "export_dialog"); @@ -563,7 +566,7 @@ return; } - total_size_formatted = g_format_size_for_display (total_size); + total_size_formatted = g_format_size (total_size); text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_total), n_total, total_size_formatted); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("images_info_label")), text); g_free (text); @@ -573,9 +576,8 @@ /* Set the widget data */ - data->list_view = gth_file_list_new (gth_icon_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); + data->list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); gth_file_list_set_thumb_size (GTH_FILE_LIST (data->list_view), 112); - gth_file_view_set_spacing (GTH_FILE_VIEW (gth_file_list_get_view (GTH_FILE_LIST (data->list_view))), 0); gth_file_list_enable_thumbs (GTH_FILE_LIST (data->list_view), TRUE); gth_file_list_set_ignore_hidden (GTH_FILE_LIST (data->list_view), TRUE); gth_file_list_set_caption (GTH_FILE_LIST (data->list_view), "none"); @@ -599,7 +601,7 @@ gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("resize_combobox")), 0); - default_resolution = eel_gconf_get_integer (PREF_FACEBOOK_MAX_RESOLUTION, 2048); + default_resolution = g_settings_get_int (data->settings, PREF_FACEBOOK_MAX_RESOLUTION); tree_model = (GtkTreeModel *) gtk_builder_get_object (data->builder, "resize_liststore"); if (gtk_tree_model_get_iter_first (tree_model, &iter)) { do { diff -Nru gthumb-2.14.3/extensions/facebook/facebook-account.c gthumb-3.0.0/extensions/facebook/facebook-account.c --- gthumb-2.14.3/extensions/facebook/facebook-account.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/facebook-account.c 2012-02-19 15:01:32.000000000 +0000 @@ -29,7 +29,14 @@ #include "facebook-account.h" -static gpointer facebook_account_parent_class = NULL; +static void facebook_account_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (FacebookAccount, + facebook_account, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + facebook_account_dom_domizable_interface_init)) static void @@ -51,7 +58,6 @@ static void facebook_account_class_init (FacebookAccountClass *klass) { - facebook_account_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = facebook_account_finalize; } @@ -110,7 +116,7 @@ static void -facebook_account_dom_domizable_interface_init (DomDomizableIface *iface) +facebook_account_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = facebook_account_create_element; iface->load_from_element = facebook_account_load_from_element; @@ -118,7 +124,7 @@ static void -facebook_account_instance_init (FacebookAccount *self) +facebook_account_init (FacebookAccount *self) { self->user_id = NULL; self->username = NULL; @@ -128,41 +134,6 @@ } -GType -facebook_account_get_type (void) -{ - static GType facebook_account_type_id = 0; - - if (facebook_account_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FacebookAccountClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) facebook_account_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FacebookAccount), - 0, - (GInstanceInitFunc) facebook_account_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) facebook_account_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - facebook_account_type_id = g_type_register_static (G_TYPE_OBJECT, - "FacebookAccount", - &g_define_type_info, - 0); - g_type_add_interface_static (facebook_account_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return facebook_account_type_id; -} - - FacebookAccount * facebook_account_new (void) { diff -Nru gthumb-2.14.3/extensions/facebook/facebook-account-chooser-dialog.c gthumb-3.0.0/extensions/facebook/facebook-account-chooser-dialog.c --- gthumb-2.14.3/extensions/facebook/facebook-account-chooser-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/facebook-account-chooser-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -34,14 +34,14 @@ }; -static gpointer parent_class = NULL; - - struct _FacebookAccountChooserDialogPrivate { GtkBuilder *builder; }; +G_DEFINE_TYPE (FacebookAccountChooserDialog, facebook_account_chooser_dialog, GTK_TYPE_DIALOG) + + static void facebook_account_chooser_dialog_finalize (GObject *object) { @@ -51,7 +51,7 @@ _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (facebook_account_chooser_dialog_parent_class)->finalize (object); } @@ -60,7 +60,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (FacebookAccountChooserDialogPrivate)); object_class = (GObjectClass*) klass; @@ -163,34 +162,6 @@ } -GType -facebook_account_chooser_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FacebookAccountChooserDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) facebook_account_chooser_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FacebookAccountChooserDialog), - 0, - (GInstanceInitFunc) facebook_account_chooser_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "FacebookAccountChooserDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void facebook_account_chooser_dialog_construct (FacebookAccountChooserDialog *self, GList *accounts, diff -Nru gthumb-2.14.3/extensions/facebook/facebook-account-manager-dialog.c gthumb-3.0.0/extensions/facebook/facebook-account-manager-dialog.c --- gthumb-2.14.3/extensions/facebook/facebook-account-manager-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/facebook-account-manager-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -34,14 +34,14 @@ }; -static gpointer parent_class = NULL; - - struct _FacebookAccountManagerDialogPrivate { GtkBuilder *builder; }; +G_DEFINE_TYPE (FacebookAccountManagerDialog, facebook_account_manager_dialog, GTK_TYPE_DIALOG) + + static void facebook_account_manager_dialog_finalize (GObject *object) { @@ -51,7 +51,7 @@ _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (facebook_account_manager_dialog_parent_class)->finalize (object); } @@ -60,7 +60,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (FacebookAccountManagerDialogPrivate)); object_class = (GObjectClass*) klass; @@ -160,34 +159,6 @@ } -GType -facebook_account_manager_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FacebookAccountManagerDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) facebook_account_manager_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FacebookAccountManagerDialog), - 0, - (GInstanceInitFunc) facebook_account_manager_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "FacebookAccountManagerDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void facebook_account_manager_dialog_construct (FacebookAccountManagerDialog *self, GList *accounts) diff -Nru gthumb-2.14.3/extensions/facebook/facebook-album.c gthumb-3.0.0/extensions/facebook/facebook-album.c --- gthumb-2.14.3/extensions/facebook/facebook-album.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/facebook-album.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,14 @@ #include "facebook-album.h" -static gpointer facebook_album_parent_class = NULL; +static void facebook_album_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (FacebookAlbum, + facebook_album, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + facebook_album_dom_domizable_interface_init)) static void @@ -49,7 +56,6 @@ static void facebook_album_class_init (FacebookAlbumClass *klass) { - facebook_album_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = facebook_album_finalize; } @@ -141,7 +147,7 @@ static void -facebook_album_dom_domizable_interface_init (DomDomizableIface *iface) +facebook_album_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = facebook_album_create_element; iface->load_from_element = facebook_album_load_from_element; @@ -149,7 +155,7 @@ static void -facebook_album_instance_init (FacebookAlbum *self) +facebook_album_init (FacebookAlbum *self) { self->id = NULL; self->name = NULL; @@ -161,41 +167,6 @@ } -GType -facebook_album_get_type (void) -{ - static GType facebook_album_type_id = 0; - - if (facebook_album_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FacebookAlbumClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) facebook_album_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FacebookAlbum), - 0, - (GInstanceInitFunc) facebook_album_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) facebook_album_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - facebook_album_type_id = g_type_register_static (G_TYPE_OBJECT, - "FacebookAlbum", - &g_define_type_info, - 0); - g_type_add_interface_static (facebook_album_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return facebook_album_type_id; -} - - FacebookAlbum * facebook_album_new (void) { diff -Nru gthumb-2.14.3/extensions/facebook/facebook-album-properties-dialog.c gthumb-3.0.0/extensions/facebook/facebook-album-properties-dialog.c --- gthumb-2.14.3/extensions/facebook/facebook-album-properties-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/facebook-album-properties-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -27,14 +27,14 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) -static gpointer parent_class = NULL; - - struct _FacebookAlbumPropertiesDialogPrivate { GtkBuilder *builder; }; +G_DEFINE_TYPE (FacebookAlbumPropertiesDialog, facebook_album_properties_dialog, GTK_TYPE_DIALOG) + + static void facebook_album_properties_dialog_finalize (GObject *object) { @@ -43,7 +43,7 @@ self = FACEBOOK_ALBUM_PROPERTIES_DIALOG (object); _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (facebook_album_properties_dialog_parent_class)->finalize (object); } @@ -52,7 +52,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (FacebookAlbumPropertiesDialogPrivate)); object_class = (GObjectClass*) klass; @@ -84,34 +83,6 @@ } -GType -facebook_album_properties_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FacebookAlbumPropertiesDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) facebook_album_properties_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FacebookAlbumPropertiesDialog), - 0, - (GInstanceInitFunc) facebook_album_properties_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "FacebookAlbumPropertiesDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void facebook_album_properties_dialog_construct (FacebookAlbumPropertiesDialog *self, const char *name, diff -Nru gthumb-2.14.3/extensions/facebook/facebook-authentication.c gthumb-3.0.0/extensions/facebook/facebook-authentication.c --- gthumb-2.14.3/extensions/facebook/facebook-authentication.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/facebook-authentication.c 2012-02-19 15:01:32.000000000 +0000 @@ -54,10 +54,12 @@ }; -static GObjectClass *parent_class = NULL; static guint facebook_authentication_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (FacebookAuthentication, facebook_authentication, G_TYPE_OBJECT) + + static void facebook_authentication_finalize (GObject *object) { @@ -70,7 +72,7 @@ _g_object_list_unref (self->priv->accounts); _g_object_unref (self->priv->account); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (facebook_authentication_parent_class)->finalize (object); } @@ -79,7 +81,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (FacebookAuthenticationPrivate)); object_class = (GObjectClass*) class; @@ -119,34 +120,6 @@ } -GType -facebook_authentication_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTaskClass), - NULL, - NULL, - (GClassInitFunc) facebook_authentication_class_init, - NULL, - NULL, - sizeof (GthTask), - 0, - (GInstanceInitFunc) facebook_authentication_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "FacebookAuthentication", - &type_info, - 0); - } - - return type; -} - - FacebookAuthentication * facebook_authentication_new (FacebookConnection *conn, FacebookService *service, diff -Nru gthumb-2.14.3/extensions/facebook/facebook-connection.c gthumb-3.0.0/extensions/facebook/facebook-connection.c --- gthumb-2.14.3/extensions/facebook/facebook-connection.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/facebook-connection.c 2012-02-19 15:01:32.000000000 +0000 @@ -63,7 +63,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (FacebookConnection, facebook_connection, GTH_TYPE_TASK) static void @@ -83,7 +83,7 @@ g_free (self->priv->token); _g_object_unref (self->priv->session); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (facebook_connection_parent_class)->finalize (object); } @@ -112,7 +112,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (FacebookConnectionPrivate)); object_class = (GObjectClass*) klass; @@ -141,34 +140,6 @@ } -GType -facebook_connection_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (FacebookConnectionClass), - NULL, - NULL, - (GClassInitFunc) facebook_connection_class_init, - NULL, - NULL, - sizeof (FacebookConnection), - 0, - (GInstanceInitFunc) facebook_connection_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "FacebookConnection", - &type_info, - 0); - } - - return type; -} - - FacebookConnection * facebook_connection_new (void) { diff -Nru gthumb-2.14.3/extensions/facebook/facebook.extension.in.in gthumb-3.0.0/extensions/facebook/facebook.extension.in.in --- gthumb-2.14.3/extensions/facebook/facebook.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/facebook.extension.in.in 2012-04-21 09:25:45.000000000 +0000 @@ -9,5 +9,6 @@ [Loader] Type=module -Requires=export_tools File=%LIBRARY% +API=%GTHUMB_API_VERSION% +Requires=export_tools diff -Nru gthumb-2.14.3/extensions/facebook/facebook-photo.c gthumb-3.0.0/extensions/facebook/facebook-photo.c --- gthumb-2.14.3/extensions/facebook/facebook-photo.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/facebook-photo.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,14 @@ #include "facebook-photo.h" -static gpointer facebook_photo_parent_class = NULL; +static void facebook_photo_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (FacebookPhoto, + facebook_photo, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + facebook_photo_dom_domizable_interface_init)) static void @@ -48,7 +55,6 @@ static void facebook_photo_class_init (FacebookPhotoClass *klass) { - facebook_photo_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = facebook_photo_finalize; } @@ -103,7 +109,7 @@ static void -facebook_photo_dom_domizable_interface_init (DomDomizableIface *iface) +facebook_photo_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = facebook_photo_create_element; iface->load_from_element = facebook_photo_load_from_element; @@ -111,43 +117,9 @@ static void -facebook_photo_instance_init (FacebookPhoto *self) +facebook_photo_init (FacebookPhoto *self) { -} - - -GType -facebook_photo_get_type (void) -{ - static GType facebook_photo_type_id = 0; - - if (facebook_photo_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FacebookPhotoClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) facebook_photo_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FacebookPhoto), - 0, - (GInstanceInitFunc) facebook_photo_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) facebook_photo_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - facebook_photo_type_id = g_type_register_static (G_TYPE_OBJECT, - "FacebookPhoto", - &g_define_type_info, - 0); - g_type_add_interface_static (facebook_photo_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return facebook_photo_type_id; + /* void */ } diff -Nru gthumb-2.14.3/extensions/facebook/facebook-service.c gthumb-3.0.0/extensions/facebook/facebook-service.c --- gthumb-2.14.3/extensions/facebook/facebook-service.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/facebook-service.c 2012-02-19 15:01:32.000000000 +0000 @@ -71,7 +71,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (FacebookService, facebook_service, G_TYPE_OBJECT) static void @@ -85,7 +85,7 @@ _g_object_unref (self->priv->user); post_photos_data_free (self->priv->post_photos); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (facebook_service_parent_class)->finalize (object); } @@ -94,7 +94,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (FacebookServicePrivate)); object_class = (GObjectClass*) klass; @@ -112,34 +111,6 @@ } -GType -facebook_service_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (FacebookServiceClass), - NULL, - NULL, - (GClassInitFunc) facebook_service_class_init, - NULL, - NULL, - sizeof (FacebookService), - 0, - (GInstanceInitFunc) facebook_service_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "FacebookService", - &type_info, - 0); - } - - return type; -} - - FacebookService * facebook_service_new (FacebookConnection *conn) { diff -Nru gthumb-2.14.3/extensions/facebook/facebook-user.c gthumb-3.0.0/extensions/facebook/facebook-user.c --- gthumb-2.14.3/extensions/facebook/facebook-user.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/facebook-user.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,14 @@ #include "facebook-user.h" -static gpointer facebook_user_parent_class = NULL; +static void facebook_user_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (FacebookUser, + facebook_user, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + facebook_user_dom_domizable_interface_init)) static void @@ -46,7 +53,6 @@ static void facebook_user_class_init (FacebookUserClass *klass) { - facebook_user_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = facebook_user_finalize; } @@ -91,7 +97,7 @@ static void -facebook_user_dom_domizable_interface_init (DomDomizableIface *iface) +facebook_user_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = facebook_user_create_element; iface->load_from_element = facebook_user_load_from_element; @@ -99,48 +105,13 @@ static void -facebook_user_instance_init (FacebookUser *self) +facebook_user_init (FacebookUser *self) { self->id = NULL; self->username = NULL; } -GType -facebook_user_get_type (void) -{ - static GType facebook_user_type_id = 0; - - if (facebook_user_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FacebookUserClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) facebook_user_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FacebookUser), - 0, - (GInstanceInitFunc) facebook_user_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) facebook_user_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - facebook_user_type_id = g_type_register_static (G_TYPE_OBJECT, - "FacebookUser", - &g_define_type_info, - 0); - g_type_add_interface_static (facebook_user_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return facebook_user_type_id; -} - - FacebookUser * facebook_user_new (void) { diff -Nru gthumb-2.14.3/extensions/facebook/Makefile.in gthumb-3.0.0/extensions/facebook/Makefile.in --- gthumb-2.14.3/extensions/facebook/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -153,6 +170,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -232,10 +254,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -243,6 +263,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -282,6 +303,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -330,8 +353,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -362,6 +383,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -471,7 +493,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -479,6 +500,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -650,8 +673,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -834,13 +860,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/facebook/preferences.h gthumb-3.0.0/extensions/facebook/preferences.h --- gthumb-2.14.3/extensions/facebook/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/facebook/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -22,6 +22,12 @@ #ifndef PREFERENCES_H #define PREFERENCES_H -#define PREF_FACEBOOK_MAX_RESOLUTION "/apps/gthumb/ext/facebook/max_resolution" +/* schema */ + +#define GTHUMB_FACEBOOK_SCHEMA GTHUMB_SCHEMA ".facebook" + +/* keys */ + +#define PREF_FACEBOOK_MAX_RESOLUTION "max-resolution" #endif /* PREFERENCES_H */ diff -Nru gthumb-2.14.3/extensions/file_manager/actions.c gthumb-3.0.0/extensions/file_manager/actions.c --- gthumb-2.14.3/extensions/file_manager/actions.c 2012-02-19 16:49:51.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/actions.c 2012-03-23 19:10:48.000000000 +0000 @@ -29,6 +29,9 @@ #include "preferences.h" +#define MAX_HISTORY_LENGTH 10 + + typedef struct { GthBrowser *browser; GFile *parent; @@ -904,29 +907,44 @@ GList *files, gboolean move) { + GSettings *settings; GtkWidget *dialog; char *start_uri; + GList *history; + GList *scan; GtkWidget *box; GtkWidget *view_destination_button; + settings = g_settings_new (GTHUMB_FILE_MANAGER_SCHEMA); + dialog = gtk_file_chooser_dialog_new (move ? _("Move To") : _("Copy To"), - NULL, + GTK_WINDOW (browser), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, (move ? _("Move") : _("Copy")), GTK_RESPONSE_ACCEPT, NULL); - start_uri = eel_gconf_get_string (PREF_FILE_MANAGER_COPY_LAST_FOLDER, get_home_uri ()); + start_uri = g_settings_get_string (settings, PREF_FILE_MANAGER_COPY_LAST_FOLDER); + if ((start_uri == NULL) || (strcmp (start_uri, "") == 0)) { + g_free (start_uri); + start_uri = g_strdup (get_home_uri ()); + } gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog), start_uri); g_free(start_uri); - box = gtk_vbox_new (FALSE, 6); + history = _g_settings_get_string_list (settings, PREF_FILE_MANAGER_COPY_HISTORY); + for (scan = history; scan; scan = scan->next) { + char *uri = scan->data; + gtk_file_chooser_add_shortcut_folder_uri (GTK_FILE_CHOOSER (dialog), uri, NULL); + } + + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_set_border_width (GTK_CONTAINER (box), 6); gtk_widget_show (box); view_destination_button = gtk_check_button_new_with_mnemonic (_("_View the destination")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (view_destination_button), - eel_gconf_get_boolean (PREF_FILE_MANAGER_COPY_VIEW_DESTINATION, TRUE)); + g_settings_get_boolean (settings, PREF_FILE_MANAGER_COPY_VIEW_DESTINATION)); gtk_widget_show (view_destination_button); gtk_box_pack_start (GTK_BOX (box), view_destination_button, FALSE, FALSE, 0); @@ -942,8 +960,19 @@ /* save the options */ view_destination = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (view_destination_button)); - eel_gconf_set_boolean (PREF_FILE_MANAGER_COPY_VIEW_DESTINATION, view_destination); - eel_gconf_set_string (PREF_FILE_MANAGER_COPY_LAST_FOLDER, destination_uri); + g_settings_set_boolean (settings, PREF_FILE_MANAGER_COPY_VIEW_DESTINATION, view_destination); + g_settings_set_string (settings, PREF_FILE_MANAGER_COPY_LAST_FOLDER, destination_uri); + + /* save the destination in the history list, prevent + * the list from growing without limit. */ + + history = g_list_prepend (history, g_strdup (destination_uri)); + while (g_list_length (history) > MAX_HISTORY_LENGTH) { + GList *link = g_list_last (history); + history = g_list_remove_link (history, link); + _g_string_list_free (link); + } + _g_settings_set_string_list (settings, PREF_FILE_MANAGER_COPY_HISTORY, history); /* copy / move the files */ @@ -953,7 +982,9 @@ g_free (destination_uri); } + _g_string_list_free (history); gtk_widget_destroy (dialog); + g_object_unref (settings); } diff -Nru gthumb-2.14.3/extensions/file_manager/callbacks.c gthumb-3.0.0/extensions/file_manager/callbacks.c --- gthumb-2.14.3/extensions/file_manager/callbacks.c 2012-03-25 10:05:51.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/callbacks.c 2012-03-26 16:14:53.000000000 +0000 @@ -995,8 +995,7 @@ appinfo = g_object_get_data (G_OBJECT (menuitem), "appinfo"); g_return_if_fail (G_IS_APP_INFO (appinfo)); - context = gdk_app_launch_context_new (); - gdk_app_launch_context_set_screen (context, gtk_widget_get_screen (GTK_WIDGET (browser))); + context = gdk_display_get_app_launch_context (gtk_widget_get_display (GTK_WIDGET (browser))); gdk_app_launch_context_set_timestamp (context, 0); gdk_app_launch_context_set_icon (context, g_app_info_get_icon (appinfo)); if (! g_app_info_launch_uris (appinfo, uris, G_APP_LAUNCH_CONTEXT (context), &error)) { @@ -1170,7 +1169,7 @@ modifiers = gtk_accelerator_get_default_mod_mask (); switch (event->keyval) { - case GDK_g: + case GDK_KEY_g: if ((event->state & modifiers) == 0) { items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); file_data_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); @@ -1184,7 +1183,7 @@ } break; - case GDK_Delete: + case GDK_KEY_Delete: if (((event->state & modifiers) == 0) || ((event->state & modifiers) == GDK_SHIFT_MASK)) { if (gth_browser_get_location_source (browser) != NULL) { items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); diff -Nru gthumb-2.14.3/extensions/file_manager/data/gthumb-file-manager.schemas.in gthumb-3.0.0/extensions/file_manager/data/gthumb-file-manager.schemas.in --- gthumb-2.14.3/extensions/file_manager/data/gthumb-file-manager.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/data/gthumb-file-manager.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/file_manager/copy_move/last_folder - /apps/gthumb/ext/file_manager/copy_move/last_folder - gthumb - string - - - - - - - - - /schemas/apps/gthumb/ext/file_manager/copy_move/view_destination - /apps/gthumb/ext/file_manager/copy_move/view_destination - gthumb - bool - true - - - - - - - - diff -Nru gthumb-2.14.3/extensions/file_manager/data/Makefile.am gthumb-3.0.0/extensions/file_manager/data/Makefile.am --- gthumb-2.14.3/extensions/file_manager/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/data/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-file-manager.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/file_manager/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - --include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/file_manager/data/Makefile.in gthumb-3.0.0/extensions/file_manager/data/Makefile.in --- gthumb-2.14.3/extensions/file_manager/data/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/data/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,521 +0,0 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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@ -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 = extensions/file_manager/data -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ - $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.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)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -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_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -SOURCES = -DIST_SOURCES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BISON = @BISON@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ -CLUTTER_LIBS = @CLUTTER_LIBS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ -DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ -DLLTOOL = @DLLTOOL@ -DOC_USER_FORMATS = @DOC_USER_FORMATS@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -EXIV2_CFLAGS = @EXIV2_CFLAGS@ -EXIV2_LIBS = @EXIV2_LIBS@ -EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ -FGREP = @FGREP@ -FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GREP = @GREP@ -GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ -GSTREAMER_LIBS = @GSTREAMER_LIBS@ -GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ -GTHUMB_CFLAGS = @GTHUMB_CFLAGS@ -GTHUMB_EXTENSION_IN_RULE = @GTHUMB_EXTENSION_IN_RULE@ -GTHUMB_EXTENSION_RULE = @GTHUMB_EXTENSION_RULE@ -GTHUMB_IMPLIB = @GTHUMB_IMPLIB@ -GTHUMB_LIBS = @GTHUMB_LIBS@ -GTK_CFLAGS = @GTK_CFLAGS@ -GTK_LIBS = @GTK_LIBS@ -HELP_DIR = @HELP_DIR@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -JPEG_LIBS = @JPEG_LIBS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBBRASERO_CFLAGS = @LIBBRASERO_CFLAGS@ -LIBBRASERO_LIBS = @LIBBRASERO_LIBS@ -LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ -LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@ -LIBOBJS = @LIBOBJS@ -LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ -LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ -LIBS = @LIBS@ -LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ -LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ -LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ -LIBSOUP_LIBS = @LIBSOUP_LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -M_LIBS = @M_LIBS@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OMF_DIR = @OMF_DIR@ -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@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ -SMCLIENT_LIBS = @SMCLIENT_LIBS@ -STRIP = @STRIP@ -TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WARN_CXXFLAGS = @WARN_CXXFLAGS@ -XGETTEXT = @XGETTEXT@ -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_CXX = @ac_ct_CXX@ -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@ -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@ -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@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -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@ -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@ -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-file-manager.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) -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 extensions/file_manager/data/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign extensions/file_manager/data/Makefile -.PRECIOUS: 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 -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -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: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -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: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -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." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: -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-data-local install-schemaDATA - -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: uninstall-schemaDATA - -.MAKE: install-am install-strip - -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local 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-schemaDATA install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ - -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/file_manager/data/$(schema_DATA) - --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 -Nru gthumb-2.14.3/extensions/file_manager/file_manager.extension.in.in gthumb-3.0.0/extensions/file_manager/file_manager.extension.in.in --- gthumb-2.14.3/extensions/file_manager/file_manager.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/file_manager.extension.in.in 2012-04-21 09:25:36.000000000 +0000 @@ -10,3 +10,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/file_manager/gth-copy-task.c gthumb-3.0.0/extensions/file_manager/gth-copy-task.c --- gthumb-2.14.3/extensions/file_manager/gth-copy-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/gth-copy-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -32,7 +32,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthCopyTask, gth_copy_task, GTH_TYPE_TASK) static void @@ -46,7 +46,7 @@ _g_object_unref (self->priv->file_source); _g_object_unref (self->priv->destination); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_copy_task_parent_class)->finalize (object); } @@ -118,7 +118,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthCopyTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -136,34 +135,6 @@ } -GType -gth_copy_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthCopyTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_copy_task_class_init, - NULL, - NULL, - sizeof (GthCopyTask), - 0, - (GInstanceInitFunc) gth_copy_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthCopyTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_copy_task_new (GthFileSource *file_source, GthFileData *destination, diff -Nru gthumb-2.14.3/extensions/file_manager/gth-delete-task.c gthumb-3.0.0/extensions/file_manager/gth-delete-task.c --- gthumb-2.14.3/extensions/file_manager/gth-delete-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/gth-delete-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -28,7 +28,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthDeleteTask, gth_delete_task, GTH_TYPE_TASK) static void @@ -40,7 +40,7 @@ _g_object_list_unref (self->priv->file_list); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_delete_task_parent_class)->finalize (object); } @@ -76,7 +76,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthDeleteTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -94,34 +93,6 @@ } -GType -gth_delete_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthDeleteTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_delete_task_class_init, - NULL, - NULL, - sizeof (GthDeleteTask), - 0, - (GInstanceInitFunc) gth_delete_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthDeleteTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_delete_task_new (GList *file_list) { diff -Nru gthumb-2.14.3/extensions/file_manager/gth-duplicate-task.c gthumb-3.0.0/extensions/file_manager/gth-duplicate-task.c --- gthumb-2.14.3/extensions/file_manager/gth-duplicate-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/gth-duplicate-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -30,7 +30,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthDuplicateTask, gth_duplicate_task, GTH_TYPE_TASK) static void @@ -43,7 +43,7 @@ _g_object_list_unref (self->priv->file_list); _g_object_unref (self->priv->destination); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_duplicate_task_parent_class)->finalize (object); } @@ -56,6 +56,7 @@ gpointer user_data) { GthDuplicateTask *self = user_data; + gth_task_progress (GTH_TASK (self), description, details, pulse, fraction); } @@ -153,7 +154,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthDuplicateTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -172,34 +172,6 @@ } -GType -gth_duplicate_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthDuplicateTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_duplicate_task_class_init, - NULL, - NULL, - sizeof (GthDuplicateTask), - 0, - (GInstanceInitFunc) gth_duplicate_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthDuplicateTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_duplicate_task_new (GList *file_list) { diff -Nru gthumb-2.14.3/extensions/file_manager/gth-reorder-task.c gthumb-3.0.0/extensions/file_manager/gth-reorder-task.c --- gthumb-2.14.3/extensions/file_manager/gth-reorder-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/gth-reorder-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -32,7 +32,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthReorderTask, gth_reorder_task, GTH_TYPE_TASK) static void @@ -47,7 +47,7 @@ _g_object_unref (self->priv->destination); _g_object_unref (self->priv->file_source); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_reorder_task_parent_class)->finalize (object); } @@ -92,7 +92,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthReorderTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -111,34 +110,6 @@ } -GType -gth_reorder_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthReorderTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_reorder_task_class_init, - NULL, - NULL, - sizeof (GthReorderTask), - 0, - (GInstanceInitFunc) gth_reorder_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthReorderTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_reorder_task_new (GthFileSource *file_source, GthFileData *destination, diff -Nru gthumb-2.14.3/extensions/file_manager/Makefile.am gthumb-3.0.0/extensions/file_manager/Makefile.am --- gthumb-2.14.3/extensions/file_manager/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,5 +1,3 @@ -SUBDIRS = data - extensiondir = $(pkglibdir)/extensions extension_LTLIBRARIES = libfile_manager.la diff -Nru gthumb-2.14.3/extensions/file_manager/Makefile.in gthumb-3.0.0/extensions/file_manager/Makefile.in --- gthumb-2.14.3/extensions/file_manager/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -123,48 +140,15 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libfile_manager_la_SOURCES) DIST_SOURCES = $(libfile_manager_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) -RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ - distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -am__relativize = \ - dir0=`pwd`; \ - sed_first='s,^\([^/]*\)/.*$$,\1,'; \ - sed_rest='s,^[^/]*/*,,'; \ - sed_last='s,^.*/\([^/]*\)$$,\1,'; \ - sed_butlast='s,/*[^/]*$$,,'; \ - while test -n "$$dir1"; do \ - first=`echo "$$dir1" | sed -e "$$sed_first"`; \ - if test "$$first" != "."; then \ - if test "$$first" = ".."; then \ - dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ - dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ - else \ - first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ - if test "$$first2" = "$$first"; then \ - dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ - else \ - dir2="../$$dir2"; \ - fi; \ - dir0="$$dir0"/"$$first"; \ - fi; \ - fi; \ - dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ - done; \ - reldir="$$dir2" ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -209,10 +193,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -220,6 +202,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -259,6 +242,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -307,8 +292,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -339,6 +322,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -369,7 +353,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = data extensiondir = $(pkglibdir)/extensions extension_LTLIBRARIES = libfile_manager.la libfile_manager_la_SOURCES = \ @@ -397,7 +380,7 @@ extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) EXTRA_DIST = $(extensionini_in_files) DISTCLEANFILES = $(extensionini_DATA) -all: all-recursive +all: all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -433,7 +416,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -441,6 +423,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -556,8 +540,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -573,76 +560,6 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -653,23 +570,10 @@ mkid -fID $$unique tags: TAGS -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) set x; \ here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ @@ -688,7 +592,7 @@ fi; \ fi ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -738,51 +642,22 @@ || exit 1; \ fi; \ done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ - $(am__relativize); \ - new_distdir=$$reldir; \ - dir1=$$subdir; dir2="$(top_distdir)"; \ - $(am__relativize); \ - new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ - ($(am__cd) $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$new_top_distdir" \ - distdir="$$new_distdir" \ - am__remove_distdir=: \ - am__skip_length_check=: \ - am__skip_mode_fix=: \ - distdir) \ - || exit 1; \ - fi; \ - done check-am: all-am -check: check-recursive +check: check-am all-am: Makefile $(LTLIBRARIES) $(DATA) -installdirs: installdirs-recursive -installdirs-am: +installdirs: for dir in "$(DESTDIR)$(extensiondir)" "$(DESTDIR)$(extensioninidir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive +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-recursive +installcheck: installcheck-am install-strip: if test -z '$(STRIP)'; then \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ @@ -805,97 +680,95 @@ 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-recursive +clean: clean-am clean-am: clean-extensionLTLIBRARIES clean-generic clean-libtool \ mostlyclean-am -distclean: distclean-recursive +distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags -dvi: dvi-recursive +dvi: dvi-am dvi-am: -html: html-recursive +html: html-am html-am: -info: info-recursive +info: info-am info-am: install-data-am: install-extensionLTLIBRARIES install-extensioniniDATA -install-dvi: install-dvi-recursive +install-dvi: install-dvi-am install-dvi-am: install-exec-am: -install-html: install-html-recursive +install-html: install-html-am install-html-am: -install-info: install-info-recursive +install-info: install-info-am install-info-am: install-man: -install-pdf: install-pdf-recursive +install-pdf: install-pdf-am install-pdf-am: -install-ps: install-ps-recursive +install-ps: install-ps-am install-ps-am: installcheck-am: -maintainer-clean: maintainer-clean-recursive +maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic -mostlyclean: mostlyclean-recursive +mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool -pdf: pdf-recursive +pdf: pdf-am pdf-am: -ps: ps-recursive +ps: ps-am ps-am: uninstall-am: uninstall-extensionLTLIBRARIES \ uninstall-extensioniniDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-extensionLTLIBRARIES \ - clean-generic clean-libtool ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags 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-extensionLTLIBRARIES install-extensioniniDATA \ - 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 installdirs-am maintainer-clean \ +.PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-extensionLTLIBRARIES clean-generic clean-libtool ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags 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-extensionLTLIBRARIES \ + install-extensioniniDATA 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-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA + tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ + uninstall-extensioniniDATA @GTHUMB_EXTENSION_IN_RULE@ diff -Nru gthumb-2.14.3/extensions/file_manager/preferences.h gthumb-3.0.0/extensions/file_manager/preferences.h --- gthumb-2.14.3/extensions/file_manager/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_manager/preferences.h 2012-03-23 19:00:44.000000000 +0000 @@ -24,8 +24,15 @@ G_BEGIN_DECLS -#define PREF_FILE_MANAGER_COPY_LAST_FOLDER "/apps/gthumb/ext/file_manager/copy_move/last_folder" -#define PREF_FILE_MANAGER_COPY_VIEW_DESTINATION "/apps/gthumb/ext/file_manager/copy_move/view_destination" +/* schema */ + +#define GTHUMB_FILE_MANAGER_SCHEMA GTHUMB_SCHEMA ".file-manager" + +/* keys */ + +#define PREF_FILE_MANAGER_COPY_LAST_FOLDER "last-folder" +#define PREF_FILE_MANAGER_COPY_VIEW_DESTINATION "view-destination" +#define PREF_FILE_MANAGER_COPY_HISTORY "copy-destination-history" G_END_DECLS diff -Nru gthumb-2.14.3/extensions/file_tools/cairo-rotate.c gthumb-3.0.0/extensions/file_tools/cairo-rotate.c --- gthumb-2.14.3/extensions/file_tools/cairo-rotate.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/cairo-rotate.c 2012-02-19 15:01:32.000000000 +0000 @@ -85,11 +85,11 @@ void -_cairo_image_surface_rotate_get_cropping_region (cairo_surface_t *image, - double angle, - double p1, - double p2, - GdkRectangle *region) +_cairo_image_surface_rotate_get_cropping_region (cairo_surface_t *image, + double angle, + double p1, + double p2, + cairo_rectangle_int_t *region) { double angle_rad; double cos_angle, sin_angle; diff -Nru gthumb-2.14.3/extensions/file_tools/cairo-rotate.h gthumb-3.0.0/extensions/file_tools/cairo-rotate.h --- gthumb-2.14.3/extensions/file_tools/cairo-rotate.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/cairo-rotate.h 2012-02-19 15:01:32.000000000 +0000 @@ -28,22 +28,22 @@ G_BEGIN_DECLS -void _cairo_image_surface_rotate_get_cropping_parameters (cairo_surface_t *image, - double angle, - double *p1_plus_p2, - double *p_min); -void _cairo_image_surface_rotate_get_cropping_region (cairo_surface_t *image, - double angle, - double p1, - double p2, - GdkRectangle *region); -double _cairo_image_surface_rotate_get_align_angle (gboolean vertical, - GdkPoint *p1, - GdkPoint *p2); -cairo_surface_t * _cairo_image_surface_rotate (cairo_surface_t *image, - double angle, - gboolean high_quality, - cairo_color_t *background_color); +void _cairo_image_surface_rotate_get_cropping_parameters (cairo_surface_t *image, + double angle, + double *p1_plus_p2, + double *p_min); +void _cairo_image_surface_rotate_get_cropping_region (cairo_surface_t *image, + double angle, + double p1, + double p2, + cairo_rectangle_int_t *region); +double _cairo_image_surface_rotate_get_align_angle (gboolean vertical, + GdkPoint *p1, + GdkPoint *p2); +cairo_surface_t * _cairo_image_surface_rotate (cairo_surface_t *image, + double angle, + gboolean high_quality, + cairo_color_t *background_color); G_END_DECLS diff -Nru gthumb-2.14.3/extensions/file_tools/data/gthumb_crop_options.schemas.in gthumb-3.0.0/extensions/file_tools/data/gthumb_crop_options.schemas.in --- gthumb-2.14.3/extensions/file_tools/data/gthumb_crop_options.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/data/gthumb_crop_options.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/crop/grid_type - /apps/gthumb/ext/crop/grid_type - gthumb - string - thirds - - - - - - - - /schemas/apps/gthumb/ext/crop/aspect_ratio - /apps/gthumb/ext/crop/aspect_ratio - gthumb - string - none - - - - - - - - /schemas/apps/gthumb/ext/crop/aspect_ratio_invert - /apps/gthumb/ext/crop/aspect_ratio_invert - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/ext/crop/aspect_ratio_width - /apps/gthumb/ext/crop/aspect_ratio_width - gthumb - int - 1 - - - - - - - - /schemas/apps/gthumb/ext/crop/aspect_ratio_height - /apps/gthumb/ext/crop/aspect_ratio_height - gthumb - int - 1 - - - - - - - - /schemas/apps/gthumb/ext/crop/bind_dimensions - /apps/gthumb/ext/crop/bind_dimensions - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/ext/crop/bind_factor - /apps/gthumb/ext/crop/bind_factor - gthumb - int - 8 - - - - - - - - diff -Nru gthumb-2.14.3/extensions/file_tools/data/gthumb_resize_options.schemas.in gthumb-3.0.0/extensions/file_tools/data/gthumb_resize_options.schemas.in --- gthumb-2.14.3/extensions/file_tools/data/gthumb_resize_options.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/data/gthumb_resize_options.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,101 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/resize/unit - /apps/gthumb/ext/resize/unit - gthumb - string - percentage - - - - - - - - /schemas/apps/gthumb/ext/resize/width - /apps/gthumb/ext/resize/width - gthumb - float - 100.0 - - - - - - - - /schemas/apps/gthumb/ext/resize/height - /apps/gthumb/ext/resize/height - gthumb - float - 100.0 - - - - - - - - /schemas/apps/gthumb/ext/resize/aspect_ratio_width - /apps/gthumb/ext/resize/aspect_ratio_width - gthumb - int - 1 - - - - - - - - /schemas/apps/gthumb/ext/resize/aspect_ratio_height - /apps/gthumb/ext/resize/aspect_ratio_height - gthumb - int - 1 - - - - - - - - /schemas/apps/gthumb/ext/resize/aspect_ratio - /apps/gthumb/ext/resize/aspect_ratio - gthumb - string - image - - - - - - - - /schemas/apps/gthumb/ext/resize/aspect_ratio_invert - /apps/gthumb/ext/resize/aspect_ratio_invert - gthumb - bool - true - - - - - - - - /schemas/apps/gthumb/ext/resize/high_quality - /apps/gthumb/ext/resize/high_quality - gthumb - bool - true - - - - - - - - diff -Nru gthumb-2.14.3/extensions/file_tools/data/gthumb_rotate_options.schemas.in gthumb-3.0.0/extensions/file_tools/data/gthumb_rotate_options.schemas.in --- gthumb-2.14.3/extensions/file_tools/data/gthumb_rotate_options.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/data/gthumb_rotate_options.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/rotate/resize - /apps/gthumb/ext/rotate/resize - gthumb - string - crop - - - - - - - - /schemas/apps/gthumb/ext/rotate/keep_aspect_ratio - /apps/gthumb/ext/rotate/keep_aspect_ratio - gthumb - bool - true - - - - - - - - /schemas/apps/gthumb/ext/rotate/grid_type - /apps/gthumb/ext/rotate/grid_type - gthumb - string - thirds - - - - - - - - /schemas/apps/gthumb/ext/rotate/background_color - /apps/gthumb/ext/rotate/background_color - gthumb - string - #000 - - - - - - - - diff -Nru gthumb-2.14.3/extensions/file_tools/data/Makefile.am gthumb-3.0.0/extensions/file_tools/data/Makefile.am --- gthumb-2.14.3/extensions/file_tools/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,20 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = \ - gthumb_crop_options.schemas.in \ - gthumb_resize_options.schemas.in \ - gthumb_rotate_options.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/file_tools/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/file_tools/data/Makefile.in gthumb-3.0.0/extensions/file_tools/data/Makefile.in --- gthumb-2.14.3/extensions/file_tools/data/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/data/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,15 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = \ - gthumb_crop_options.schemas.in \ - gthumb_resize_options.schemas.in \ - gthumb_rotate_options.schemas.in - -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -379,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -565,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -593,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -621,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -630,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -651,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -695,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -705,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/file_tools/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/file_tools/data/ui/adjust-colors-options.ui gthumb-3.0.0/extensions/file_tools/data/ui/adjust-colors-options.ui --- gthumb-2.14.3/extensions/file_tools/data/ui/adjust-colors-options.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/data/ui/adjust-colors-options.ui 2012-02-19 15:01:32.000000000 +0000 @@ -46,7 +46,7 @@ - True + False True 0 @@ -54,6 +54,7 @@ _Preview + False True True False @@ -64,14 +65,14 @@ True - True + False True 1 - True + False True 0 @@ -99,6 +100,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -116,6 +118,7 @@ 2 3 GTK_FILL + GTK_FILL @@ -133,6 +136,7 @@ 3 4 GTK_FILL + GTK_FILL @@ -148,6 +152,7 @@ 2 1 2 + GTK_FILL @@ -163,6 +168,7 @@ 2 2 3 + GTK_FILL @@ -178,6 +184,7 @@ 2 3 4 + GTK_FILL @@ -191,6 +198,7 @@ 1 2 + GTK_FILL @@ -206,6 +214,7 @@ GTK_FILL + GTK_FILL @@ -223,6 +232,7 @@ 5 6 GTK_FILL + GTK_FILL @@ -240,6 +250,7 @@ 6 7 GTK_FILL + GTK_FILL @@ -257,6 +268,7 @@ 7 8 GTK_FILL + GTK_FILL @@ -282,6 +294,7 @@ 2 4 5 + GTK_FILL @@ -297,6 +310,7 @@ 2 5 6 + GTK_FILL @@ -312,6 +326,7 @@ 2 6 7 + GTK_FILL @@ -327,11 +342,12 @@ 2 7 8 + GTK_FILL - True + False True 1 @@ -343,6 +359,7 @@ _Reset + False True True True @@ -357,7 +374,7 @@ - True + False True 2 @@ -390,6 +407,7 @@ gtk-apply + False True True True @@ -406,6 +424,7 @@ gtk-cancel + False True True True diff -Nru gthumb-2.14.3/extensions/file_tools/data/ui/crop-options.ui gthumb-3.0.0/extensions/file_tools/data/ui/crop-options.ui --- gthumb-2.14.3/extensions/file_tools/data/ui/crop-options.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/data/ui/crop-options.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,34 +1,66 @@ - + - + + 1 + 100000 + 1 + 1 + + + 999999 + 1 + + + 999999 + 1 + + + 999999 + 1 + + + 999999 + 1 + + + 999999 + 1 + True + False 6 True + False True + False 12 True + False 0 none True + False 6 12 True + False 6 True + False 3 2 6 @@ -36,6 +68,7 @@ True + False 0 _Position: True @@ -49,6 +82,7 @@ True + False 0 Size: True @@ -64,28 +98,32 @@ True + False 6 True True - + 5 crop_x_adjustment 1 False + True 0 True - × + False + × False + True 1 @@ -93,13 +131,14 @@ True True - + 5 crop_y_adjustment 1 False + True 2 @@ -114,12 +153,13 @@ True + False 6 True True - + 5 crop_width_adjustment 1 @@ -133,10 +173,12 @@ True - × + False + × False + True 1 @@ -144,7 +186,7 @@ True True - + 5 crop_height_adjustment 1 @@ -168,6 +210,7 @@ True + False @@ -177,11 +220,13 @@ 2 2 3 + GTK_FILL True + False 0 _Grid: True @@ -190,26 +235,33 @@ 2 3 GTK_FILL + GTK_FILL + False + True 0 True + False 6 spread + False True True True + False True + False Maximize @@ -225,12 +277,15 @@ + False True True True + False True + False Center @@ -246,6 +301,8 @@ + False + True 1 @@ -256,6 +313,7 @@ True + False Selection @@ -272,20 +330,24 @@ True + False 0 none True + False 6 12 True + False 6 True + False @@ -299,23 +361,26 @@ True + False 6 True True - + ratio_w_adjustment 1 False + True 0 True + False : @@ -328,13 +393,14 @@ True True - + ratio_h_adjustment 1 if-valid False + True 2 @@ -348,9 +414,11 @@ I_nvert aspect ratio + False True True False + False True True @@ -363,18 +431,22 @@ True + False 6 M_ultiple of: + False True True False + False True True False + True 0 @@ -382,27 +454,33 @@ True True - + 5 bind_factor_adjustment False + True 1 True + False 0 px + False + True 2 + False + True 3 @@ -413,6 +491,7 @@ True + False Aspect ratio @@ -429,15 +508,18 @@ False + True 0 True + False False + True 6 1 @@ -445,14 +527,17 @@ True + False 12 center C_rop + False True True True + False True @@ -464,9 +549,11 @@ gtk-cancel + False True True True + False True @@ -486,34 +573,8 @@ - - 999999 - 1 - - - 999999 - 1 - - - 999999 - 1 - - - 999999 - 1 - - - 999999 - 1 - 999999 1 - - 1 - 1 - 100000 - 1 - diff -Nru gthumb-2.14.3/extensions/file_tools/data/ui/Makefile.in gthumb-3.0.0/extensions/file_tools/data/ui/Makefile.in --- gthumb-2.14.3/extensions/file_tools/data/ui/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/data/ui/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -340,8 +362,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/file_tools/data/ui/resize-options.ui gthumb-3.0.0/extensions/file_tools/data/ui/resize-options.ui --- gthumb-2.14.3/extensions/file_tools/data/ui/resize-options.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/data/ui/resize-options.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,6 +1,24 @@ + + 999999 + 1 + + + 999999 + 1 + + + 1 + 999999 + 1 + + + 1 + 999999 + 1 + True False @@ -146,6 +164,7 @@ 2 3 GTK_FILL + GTK_FILL @@ -153,7 +172,7 @@ - True + False True 0 @@ -166,6 +185,7 @@ spread + False True True True @@ -191,6 +211,7 @@ + False True True True @@ -217,7 +238,7 @@ - True + False True 1 @@ -330,6 +351,7 @@ I_nvert aspect ratio + False True True False @@ -384,6 +406,7 @@ High _quality + False True True False @@ -426,7 +449,7 @@ False - True + False True 3 @@ -460,6 +483,7 @@ GTK_FILL + GTK_FILL @@ -476,6 +500,7 @@ 2 3 GTK_FILL + GTK_FILL @@ -491,6 +516,7 @@ 1 2 + GTK_FILL @@ -508,6 +534,7 @@ 2 2 3 + GTK_FILL @@ -524,6 +551,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -541,6 +569,7 @@ 2 1 2 + GTK_FILL @@ -554,7 +583,7 @@ - True + False True 4 @@ -587,6 +616,7 @@ gtk-ok + False True True True @@ -603,6 +633,7 @@ gtk-cancel + False True True True @@ -626,24 +657,6 @@ - - 999999 - 1 - - - 999999 - 1 - - - 1 - 999999 - 1 - - - 1 - 999999 - 1 - diff -Nru gthumb-2.14.3/extensions/file_tools/data/ui/rotate-options.ui gthumb-3.0.0/extensions/file_tools/data/ui/rotate-options.ui --- gthumb-2.14.3/extensions/file_tools/data/ui/rotate-options.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/data/ui/rotate-options.ui 2012-02-19 15:01:32.000000000 +0000 @@ -58,7 +58,7 @@ - True + False True 0 @@ -71,6 +71,7 @@ spread + False True True True @@ -95,7 +96,7 @@ - True + False True 1 @@ -151,7 +152,7 @@ - True + False True 0 @@ -177,6 +178,7 @@ 2 1 2 + GTK_FILL @@ -192,6 +194,7 @@ 2 2 3 + GTK_FILL @@ -205,6 +208,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -218,11 +222,13 @@ 2 3 GTK_FILL + GTK_FILL Keep aspect ratio + False True True False @@ -233,11 +239,12 @@ 2 + GTK_FILL - True + False True 1 @@ -294,6 +301,7 @@ 1 2 + GTK_FILL @@ -305,6 +313,7 @@ GTK_FILL + GTK_FILL @@ -314,6 +323,7 @@ 6 + False True True True @@ -330,6 +340,7 @@ _Transparent + False True True False @@ -350,6 +361,7 @@ 2 1 2 + GTK_FILL @@ -364,6 +376,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -382,7 +395,7 @@ - True + False True 2 @@ -394,6 +407,7 @@ 6 + False True True True @@ -414,7 +428,7 @@ - True + False True 3 @@ -447,6 +461,7 @@ gtk-apply + False True True True @@ -463,6 +478,7 @@ gtk-cancel + False True True True @@ -535,7 +551,7 @@ - True + False True 0 @@ -560,6 +576,7 @@ Parallel + False True True False @@ -577,6 +594,7 @@ Perpendicular + False True True False @@ -641,6 +659,7 @@ gtk-cancel + False True True True diff -Nru gthumb-2.14.3/extensions/file_tools/data/ui/sharpen-options.ui gthumb-3.0.0/extensions/file_tools/data/ui/sharpen-options.ui --- gthumb-2.14.3/extensions/file_tools/data/ui/sharpen-options.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/data/ui/sharpen-options.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,36 +1,46 @@ - + - True + False 6 True + False True + False 12 12 True + False 12 - + True + False + vertical _Preview: + False True True False + False True + 0 True True + False + True 0 @@ -38,11 +48,14 @@ 190 True + False + False + False 1 @@ -50,12 +63,15 @@ + False + True 0 True + False 3 2 6 @@ -63,6 +79,7 @@ True + False 0 Threshold: True @@ -71,11 +88,13 @@ 2 3 GTK_FILL + GTK_FILL True + False @@ -85,11 +104,13 @@ 2 2 3 + GTK_FILL True + False @@ -99,11 +120,13 @@ 2 1 2 + GTK_FILL True + False 0 Radius: True @@ -112,22 +135,26 @@ 1 2 GTK_FILL + GTK_FILL True + False 0 Amount: True GTK_FILL + GTK_FILL True + False @@ -135,46 +162,58 @@ 1 2 + GTK_FILL + False + True 1 True + False _Reset + False True True True + False True False + True 0 + False + True 2 False + True 0 True + False False + True 6 1 @@ -182,14 +221,17 @@ True + False 12 center gtk-apply + False True True True + False True True @@ -202,9 +244,11 @@ gtk-cancel + False True True True + False True diff -Nru gthumb-2.14.3/extensions/file_tools/file_tools.extension.in.in gthumb-3.0.0/extensions/file_tools/file_tools.extension.in.in --- gthumb-2.14.3/extensions/file_tools/file_tools.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/file_tools.extension.in.in 2012-04-21 09:25:32.000000000 +0000 @@ -10,4 +10,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=image_viewer diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-adjust-colors.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-adjust-colors.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-adjust-colors.c 2012-01-15 11:23:25.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-adjust-colors.c 2012-02-19 15:01:32.000000000 +0000 @@ -30,7 +30,7 @@ #define APPLY_DELAY 150 -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthFileToolAdjustColors, gth_file_tool_adjust_colors, GTH_TYPE_FILE_TOOL) struct _GthFileToolAdjustColorsPrivate { @@ -522,7 +522,7 @@ static void -gth_file_tool_adjust_colors_instance_init (GthFileToolAdjustColors *self) +gth_file_tool_adjust_colors_init (GthFileToolAdjustColors *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_ADJUST_COLORS, GthFileToolAdjustColorsPrivate); self->priv->histogram = gth_histogram_new (); @@ -547,8 +547,7 @@ _g_object_unref (self->priv->builder); _g_object_unref (self->priv->histogram); - /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_tool_adjust_colors_parent_class)->finalize (object); } @@ -558,7 +557,6 @@ GObjectClass *gobject_class; GthFileToolClass *file_tool_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthFileToolAdjustColorsPrivate)); gobject_class = (GObjectClass*) class; @@ -570,25 +568,3 @@ file_tool_class->get_options = gth_file_tool_adjust_colors_get_options; file_tool_class->destroy_options = gth_file_tool_adjust_colors_destroy_options; } - - -GType -gth_file_tool_adjust_colors_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolAdjustColorsClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_adjust_colors_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolAdjustColors), - 0, - (GInstanceInitFunc) gth_file_tool_adjust_colors_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolAdjustColors", &g_define_type_info, 0); - } - return type_id; -} diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-crop.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-crop.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-crop.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-crop.c 2012-02-19 15:01:32.000000000 +0000 @@ -22,6 +22,7 @@ #include #include #include +#include #include "enum-types.h" #include "gth-file-tool-crop.h" #include "preferences.h" @@ -30,10 +31,11 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthFileToolCrop, gth_file_tool_crop, GTH_TYPE_FILE_TOOL) struct _GthFileToolCropPrivate { + GSettings *settings; GtkBuilder *builder; int pixbuf_width; int pixbuf_height; @@ -76,12 +78,12 @@ crop_button_clicked_cb (GtkButton *button, GthFileToolCrop *self) { - GdkRectangle selection; - GtkWidget *window; - GtkWidget *viewer_page; - GtkWidget *viewer; - cairo_surface_t *old_image; - cairo_surface_t *new_image; + cairo_rectangle_int_t selection; + GtkWidget *window; + GtkWidget *viewer_page; + GtkWidget *viewer; + cairo_surface_t *old_image; + cairo_surface_t *new_image; gth_image_selector_get_selection (self->priv->selector, &selection); if ((selection.width == 0) || (selection.height == 0)) @@ -156,8 +158,8 @@ selector_selection_changed_cb (GthImageSelector *selector, GthFileToolCrop *self) { - GdkRectangle selection; - int min, max; + cairo_rectangle_int_t selection; + int min, max; gth_image_selector_get_selection (selector, &selection); @@ -440,10 +442,14 @@ gtk_widget_show (self->priv->ratio_combobox); gtk_box_pack_start (GTK_BOX (GET_WIDGET ("ratio_combobox_box")), self->priv->ratio_combobox, FALSE, FALSE, 0); - gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->ratio_combobox), eel_gconf_get_enum (PREF_CROP_ASPECT_RATIO, GTH_TYPE_ASPECT_RATIO, GTH_ASPECT_RATIO_NONE)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_w_spinbutton")), MAX (eel_gconf_get_integer (PREF_CROP_ASPECT_RATIO_WIDTH, 1), 1)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_h_spinbutton")), MAX (eel_gconf_get_integer (PREF_CROP_ASPECT_RATIO_HEIGHT, 1), 1)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("invert_ratio_checkbutton")), eel_gconf_get_boolean (PREF_CROP_ASPECT_RATIO_INVERT, FALSE)); + gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->ratio_combobox), + g_settings_get_enum (self->priv->settings, PREF_CROP_ASPECT_RATIO)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_w_spinbutton")), + MAX (g_settings_get_int (self->priv->settings, PREF_CROP_ASPECT_RATIO_WIDTH), 1)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_h_spinbutton")), + MAX (g_settings_get_int (self->priv->settings, PREF_CROP_ASPECT_RATIO_HEIGHT), 1)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("invert_ratio_checkbutton")), + g_settings_get_boolean (self->priv->settings, PREF_CROP_ASPECT_RATIO_INVERT)); self->priv->grid_type_combobox = _gtk_combo_box_new_with_texts (_("None"), _("Rule of Thirds"), @@ -451,12 +457,17 @@ _("Center Lines"), _("Uniform"), NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->grid_type_combobox), eel_gconf_get_enum (PREF_CROP_GRID_TYPE, GTH_TYPE_GRID_TYPE, GTH_GRID_THIRDS)); + gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->grid_type_combobox), + g_settings_get_enum (self->priv->settings, PREF_CROP_GRID_TYPE)); gtk_widget_show (self->priv->grid_type_combobox); - gtk_box_pack_start (GTK_BOX (GET_WIDGET ("grid_type_combobox_box")), self->priv->grid_type_combobox, FALSE, FALSE, 0); - gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("grid_label")), self->priv->grid_type_combobox); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("bind_dimensions_checkbutton")), eel_gconf_get_boolean (PREF_CROP_BIND_DIMENSIONS, FALSE)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("bind_factor_spinbutton")), eel_gconf_get_integer (PREF_CROP_BIND_FACTOR, 8)); + gtk_box_pack_start (GTK_BOX (GET_WIDGET ("grid_type_combobox_box")), + self->priv->grid_type_combobox, FALSE, FALSE, 0); + gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("grid_label")), + self->priv->grid_type_combobox); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("bind_dimensions_checkbutton")), + g_settings_get_boolean (self->priv->settings, PREF_CROP_BIND_DIMENSIONS)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("bind_factor_spinbutton")), + g_settings_get_int (self->priv->settings, PREF_CROP_BIND_FACTOR)); g_signal_connect (GET_WIDGET ("crop_button"), "clicked", @@ -551,19 +562,20 @@ GtkWidget *window; GtkWidget *viewer_page; GtkWidget *viewer; + GSettings *viewer_settings; self = (GthFileToolCrop *) base; if (self->priv->builder != NULL) { /* save the dialog options */ - eel_gconf_set_enum (PREF_CROP_GRID_TYPE, GTH_TYPE_GRID_TYPE, gth_image_selector_get_grid_type (self->priv->selector)); - eel_gconf_set_integer (PREF_CROP_ASPECT_RATIO_WIDTH, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_w_spinbutton")))); - eel_gconf_set_integer (PREF_CROP_ASPECT_RATIO_HEIGHT, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_h_spinbutton")))); - eel_gconf_set_enum (PREF_CROP_ASPECT_RATIO, GTH_TYPE_ASPECT_RATIO, gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->ratio_combobox))); - eel_gconf_set_boolean (PREF_CROP_ASPECT_RATIO_INVERT, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("invert_ratio_checkbutton")))); - eel_gconf_set_boolean (PREF_CROP_BIND_DIMENSIONS, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("bind_dimensions_checkbutton")))); - eel_gconf_set_integer (PREF_CROP_BIND_FACTOR, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("bind_factor_spinbutton")))); + g_settings_set_enum (self->priv->settings, PREF_CROP_GRID_TYPE, gth_image_selector_get_grid_type (self->priv->selector)); + g_settings_set_int (self->priv->settings, PREF_CROP_ASPECT_RATIO_WIDTH, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_w_spinbutton")))); + g_settings_set_int (self->priv->settings, PREF_CROP_ASPECT_RATIO_HEIGHT, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_h_spinbutton")))); + g_settings_set_enum (self->priv->settings, PREF_CROP_ASPECT_RATIO, gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->ratio_combobox))); + g_settings_set_boolean (self->priv->settings, PREF_CROP_ASPECT_RATIO_INVERT, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("invert_ratio_checkbutton")))); + g_settings_set_boolean (self->priv->settings, PREF_CROP_BIND_DIMENSIONS, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("bind_dimensions_checkbutton")))); + g_settings_set_int (self->priv->settings, PREF_CROP_BIND_FACTOR, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("bind_factor_spinbutton")))); /* destroy the option data */ @@ -577,7 +589,13 @@ viewer_page = gth_browser_get_viewer_page (GTH_BROWSER (window)); viewer = gth_image_viewer_page_get_image_viewer (GTH_IMAGE_VIEWER_PAGE (viewer_page)); gth_image_viewer_set_tool (GTH_IMAGE_VIEWER (viewer), NULL); - gth_image_viewer_set_zoom_quality (GTH_IMAGE_VIEWER (viewer), eel_gconf_get_enum (PREF_ZOOM_QUALITY, GTH_TYPE_ZOOM_QUALITY, GTH_ZOOM_QUALITY_HIGH)); + + /* restore the zoom quality */ + viewer_settings = g_settings_new (GTHUMB_IMAGE_VIEWER_SCHEMA); + gth_image_viewer_set_zoom_quality (GTH_IMAGE_VIEWER (viewer), + g_settings_get_enum (viewer_settings, PREF_IMAGE_VIEWER_ZOOM_QUALITY)); + + g_object_unref (viewer_settings); } @@ -589,9 +607,10 @@ static void -gth_file_tool_crop_instance_init (GthFileToolCrop *self) +gth_file_tool_crop_init (GthFileToolCrop *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_CROP, GthFileToolCropPrivate); + self->priv->settings = g_settings_new (GTHUMB_CROP_SCHEMA); gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-crop", _("Crop..."), _("Crop"), FALSE); } @@ -608,9 +627,10 @@ _g_object_unref (self->priv->selector); _g_object_unref (self->priv->builder); + _g_object_unref (self->priv->settings); /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_tool_crop_parent_class)->finalize (object); } @@ -620,7 +640,6 @@ GObjectClass *gobject_class; GthFileToolClass *file_tool_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthFileToolCropPrivate)); gobject_class = (GObjectClass*) class; @@ -632,25 +651,3 @@ file_tool_class->get_options = gth_file_tool_crop_get_options; file_tool_class->destroy_options = gth_file_tool_crop_destroy_options; } - - -GType -gth_file_tool_crop_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolCropClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_crop_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolCrop), - 0, - (GInstanceInitFunc) gth_file_tool_crop_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolCrop", &g_define_type_info, 0); - } - return type_id; -} diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-desaturate.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-desaturate.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-desaturate.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-desaturate.c 2012-02-19 15:01:32.000000000 +0000 @@ -25,6 +25,9 @@ #include "gth-file-tool-desaturate.h" +G_DEFINE_TYPE (GthFileToolDesaturate, gth_file_tool_desaturate, GTH_TYPE_FILE_TOOL) + + typedef struct { GtkWidget *viewer_page; cairo_surface_t *source; @@ -184,37 +187,18 @@ static void -gth_file_tool_desaturate_instance_init (GthFileToolDesaturate *self) +gth_file_tool_desaturate_class_init (GthFileToolDesaturateClass *klass) { - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-desaturate", _("Desaturate"), _("Desaturate"), FALSE); + GthFileToolClass *file_tool_class; + + file_tool_class = GTH_FILE_TOOL_CLASS (klass); + file_tool_class->update_sensitivity = gth_file_tool_desaturate_update_sensitivity; + file_tool_class->activate = gth_file_tool_desaturate_activate; } static void -gth_file_tool_desaturate_class_init (GthFileToolClass *klass) +gth_file_tool_desaturate_init (GthFileToolDesaturate *self) { - klass->update_sensitivity = gth_file_tool_desaturate_update_sensitivity; - klass->activate = gth_file_tool_desaturate_activate; -} - - -GType -gth_file_tool_desaturate_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolDesaturateClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_desaturate_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolDesaturate), - 0, - (GInstanceInitFunc) gth_file_tool_desaturate_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolDesaturate", &g_define_type_info, 0); - } - return type_id; + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-desaturate", _("Desaturate"), _("Desaturate"), FALSE); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-enhance.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-enhance.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-enhance.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-enhance.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,6 +26,9 @@ #include "gth-file-tool-enhance.h" +G_DEFINE_TYPE (GthFileToolEnhance, gth_file_tool_enhance, GTH_TYPE_FILE_TOOL) + + typedef struct { double gamma[GTH_HISTOGRAM_N_CHANNELS]; double low_input[GTH_HISTOGRAM_N_CHANNELS]; @@ -334,7 +337,7 @@ static void -gth_file_tool_enhance_instance_init (GthFileToolEnhance *self) +gth_file_tool_enhance_init (GthFileToolEnhance *self) { gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-enhance", _("Enhance Colors"), NULL, TRUE); gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Automatic white balance correction")); @@ -342,30 +345,11 @@ static void -gth_file_tool_enhance_class_init (GthFileToolClass *klass) +gth_file_tool_enhance_class_init (GthFileToolEnhanceClass *klass) { - klass->update_sensitivity = gth_file_tool_enhance_update_sensitivity; - klass->activate = gth_file_tool_enhance_activate; -} + GthFileToolClass *file_tool_class; - -GType -gth_file_tool_enhance_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolEnhanceClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_enhance_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolEnhance), - 0, - (GInstanceInitFunc) gth_file_tool_enhance_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolEnhance", &g_define_type_info, 0); - } - return type_id; + file_tool_class = GTH_FILE_TOOL_CLASS (klass); + file_tool_class->update_sensitivity = gth_file_tool_enhance_update_sensitivity; + file_tool_class->activate = gth_file_tool_enhance_activate; } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-equalize.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-equalize.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-equalize.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-equalize.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,6 +26,9 @@ #include "gth-file-tool-equalize.h" +G_DEFINE_TYPE (GthFileToolEqualize, gth_file_tool_equalize, GTH_TYPE_FILE_TOOL) + + typedef struct { GtkWidget *viewer_page; cairo_surface_t *source; @@ -256,38 +259,19 @@ static void -gth_file_tool_equalize_instance_init (GthFileToolEqualize *self) +gth_file_tool_equalize_class_init (GthFileToolEqualizeClass *klass) { - gth_file_tool_construct (GTH_FILE_TOOL (self), "histogram", _("Equalize"), NULL, FALSE); - gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Equalize image histogram")); + GthFileToolClass *file_tool_class; + + file_tool_class = GTH_FILE_TOOL_CLASS (klass); + file_tool_class->update_sensitivity = gth_file_tool_equalize_update_sensitivity; + file_tool_class->activate = gth_file_tool_equalize_activate; } static void -gth_file_tool_equalize_class_init (GthFileToolClass *klass) +gth_file_tool_equalize_init (GthFileToolEqualize *self) { - klass->update_sensitivity = gth_file_tool_equalize_update_sensitivity; - klass->activate = gth_file_tool_equalize_activate; -} - - -GType -gth_file_tool_equalize_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolEqualizeClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_equalize_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolEqualize), - 0, - (GInstanceInitFunc) gth_file_tool_equalize_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolEqualize", &g_define_type_info, 0); - } - return type_id; + gth_file_tool_construct (GTH_FILE_TOOL (self), "histogram", _("Equalize"), NULL, FALSE); + gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Equalize image histogram")); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-flip.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-flip.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-flip.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-flip.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,6 +26,9 @@ #include "gth-file-tool-flip.h" +G_DEFINE_TYPE (GthFileToolFlip, gth_file_tool_flip, GTH_TYPE_FILE_TOOL) + + static void gth_file_tool_flip_activate (GthFileTool *base) { @@ -68,38 +71,19 @@ static void -gth_file_tool_flip_instance_init (GthFileToolFlip *self) +gth_file_tool_flip_class_init (GthFileToolFlipClass *klass) { - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-flip", _("Flip"), NULL, FALSE); - gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Flip the image vertically")); + GthFileToolClass *file_tool_class; + + file_tool_class = GTH_FILE_TOOL_CLASS (klass); + file_tool_class->update_sensitivity = gth_file_tool_flip_update_sensitivity; + file_tool_class->activate = gth_file_tool_flip_activate; } static void -gth_file_tool_flip_class_init (GthFileToolClass *klass) +gth_file_tool_flip_init (GthFileToolFlip *self) { - klass->update_sensitivity = gth_file_tool_flip_update_sensitivity; - klass->activate = gth_file_tool_flip_activate; -} - - -GType -gth_file_tool_flip_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolFlipClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_flip_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolFlip), - 0, - (GInstanceInitFunc) gth_file_tool_flip_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolFlip", &g_define_type_info, 0); - } - return type_id; + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-flip", _("Flip"), NULL, FALSE); + gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Flip the image vertically")); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-mirror.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-mirror.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-mirror.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-mirror.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,6 +26,9 @@ #include "gth-file-tool-mirror.h" +G_DEFINE_TYPE (GthFileToolMirror, gth_file_tool_mirror, GTH_TYPE_FILE_TOOL) + + static void gth_file_tool_mirror_activate (GthFileTool *base) { @@ -68,38 +71,19 @@ static void -gth_file_tool_mirror_instance_init (GthFileToolMirror *self) +gth_file_tool_mirror_class_init (GthFileToolMirrorClass *klass) { - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-mirror", _("Mirror"), NULL, FALSE); - gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Mirror the image horizontally")); + GthFileToolClass *file_tool_class; + + file_tool_class = GTH_FILE_TOOL_CLASS (klass); + file_tool_class->update_sensitivity = gth_file_tool_mirror_update_sensitivity; + file_tool_class->activate = gth_file_tool_mirror_activate; } static void -gth_file_tool_mirror_class_init (GthFileToolClass *klass) +gth_file_tool_mirror_init (GthFileToolMirror *self) { - klass->update_sensitivity = gth_file_tool_mirror_update_sensitivity; - klass->activate = gth_file_tool_mirror_activate; -} - - -GType -gth_file_tool_mirror_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolMirrorClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_mirror_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolMirror), - 0, - (GInstanceInitFunc) gth_file_tool_mirror_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolMirror", &g_define_type_info, 0); - } - return type_id; + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-mirror", _("Mirror"), NULL, FALSE); + gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Mirror the image horizontally")); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-negative.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-negative.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-negative.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-negative.c 2012-02-19 15:01:32.000000000 +0000 @@ -25,6 +25,9 @@ #include "gth-file-tool-negative.h" +G_DEFINE_TYPE (GthFileToolNegative, gth_file_tool_negative, GTH_TYPE_FILE_TOOL) + + typedef struct { GtkWidget *viewer_page; cairo_surface_t *source; @@ -178,37 +181,18 @@ static void -gth_file_tool_negative_instance_init (GthFileToolNegative *self) +gth_file_tool_negative_class_init (GthFileToolNegativeClass *klass) { - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-invert", _("Negative"), _("Negative"), FALSE); + GthFileToolClass *file_tool_class; + + file_tool_class = GTH_FILE_TOOL_CLASS (klass); + file_tool_class->update_sensitivity = gth_file_tool_negative_update_sensitivity; + file_tool_class->activate = gth_file_tool_negative_activate; } static void -gth_file_tool_negative_class_init (GthFileToolClass *klass) +gth_file_tool_negative_init (GthFileToolNegative *self) { - klass->update_sensitivity = gth_file_tool_negative_update_sensitivity; - klass->activate = gth_file_tool_negative_activate; -} - - -GType -gth_file_tool_negative_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolNegativeClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_negative_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolNegative), - 0, - (GInstanceInitFunc) gth_file_tool_negative_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolNegative", &g_define_type_info, 0); - } - return type_id; + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-invert", _("Negative"), _("Negative"), FALSE); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-redo.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-redo.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-redo.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-redo.c 2012-02-19 15:01:32.000000000 +0000 @@ -25,6 +25,9 @@ #include "gth-file-tool-redo.h" +G_DEFINE_TYPE (GthFileToolRedo, gth_file_tool_redo, GTH_TYPE_FILE_TOOL) + + static void gth_file_tool_redo_update_sensitivity (GthFileTool *base) { @@ -37,7 +40,6 @@ gtk_widget_set_sensitive (GTK_WIDGET (base), FALSE); else gtk_widget_set_sensitive (GTK_WIDGET (base), gth_image_history_can_redo (gth_image_viewer_page_get_history (GTH_IMAGE_VIEWER_PAGE (viewer_page)))); - } @@ -57,37 +59,18 @@ static void -gth_file_tool_redo_instance_init (GthFileToolRedo *self) +gth_file_tool_redo_class_init (GthFileToolRedoClass *klass) { - gth_file_tool_construct (GTH_FILE_TOOL (self), "redo", _("Redo"), _("Redo"), FALSE); + GthFileToolClass *file_tool_class; + + file_tool_class = GTH_FILE_TOOL_CLASS (klass); + file_tool_class->update_sensitivity = gth_file_tool_redo_update_sensitivity; + file_tool_class->activate = gth_file_tool_redo_activate; } static void -gth_file_tool_redo_class_init (GthFileToolClass *klass) +gth_file_tool_redo_init (GthFileToolRedo *self) { - klass->update_sensitivity = gth_file_tool_redo_update_sensitivity; - klass->activate = gth_file_tool_redo_activate; -} - - -GType -gth_file_tool_redo_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolRedoClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_redo_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolRedo), - 0, - (GInstanceInitFunc) gth_file_tool_redo_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolRedo", &g_define_type_info, 0); - } - return type_id; + gth_file_tool_construct (GTH_FILE_TOOL (self), "redo", _("Redo"), _("Redo"), FALSE); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-resize.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-resize.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-resize.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-resize.c 2012-02-19 15:01:32.000000000 +0000 @@ -33,10 +33,11 @@ #define PIXELS_UNIT_POSITION 0 -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthFileToolResize, gth_file_tool_resize, GTH_TYPE_FILE_TOOL) struct _GthFileToolResizePrivate { + GSettings *settings; cairo_surface_t *original_image; cairo_surface_t *new_image; GtkBuilder *builder; @@ -463,8 +464,8 @@ self->priv->new_image = NULL; self->priv->new_width = self->priv->original_width; self->priv->new_height = self->priv->original_height; - self->priv->filter = eel_gconf_get_boolean (PREF_RESIZE_HIGH_QUALITY, TRUE) ? CAIRO_FILTER_GAUSSIAN : CAIRO_FILTER_NEAREST; - self->priv->unit = eel_gconf_get_enum (PREF_RESIZE_UNIT, GTH_TYPE_UNIT, GTH_UNIT_PERCENTAGE); + self->priv->filter = g_settings_get_boolean (self->priv->settings, PREF_RESIZE_HIGH_QUALITY) ? CAIRO_FILTER_GAUSSIAN : CAIRO_FILTER_NEAREST; + self->priv->unit = g_settings_get_enum (self->priv->settings, PREF_RESIZE_UNIT); self->priv->builder = _gtk_builder_new_from_file ("resize-options.ui", "file_tools"); update_dimensione_info_label (self, @@ -479,14 +480,18 @@ if (self->priv->unit == GTH_UNIT_PIXELS) { gtk_spin_button_set_digits (GTK_SPIN_BUTTON (GET_WIDGET ("resize_width_spinbutton")), 0); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (GET_WIDGET ("resize_height_spinbutton")), 0); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_width_spinbutton")), eel_gconf_get_float (PREF_RESIZE_WIDTH, self->priv->original_width)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_height_spinbutton")), eel_gconf_get_float (PREF_RESIZE_HEIGHT, self->priv->original_height)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_width_spinbutton")), + g_settings_get_double (self->priv->settings, PREF_RESIZE_WIDTH)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_height_spinbutton")), + g_settings_get_double (self->priv->settings, PREF_RESIZE_HEIGHT)); } else if (self->priv->unit == GTH_UNIT_PERCENTAGE) { gtk_spin_button_set_digits (GTK_SPIN_BUTTON (GET_WIDGET ("resize_width_spinbutton")), 2); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (GET_WIDGET ("resize_height_spinbutton")), 2); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_width_spinbutton")), eel_gconf_get_float (PREF_RESIZE_WIDTH, 100.0)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_height_spinbutton")), eel_gconf_get_float (PREF_RESIZE_HEIGHT, 100.0)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_width_spinbutton")), + g_settings_get_double (self->priv->settings, PREF_RESIZE_WIDTH)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_height_spinbutton")), + g_settings_get_double (self->priv->settings, PREF_RESIZE_HEIGHT)); } gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("unit_combobox")), self->priv->unit); @@ -513,11 +518,15 @@ gtk_widget_show (self->priv->ratio_combobox); gtk_box_pack_start (GTK_BOX (GET_WIDGET ("ratio_combobox_box")), self->priv->ratio_combobox, FALSE, FALSE, 0); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("high_quality_checkbutton")), self->priv->filter != CAIRO_FILTER_NEAREST); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("invert_ratio_checkbutton")), eel_gconf_get_boolean (PREF_RESIZE_ASPECT_RATIO_INVERT, FALSE)); - - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_w_spinbutton")), MAX (eel_gconf_get_integer (PREF_RESIZE_ASPECT_RATIO_WIDTH, 1), 1)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_h_spinbutton")), MAX (eel_gconf_get_integer (PREF_RESIZE_ASPECT_RATIO_HEIGHT, 1), 1)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("high_quality_checkbutton")), + self->priv->filter != CAIRO_FILTER_NEAREST); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("invert_ratio_checkbutton")), + g_settings_get_boolean (self->priv->settings, PREF_RESIZE_ASPECT_RATIO_INVERT)); + + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_w_spinbutton")), + MAX (g_settings_get_int (self->priv->settings, PREF_RESIZE_ASPECT_RATIO_WIDTH), 1)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_h_spinbutton")), + MAX (g_settings_get_int (self->priv->settings, PREF_RESIZE_ASPECT_RATIO_HEIGHT), 1)); g_signal_connect (GET_WIDGET ("resize_button"), "clicked", @@ -568,7 +577,8 @@ G_CALLBACK (screen_size_button_clicked_cb), self); - gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->ratio_combobox), eel_gconf_get_enum (PREF_RESIZE_ASPECT_RATIO, GTH_TYPE_ASPECT_RATIO, GTH_ASPECT_RATIO_IMAGE)); + gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->ratio_combobox), + g_settings_get_enum (self->priv->settings, PREF_RESIZE_ASPECT_RATIO)); return options; } @@ -590,14 +600,14 @@ /* save the dialog options */ unit = gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("unit_combobox"))); - eel_gconf_set_enum (PREF_RESIZE_UNIT, GTH_TYPE_UNIT, unit); - eel_gconf_set_float (PREF_RESIZE_WIDTH, (float) gtk_spin_button_get_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_width_spinbutton")))); - eel_gconf_set_float (PREF_RESIZE_HEIGHT, (float) gtk_spin_button_get_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_height_spinbutton")))); - eel_gconf_set_integer (PREF_RESIZE_ASPECT_RATIO_WIDTH, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_w_spinbutton")))); - eel_gconf_set_integer (PREF_RESIZE_ASPECT_RATIO_HEIGHT, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_h_spinbutton")))); - eel_gconf_set_enum (PREF_RESIZE_ASPECT_RATIO, GTH_TYPE_ASPECT_RATIO, gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->ratio_combobox))); - eel_gconf_set_boolean (PREF_RESIZE_ASPECT_RATIO_INVERT, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("invert_ratio_checkbutton")))); - eel_gconf_set_boolean (PREF_RESIZE_HIGH_QUALITY, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("high_quality_checkbutton")))); + g_settings_set_enum (self->priv->settings, PREF_RESIZE_UNIT, unit); + g_settings_set_double (self->priv->settings, PREF_RESIZE_WIDTH, (float) gtk_spin_button_get_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_width_spinbutton")))); + g_settings_set_double (self->priv->settings, PREF_RESIZE_HEIGHT, (float) gtk_spin_button_get_value (GTK_SPIN_BUTTON (GET_WIDGET ("resize_height_spinbutton")))); + g_settings_set_int (self->priv->settings, PREF_RESIZE_ASPECT_RATIO_WIDTH, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_w_spinbutton")))); + g_settings_set_int (self->priv->settings, PREF_RESIZE_ASPECT_RATIO_HEIGHT, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("ratio_h_spinbutton")))); + g_settings_set_enum (self->priv->settings, PREF_RESIZE_ASPECT_RATIO, gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->ratio_combobox))); + g_settings_set_boolean (self->priv->settings, PREF_RESIZE_ASPECT_RATIO_INVERT, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("invert_ratio_checkbutton")))); + g_settings_set_boolean (self->priv->settings, PREF_RESIZE_HIGH_QUALITY, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("high_quality_checkbutton")))); /* destroy the options data */ @@ -624,14 +634,6 @@ static void -gth_file_tool_resize_instance_init (GthFileToolResize *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_RESIZE, GthFileToolResizePrivate); - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-resize", _("Resize..."), _("Resize"), FALSE); -} - - -static void gth_file_tool_resize_finalize (GObject *object) { GthFileToolResize *self; @@ -644,25 +646,25 @@ cairo_surface_destroy (self->priv->new_image); cairo_surface_destroy (self->priv->original_image); _g_object_unref (self->priv->builder); + _g_object_unref (self->priv->settings); /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_tool_resize_parent_class)->finalize (object); } static void -gth_file_tool_resize_class_init (GthFileToolResizeClass *class) +gth_file_tool_resize_class_init (GthFileToolResizeClass *klass) { GObjectClass *gobject_class; GthFileToolClass *file_tool_class; - parent_class = g_type_class_peek_parent (class); - g_type_class_add_private (class, sizeof (GthFileToolResizePrivate)); + g_type_class_add_private (klass, sizeof (GthFileToolResizePrivate)); - gobject_class = (GObjectClass*) class; + gobject_class = (GObjectClass*) klass; gobject_class->finalize = gth_file_tool_resize_finalize; - file_tool_class = (GthFileToolClass *) class; + file_tool_class = (GthFileToolClass *) klass; file_tool_class->update_sensitivity = gth_file_tool_resize_update_sensitivity; file_tool_class->activate = gth_file_tool_resize_activate; file_tool_class->get_options = gth_file_tool_resize_get_options; @@ -670,23 +672,10 @@ } -GType -gth_file_tool_resize_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolResizeClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_resize_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolResize), - 0, - (GInstanceInitFunc) gth_file_tool_resize_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolResize", &g_define_type_info, 0); - } - return type_id; +static void +gth_file_tool_resize_init (GthFileToolResize *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_RESIZE, GthFileToolResizePrivate); + self->priv->settings = g_settings_new (GTHUMB_RESIZE_SCHEMA); + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-resize", _("Resize..."), _("Resize"), FALSE); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-rotate.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-rotate.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-rotate.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-rotate.c 2012-02-19 15:01:32.000000000 +0000 @@ -34,22 +34,23 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthFileToolRotate, gth_file_tool_rotate, GTH_TYPE_FILE_TOOL) struct _GthFileToolRotatePrivate { - cairo_surface_t *image; - gboolean has_alpha; - GtkBuilder *builder; - GtkWidget *crop_grid; - GtkAdjustment *rotation_angle_adj; - GtkAdjustment *crop_p1_adj; - GtkAdjustment *crop_p2_adj; - gboolean crop_enabled; - double crop_p1_plus_p2; - GdkRectangle crop_region; - GthImageViewerTool *alignment; - GthImageViewerTool *rotator; + GSettings *settings; + cairo_surface_t *image; + gboolean has_alpha; + GtkBuilder *builder; + GtkWidget *crop_grid; + GtkAdjustment *rotation_angle_adj; + GtkAdjustment *crop_p1_adj; + GtkAdjustment *crop_p2_adj; + gboolean crop_enabled; + double crop_p1_plus_p2; + cairo_rectangle_int_t crop_region; + GthImageViewerTool *alignment; + GthImageViewerTool *rotator; }; @@ -417,14 +418,14 @@ _("Center Lines"), _("Uniform"), NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->crop_grid), eel_gconf_get_enum (PREF_ROTATE_GRID_TYPE, GTH_TYPE_GRID_TYPE, GTH_GRID_THIRDS)); + gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->crop_grid), g_settings_get_enum (self->priv->settings, PREF_ROTATE_GRID_TYPE)); gtk_widget_show (self->priv->crop_grid); gtk_box_pack_start (GTK_BOX (GET_WIDGET ("crop_grid_hbox")), self->priv->crop_grid, FALSE, FALSE, 0); gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("crop_grid_label")), self->priv->crop_grid); - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("resize_combobox")), eel_gconf_get_enum (PREF_ROTATE_RESIZE, GTH_TYPE_TRANSFORM_RESIZE, GTH_TRANSFORM_RESIZE_CROP)); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("resize_combobox")), g_settings_get_enum (self->priv->settings, PREF_ROTATE_RESIZE)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("keep_aspect_ratio")), eel_gconf_get_boolean (PREF_ROTATE_KEEP_ASPECT_RATIO, TRUE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("keep_aspect_ratio")), g_settings_get_boolean (self->priv->settings, PREF_ROTATE_KEEP_ASPECT_RATIO)); self->priv->alignment = gth_image_line_tool_new (); @@ -442,7 +443,7 @@ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("background_transparent_checkbutton")), FALSE); } - color_spec = eel_gconf_get_string (PREF_ROTATE_BACKGROUND_COLOR, "#000"); + color_spec = g_settings_get_string (self->priv->settings, PREF_ROTATE_BACKGROUND_COLOR); if (! self->priv->has_alpha && gdk_color_parse (color_spec, &color)) { _gdk_color_to_cairo_color (&color, &background_color); } @@ -553,16 +554,16 @@ /* save the dialog options */ - eel_gconf_set_enum (PREF_ROTATE_RESIZE, GTH_TYPE_TRANSFORM_RESIZE, gth_image_rotator_get_resize (GTH_IMAGE_ROTATOR (self->priv->rotator))); - eel_gconf_set_boolean (PREF_ROTATE_KEEP_ASPECT_RATIO, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("keep_aspect_ratio")))); - eel_gconf_set_enum (PREF_ROTATE_GRID_TYPE, GTH_TYPE_GRID_TYPE, gth_image_rotator_get_grid_type (GTH_IMAGE_ROTATOR (self->priv->rotator))); + g_settings_set_enum (self->priv->settings, PREF_ROTATE_RESIZE, gth_image_rotator_get_resize (GTH_IMAGE_ROTATOR (self->priv->rotator))); + g_settings_set_boolean (self->priv->settings, PREF_ROTATE_KEEP_ASPECT_RATIO, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("keep_aspect_ratio")))); + g_settings_set_enum (self->priv->settings, PREF_ROTATE_GRID_TYPE, gth_image_rotator_get_grid_type (GTH_IMAGE_ROTATOR (self->priv->rotator))); gth_image_rotator_get_background (GTH_IMAGE_ROTATOR (self->priv->rotator), &background_color); color.red = background_color.r * 255.0; color.green = background_color.g * 255.0; color.blue = background_color.b * 255.0; color_spec = gdk_color_to_string (&color); - eel_gconf_set_string (PREF_ROTATE_BACKGROUND_COLOR, color_spec); + g_settings_set_string (self->priv->settings, PREF_ROTATE_BACKGROUND_COLOR, color_spec); g_free (color_spec); } @@ -589,16 +590,6 @@ static void -gth_file_tool_rotate_instance_init (GthFileToolRotate *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_ROTATE, GthFileToolRotatePrivate); - - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-rotate", _("Rotate..."), _("Rotate"), TRUE); - gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Freely rotate the image")); -} - - -static void gth_file_tool_rotate_finalize (GObject *object) { GthFileToolRotate *self; @@ -610,25 +601,25 @@ cairo_surface_destroy (self->priv->image); _g_object_unref (self->priv->builder); + _g_object_unref (self->priv->settings); /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_tool_rotate_parent_class)->finalize (object); } static void -gth_file_tool_rotate_class_init (GthFileToolRotateClass *class) +gth_file_tool_rotate_class_init (GthFileToolRotateClass *klass) { GObjectClass *gobject_class; GthFileToolClass *file_tool_class; - parent_class = g_type_class_peek_parent (class); - g_type_class_add_private (class, sizeof (GthFileToolRotatePrivate)); + g_type_class_add_private (klass, sizeof (GthFileToolRotatePrivate)); - gobject_class = (GObjectClass*) class; + gobject_class = (GObjectClass*) klass; gobject_class->finalize = gth_file_tool_rotate_finalize; - file_tool_class = (GthFileToolClass *) class; + file_tool_class = (GthFileToolClass *) klass; file_tool_class->update_sensitivity = gth_file_tool_rotate_update_sensitivity; file_tool_class->activate = gth_file_tool_rotate_activate; file_tool_class->get_options = gth_file_tool_rotate_get_options; @@ -636,23 +627,12 @@ } -GType -gth_file_tool_rotate_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolRotateClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_rotate_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolRotate), - 0, - (GInstanceInitFunc) gth_file_tool_rotate_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolRotate", &g_define_type_info, 0); - } - return type_id; +static void +gth_file_tool_rotate_init (GthFileToolRotate *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_ROTATE, GthFileToolRotatePrivate); + self->priv->settings = g_settings_new (GTHUMB_ROTATE_SCHEMA); + + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-rotate", _("Rotate..."), _("Rotate"), TRUE); + gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Freely rotate the image")); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-rotate-left.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-rotate-left.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-rotate-left.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-rotate-left.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,6 +26,9 @@ #include "gth-file-tool-rotate-left.h" +G_DEFINE_TYPE (GthFileToolRotateLeft, gth_file_tool_rotate_left, GTH_TYPE_FILE_TOOL) + + static void gth_file_tool_rotate_left_activate (GthFileTool *base) { @@ -68,38 +71,19 @@ static void -gth_file_tool_rotate_left_instance_init (GthFileToolRotateLeft *self) +gth_file_tool_rotate_left_class_init (GthFileToolRotateLeftClass *klass) { - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-rotate-270", _("Rotate Left"), NULL, FALSE); - gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Rotate the image by 90 degrees counterclockwise")); + GthFileToolClass *file_tool_class; + + file_tool_class = (GthFileToolClass *) klass; + file_tool_class->update_sensitivity = gth_file_tool_rotate_left_update_sensitivity; + file_tool_class->activate = gth_file_tool_rotate_left_activate; } static void -gth_file_tool_rotate_left_class_init (GthFileToolClass *klass) +gth_file_tool_rotate_left_init (GthFileToolRotateLeft *self) { - klass->update_sensitivity = gth_file_tool_rotate_left_update_sensitivity; - klass->activate = gth_file_tool_rotate_left_activate; -} - - -GType -gth_file_tool_rotate_left_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolRotateLeftClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_rotate_left_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolRotateLeft), - 0, - (GInstanceInitFunc) gth_file_tool_rotate_left_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolRotateLeft", &g_define_type_info, 0); - } - return type_id; + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-rotate-270", _("Rotate Left"), NULL, FALSE); + gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Rotate the image by 90 degrees counterclockwise")); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-rotate-right.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-rotate-right.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-rotate-right.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-rotate-right.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,6 +26,9 @@ #include "gth-file-tool-rotate-right.h" +G_DEFINE_TYPE (GthFileToolRotateRight, gth_file_tool_rotate_right, GTH_TYPE_FILE_TOOL) + + static void gth_file_tool_rotate_right_activate (GthFileTool *base) { @@ -68,38 +71,19 @@ static void -gth_file_tool_rotate_right_instance_init (GthFileToolRotateRight *self) +gth_file_tool_rotate_right_class_init (GthFileToolRotateRightClass *klass) { - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-rotate-90", _("Rotate Right"), NULL, TRUE); - gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Rotate the image by 90 degrees clockwise")); + GthFileToolClass *file_tool_class; + + file_tool_class = (GthFileToolClass *) klass; + file_tool_class->update_sensitivity = gth_file_tool_rotate_right_update_sensitivity; + file_tool_class->activate = gth_file_tool_rotate_right_activate; } static void -gth_file_tool_rotate_right_class_init (GthFileToolClass *klass) +gth_file_tool_rotate_right_init (GthFileToolRotateRight *self) { - klass->update_sensitivity = gth_file_tool_rotate_right_update_sensitivity; - klass->activate = gth_file_tool_rotate_right_activate; -} - - -GType -gth_file_tool_rotate_right_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolRotateRightClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_rotate_right_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolRotateRight), - 0, - (GInstanceInitFunc) gth_file_tool_rotate_right_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolRotateRight", &g_define_type_info, 0); - } - return type_id; + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-rotate-90", _("Rotate Right"), NULL, TRUE); + gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Rotate the image by 90 degrees clockwise")); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-save-as.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-save-as.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-save-as.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-save-as.c 2012-02-19 15:01:32.000000000 +0000 @@ -24,6 +24,9 @@ #include "gth-file-tool-save-as.h" +G_DEFINE_TYPE (GthFileToolSaveAs, gth_file_tool_save_as, GTH_TYPE_FILE_TOOL) + + static void gth_file_tool_save_as_update_sensitivity (GthFileTool *base) { @@ -51,37 +54,18 @@ static void -gth_file_tool_save_as_instance_init (GthFileToolSaveAs *self) +gth_file_tool_save_as_class_init (GthFileToolSaveAsClass *klass) { - gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_SAVE_AS, _("Save As"), NULL, FALSE); + GthFileToolClass *file_tool_class; + + file_tool_class = (GthFileToolClass *) klass; + file_tool_class->update_sensitivity = gth_file_tool_save_as_update_sensitivity; + file_tool_class->activate = gth_file_tool_save_as_activate; } static void -gth_file_tool_save_as_class_init (GthFileToolClass *klass) +gth_file_tool_save_as_init (GthFileToolSaveAs *self) { - klass->update_sensitivity = gth_file_tool_save_as_update_sensitivity; - klass->activate = gth_file_tool_save_as_activate; -} - - -GType -gth_file_tool_save_as_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolSaveAsClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_save_as_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolSaveAs), - 0, - (GInstanceInitFunc) gth_file_tool_save_as_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolSaveAs", &g_define_type_info, 0); - } - return type_id; + gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_SAVE_AS, _("Save As"), NULL, FALSE); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-save.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-save.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-save.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-save.c 2012-02-19 15:01:32.000000000 +0000 @@ -24,6 +24,9 @@ #include "gth-file-tool-save.h" +G_DEFINE_TYPE (GthFileToolSave, gth_file_tool_save, GTH_TYPE_FILE_TOOL) + + static void gth_file_tool_save_update_sensitivity (GthFileTool *base) { @@ -47,37 +50,18 @@ static void -gth_file_tool_save_instance_init (GthFileToolSave *self) +gth_file_tool_save_class_init (GthFileToolSaveClass *klass) { - gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_SAVE, _("Save"), _("Save"), FALSE); + GthFileToolClass *file_tool_class; + + file_tool_class = (GthFileToolClass *) klass; + file_tool_class->update_sensitivity = gth_file_tool_save_update_sensitivity; + file_tool_class->activate = gth_file_tool_save_activate; } static void -gth_file_tool_save_class_init (GthFileToolClass *klass) +gth_file_tool_save_init (GthFileToolSave *self) { - klass->update_sensitivity = gth_file_tool_save_update_sensitivity; - klass->activate = gth_file_tool_save_activate; -} - - -GType -gth_file_tool_save_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolSaveClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_save_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolSave), - 0, - (GInstanceInitFunc) gth_file_tool_save_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolSave", &g_define_type_info, 0); - } - return type_id; + gth_file_tool_construct (GTH_FILE_TOOL (self), GTK_STOCK_SAVE, _("Save"), _("Save"), FALSE); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-sharpen.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-sharpen.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-sharpen.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-sharpen.c 2012-02-19 15:01:32.000000000 +0000 @@ -33,7 +33,7 @@ #define DEFAULT_THRESHOLD 0.0 -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthFileToolSharpen, gth_file_tool_sharpen, GTH_TYPE_FILE_TOOL) struct _GthFileToolSharpenPrivate { @@ -409,19 +409,6 @@ static void -gth_file_tool_sharpen_instance_init (GthFileToolSharpen *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_SHARPEN, GthFileToolSharpenPrivate); - self->priv->source = NULL; - self->priv->destination = NULL; - self->priv->builder = NULL; - self->priv->show_preview = TRUE; - - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-sharpen", _("Enhance Focus..."), _("Enhance Focus"), FALSE); -} - - -static void gth_file_tool_sharpen_finalize (GObject *object) { GthFileToolSharpen *self; @@ -436,7 +423,7 @@ _g_object_unref (self->priv->builder); /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_tool_sharpen_parent_class)->finalize (object); } @@ -446,7 +433,6 @@ GObjectClass *gobject_class; GthFileToolClass *file_tool_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthFileToolSharpenPrivate)); gobject_class = (GObjectClass*) klass; @@ -460,23 +446,14 @@ } -GType -gth_file_tool_sharpen_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolSharpenClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_sharpen_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolSharpen), - 0, - (GInstanceInitFunc) gth_file_tool_sharpen_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolSharpen", &g_define_type_info, 0); - } - return type_id; +static void +gth_file_tool_sharpen_init (GthFileToolSharpen *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_SHARPEN, GthFileToolSharpenPrivate); + self->priv->source = NULL; + self->priv->destination = NULL; + self->priv->builder = NULL; + self->priv->show_preview = TRUE; + + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-sharpen", _("Enhance Focus..."), _("Enhance Focus"), FALSE); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-file-tool-undo.c gthumb-3.0.0/extensions/file_tools/gth-file-tool-undo.c --- gthumb-2.14.3/extensions/file_tools/gth-file-tool-undo.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-file-tool-undo.c 2012-02-19 15:01:32.000000000 +0000 @@ -25,6 +25,9 @@ #include "gth-file-tool-undo.h" +G_DEFINE_TYPE (GthFileToolUndo, gth_file_tool_undo, GTH_TYPE_FILE_TOOL) + + static void gth_file_tool_undo_update_sensitivity (GthFileTool *base) { @@ -56,37 +59,18 @@ static void -gth_file_tool_undo_instance_init (GthFileToolUndo *self) +gth_file_tool_undo_class_init (GthFileToolUndoClass *klass) { - gth_file_tool_construct (GTH_FILE_TOOL (self), "undo", _("Undo"), _("Undo"), TRUE); + GthFileToolClass *file_tool_class; + + file_tool_class = (GthFileToolClass *) klass; + file_tool_class->update_sensitivity = gth_file_tool_undo_update_sensitivity; + file_tool_class->activate = gth_file_tool_undo_activate; } static void -gth_file_tool_undo_class_init (GthFileToolClass *klass) +gth_file_tool_undo_init (GthFileToolUndo *self) { - klass->update_sensitivity = gth_file_tool_undo_update_sensitivity; - klass->activate = gth_file_tool_undo_activate; -} - - -GType -gth_file_tool_undo_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolUndoClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_undo_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolUndo), - 0, - (GInstanceInitFunc) gth_file_tool_undo_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolUndo", &g_define_type_info, 0); - } - return type_id; + gth_file_tool_construct (GTH_FILE_TOOL (self), "undo", _("Undo"), _("Undo"), TRUE); } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-image-line-tool.c gthumb-3.0.0/extensions/file_tools/gth-image-line-tool.c --- gthumb-2.14.3/extensions/file_tools/gth-image-line-tool.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-image-line-tool.c 2012-02-19 15:01:32.000000000 +0000 @@ -36,34 +36,43 @@ }; -static guint signals[LAST_SIGNAL] = { 0 }; -static gpointer parent_class = NULL; - - struct _GthImageLineToolPrivate { - GthImageViewer *viewer; + GthImageViewer *viewer; /* options */ - GdkPoint p1; - GdkPoint p2; + GdkPoint p1; + GdkPoint p2; /* utility variables */ - int original_width; - int original_height; - double preview_zoom; - cairo_surface_t *preview_image; - GdkRectangle preview_image_area; - GdkPoint preview_center; - GdkRectangle clip_area; - cairo_matrix_t matrix; - gboolean first_point_set; - GthFit original_fit_mode; - gboolean original_zoom_enabled; + int original_width; + int original_height; + double preview_zoom; + cairo_surface_t *preview_image; + cairo_rectangle_int_t preview_image_area; + GdkPoint preview_center; + cairo_rectangle_int_t clip_area; + cairo_matrix_t matrix; + gboolean first_point_set; + GthFit original_fit_mode; + gboolean original_zoom_enabled; }; +static guint signals[LAST_SIGNAL] = { 0 }; + + +static void gth_image_line_tool_gth_image_tool_interface_init (GthImageViewerToolInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthImageLineTool, + gth_image_line_tool, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTH_TYPE_IMAGE_VIEWER_TOOL, + gth_image_line_tool_gth_image_tool_interface_init)) + + static void gth_image_line_tool_set_viewer (GthImageViewerTool *base, GthImageViewer *viewer) @@ -81,7 +90,7 @@ cursor = gdk_cursor_new (GDK_CROSSHAIR); gth_image_viewer_set_cursor (self->priv->viewer, cursor); - gdk_cursor_unref (cursor); + g_object_unref (cursor); } @@ -196,9 +205,8 @@ static void -gth_image_line_tool_expose (GthImageViewerTool *base, - GdkEventExpose *event, - cairo_t *cr) +gth_image_line_tool_draw (GthImageViewerTool *base, + cairo_t *cr) { GthImageLineTool *self = GTH_IMAGE_LINE_TOOL (base); @@ -207,13 +215,6 @@ cairo_save (cr); - cairo_rectangle (cr, - event->area.x, - event->area.y, - event->area.width, - event->area.height); - cairo_clip (cr); - paint_image (self, cr); if (self->priv->first_point_set) { @@ -293,11 +294,21 @@ static void -gth_image_line_tool_instance_init (GthImageLineTool *self) +gth_image_line_tool_gth_image_tool_interface_init (GthImageViewerToolInterface *iface) { - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_LINE_TOOL, GthImageLineToolPrivate); - self->priv->preview_image = NULL; - self->priv->first_point_set = FALSE; + iface->set_viewer = gth_image_line_tool_set_viewer; + iface->unset_viewer = gth_image_line_tool_unset_viewer; + iface->realize = gth_image_line_tool_realize; + iface->unrealize = gth_image_line_tool_unrealize; + iface->size_allocate = gth_image_line_tool_size_allocate; + iface->map = gth_image_line_tool_map; + iface->unmap = gth_image_line_tool_unmap; + iface->draw = gth_image_line_tool_draw; + iface->button_press = gth_image_line_tool_button_press; + iface->button_release = gth_image_line_tool_button_release; + iface->motion_notify = gth_image_line_tool_motion_notify; + iface->image_changed = gth_image_line_tool_image_changed; + iface->zoom_changed = gth_image_line_tool_zoom_changed; } @@ -314,7 +325,7 @@ cairo_surface_destroy (self->priv->preview_image); /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_image_line_tool_parent_class)->finalize (object); } @@ -323,7 +334,6 @@ { GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthImageLineToolPrivate)); gobject_class = (GObjectClass*) class; @@ -341,55 +351,11 @@ static void -gth_image_line_tool_gth_image_tool_interface_init (GthImageViewerToolIface *iface) -{ - iface->set_viewer = gth_image_line_tool_set_viewer; - iface->unset_viewer = gth_image_line_tool_unset_viewer; - iface->realize = gth_image_line_tool_realize; - iface->unrealize = gth_image_line_tool_unrealize; - iface->size_allocate = gth_image_line_tool_size_allocate; - iface->map = gth_image_line_tool_map; - iface->unmap = gth_image_line_tool_unmap; - iface->expose = gth_image_line_tool_expose; - iface->button_press = gth_image_line_tool_button_press; - iface->button_release = gth_image_line_tool_button_release; - iface->motion_notify = gth_image_line_tool_motion_notify; - iface->image_changed = gth_image_line_tool_image_changed; - iface->zoom_changed = gth_image_line_tool_zoom_changed; -} - - -GType -gth_image_line_tool_get_type (void) +gth_image_line_tool_init (GthImageLineTool *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthImageLineToolClass), - NULL, - NULL, - (GClassInitFunc) gth_image_line_tool_class_init, - NULL, - NULL, - sizeof (GthImageLineTool), - 0, - (GInstanceInitFunc) gth_image_line_tool_instance_init - }; - static const GInterfaceInfo gth_image_tool_info = { - (GInterfaceInitFunc) gth_image_line_tool_gth_image_tool_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthImageLineTool", - &type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_IMAGE_VIEWER_TOOL, >h_image_tool_info); - } - - return type; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_LINE_TOOL, GthImageLineToolPrivate); + self->priv->preview_image = NULL; + self->priv->first_point_set = FALSE; } diff -Nru gthumb-2.14.3/extensions/file_tools/gth-image-rotator.c gthumb-3.0.0/extensions/file_tools/gth-image-rotator.c --- gthumb-2.14.3/extensions/file_tools/gth-image-rotator.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-image-rotator.c 2012-02-19 15:01:32.000000000 +0000 @@ -43,38 +43,48 @@ static guint signals[LAST_SIGNAL] = { 0 }; -static gpointer parent_class = NULL; + + +static void gth_image_rotator_gth_image_tool_interface_init (GthImageViewerToolInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthImageRotator, + gth_image_rotator, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTH_TYPE_IMAGE_VIEWER_TOOL, + gth_image_rotator_gth_image_tool_interface_init)) + struct _GthImageRotatorPrivate { - GthImageViewer *viewer; + GthImageViewer *viewer; /* options */ - GdkPoint center; - double angle; - cairo_color_t background_color; - gboolean enable_crop; - GdkRectangle crop_region; - GthGridType grid_type; - GthTransformResize resize; + GdkPoint center; + double angle; + cairo_color_t background_color; + gboolean enable_crop; + cairo_rectangle_int_t crop_region; + GthGridType grid_type; + GthTransformResize resize; /* utility variables */ - int original_width; - int original_height; - double preview_zoom; - cairo_surface_t *preview_image; - GdkRectangle preview_image_area; - GdkPoint preview_center; - GdkRectangle clip_area; - cairo_matrix_t matrix; - gboolean dragging; - double angle_before_dragging; - GdkPoint drag_p1; - GdkPoint drag_p2; - GthFit original_fit_mode; - gboolean original_zoom_enabled; + int original_width; + int original_height; + double preview_zoom; + cairo_surface_t *preview_image; + cairo_rectangle_int_t preview_image_area; + GdkPoint preview_center; + cairo_rectangle_int_t clip_area; + cairo_matrix_t matrix; + gboolean dragging; + double angle_before_dragging; + GdkPoint drag_p1; + GdkPoint drag_p2; + GthFit original_fit_mode; + gboolean original_zoom_enabled; }; @@ -93,7 +103,7 @@ cursor = gdk_cursor_new (GDK_LEFT_PTR); gth_image_viewer_set_cursor (self->priv->viewer, cursor); - gdk_cursor_unref (cursor); + g_object_unref (cursor); } @@ -137,10 +147,10 @@ static void -gth_transform_resize (cairo_matrix_t *matrix, - GthTransformResize resize, - GdkRectangle *original, - GdkRectangle *boundary) +gth_transform_resize (cairo_matrix_t *matrix, + GthTransformResize resize, + cairo_rectangle_int_t *original, + cairo_rectangle_int_t *boundary) { int x1, y1, x2, y2; @@ -291,10 +301,9 @@ static void paint_darker_background (GthImageRotator *self, - GdkEventExpose *event, cairo_t *cr) { - GdkRectangle crop_region; + cairo_rectangle_int_t crop_region; cairo_save (cr); cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5); @@ -346,10 +355,9 @@ static void paint_grid (GthImageRotator *self, - GdkEventExpose *event, cairo_t *cr) { - GdkRectangle grid; + cairo_rectangle_int_t grid; cairo_save (cr); @@ -366,7 +374,6 @@ static void paint_point (GthImageRotator *self, - GdkEventExpose *event, cairo_t *cr, GdkPoint *p) { @@ -381,28 +388,24 @@ static void -gth_image_rotator_expose (GthImageViewerTool *base, - GdkEventExpose *event, - cairo_t *cr) +gth_image_rotator_draw (GthImageViewerTool *base, + cairo_t *cr) { GthImageRotator *self = GTH_IMAGE_ROTATOR (base); - GtkStyle *style; + GtkStyleContext *style_context; + GdkRGBA color; GtkAllocation allocation; cairo_save (cr); - cairo_rectangle (cr, - event->area.x, - event->area.y, - event->area.width, - event->area.height); - cairo_clip (cr); - /* background */ - style = gtk_widget_get_style (GTK_WIDGET (self->priv->viewer)); + style_context = gtk_widget_get_style_context (GTK_WIDGET (self->priv->viewer)); + gtk_style_context_get_background_color (style_context, + gtk_widget_get_state (GTK_WIDGET (self->priv->viewer)), + &color); + gdk_cairo_set_source_rgba (cr, &color); gtk_widget_get_allocation (GTK_WIDGET (self->priv->viewer), &allocation); - gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]); cairo_rectangle (cr, 0, 0, allocation.width, allocation.height); cairo_fill (cr); @@ -426,8 +429,8 @@ paint_image (self, cr); if (self->priv->enable_crop) { - paint_darker_background (self, event, cr); - paint_grid (self, event, cr); + paint_darker_background (self, cr); + paint_grid (self, cr); } if (self->priv->dragging) { @@ -438,11 +441,11 @@ center.x = self->priv->center.x * self->priv->preview_zoom + self->priv->preview_image_area.x; center.y = self->priv->center.y * self->priv->preview_zoom + self->priv->preview_image_area.y; - paint_point (self, event, cr, ¢er); + paint_point (self, cr, ¢er); /* used for debugging purposes - paint_point (self, event, cr, &self->priv->drag_p1); - paint_point (self, event, cr, &self->priv->drag_p2); + paint_point (self, cr, &self->priv->drag_p1); + paint_point (self, cr, &self->priv->drag_p2); */ } @@ -465,7 +468,7 @@ cursor = gdk_cursor_new (GDK_LEFT_PTR); gth_image_viewer_set_cursor (self->priv->viewer, cursor); - gdk_cursor_unref (cursor); + g_object_unref (cursor); gtk_widget_queue_draw (GTK_WIDGET (self->priv->viewer)); @@ -544,7 +547,7 @@ cursor = gdk_cursor_new_from_name (gtk_widget_get_display (GTK_WIDGET (self->priv->viewer)), "grabbing"); gth_image_viewer_set_cursor (self->priv->viewer, cursor); if (cursor != NULL) - gdk_cursor_unref (cursor); + g_object_unref (cursor); } if (self->priv->dragging) { @@ -589,26 +592,6 @@ static void -gth_image_rotator_instance_init (GthImageRotator *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_ROTATOR, GthImageRotatorPrivate); - self->priv->preview_image = NULL; - self->priv->grid_type = GTH_GRID_NONE; - self->priv->resize = GTH_TRANSFORM_RESIZE_BOUNDING_BOX; - self->priv->background_color.r = 0.0; - self->priv->background_color.g = 0.0; - self->priv->background_color.b = 0.0; - self->priv->background_color.a = 1.0; - self->priv->enable_crop = FALSE; - self->priv->crop_region.x = 0; - self->priv->crop_region.y = 0; - self->priv->crop_region.width = 0; - self->priv->crop_region.height = 0; - self->priv->dragging = FALSE; -} - - -static void gth_image_rotator_finalize (GObject *object) { GthImageRotator *self; @@ -621,7 +604,7 @@ cairo_surface_destroy (self->priv->preview_image); /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_image_rotator_parent_class)->finalize (object); } @@ -630,7 +613,6 @@ { GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthImageRotatorPrivate)); gobject_class = (GObjectClass*) class; @@ -667,7 +649,7 @@ static void -gth_image_rotator_gth_image_tool_interface_init (GthImageViewerToolIface *iface) +gth_image_rotator_gth_image_tool_interface_init (GthImageViewerToolInterface *iface) { iface->set_viewer = gth_image_rotator_set_viewer; iface->unset_viewer = gth_image_rotator_unset_viewer; @@ -676,7 +658,7 @@ iface->size_allocate = gth_image_rotator_size_allocate; iface->map = gth_image_rotator_map; iface->unmap = gth_image_rotator_unmap; - iface->expose = gth_image_rotator_expose; + iface->draw = gth_image_rotator_draw; iface->button_press = gth_image_rotator_button_press; iface->button_release = gth_image_rotator_button_release; iface->motion_notify = gth_image_rotator_motion_notify; @@ -685,37 +667,23 @@ } -GType -gth_image_rotator_get_type (void) +static void +gth_image_rotator_init (GthImageRotator *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthImageRotatorClass), - NULL, - NULL, - (GClassInitFunc) gth_image_rotator_class_init, - NULL, - NULL, - sizeof (GthImageRotator), - 0, - (GInstanceInitFunc) gth_image_rotator_instance_init - }; - static const GInterfaceInfo gth_image_tool_info = { - (GInterfaceInitFunc) gth_image_rotator_gth_image_tool_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthImageRotator", - &type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_IMAGE_VIEWER_TOOL, >h_image_tool_info); - } - - return type; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_ROTATOR, GthImageRotatorPrivate); + self->priv->preview_image = NULL; + self->priv->grid_type = GTH_GRID_NONE; + self->priv->resize = GTH_TRANSFORM_RESIZE_BOUNDING_BOX; + self->priv->background_color.r = 0.0; + self->priv->background_color.g = 0.0; + self->priv->background_color.b = 0.0; + self->priv->background_color.a = 1.0; + self->priv->enable_crop = FALSE; + self->priv->crop_region.x = 0; + self->priv->crop_region.y = 0; + self->priv->crop_region.width = 0; + self->priv->crop_region.height = 0; + self->priv->dragging = FALSE; } @@ -826,8 +794,8 @@ void -gth_image_rotator_set_crop_region (GthImageRotator *self, - GdkRectangle *region) +gth_image_rotator_set_crop_region (GthImageRotator *self, + cairo_rectangle_int_t *region) { self->priv->enable_crop = (region != NULL); if (region != NULL) @@ -864,12 +832,12 @@ static cairo_surface_t * gth_image_rotator_get_result_fast (GthImageRotator *self) { - double tx, ty; - cairo_matrix_t matrix; - GdkRectangle image_area; - GdkRectangle clip_area; - cairo_surface_t *output; - cairo_t *cr; + double tx, ty; + cairo_matrix_t matrix; + cairo_rectangle_int_t image_area; + cairo_rectangle_int_t clip_area; + cairo_surface_t *output; + cairo_t *cr; /* compute the transformation matrix and the clip area */ diff -Nru gthumb-2.14.3/extensions/file_tools/gth-image-rotator.h gthumb-3.0.0/extensions/file_tools/gth-image-rotator.h --- gthumb-2.14.3/extensions/file_tools/gth-image-rotator.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/gth-image-rotator.h 2012-02-19 15:01:32.000000000 +0000 @@ -83,7 +83,7 @@ GthTransformResize resize); GthTransformResize gth_image_rotator_get_resize (GthImageRotator *self); void gth_image_rotator_set_crop_region (GthImageRotator *self, - GdkRectangle *region); + cairo_rectangle_int_t *region); void gth_image_rotator_set_background (GthImageRotator *self, cairo_color_t *color); void gth_image_rotator_get_background (GthImageRotator *self, diff -Nru gthumb-2.14.3/extensions/file_tools/Makefile.in gthumb-3.0.0/extensions/file_tools/Makefile.in --- gthumb-2.14.3/extensions/file_tools/Makefile.in 2012-03-25 18:34:10.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/Makefile.in 2012-04-23 18:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -147,6 +164,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -226,10 +248,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -237,6 +257,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -276,6 +297,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -324,8 +347,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -356,6 +377,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -494,7 +516,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -502,6 +523,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -753,8 +776,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -937,13 +963,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/file_tools/preferences.h gthumb-3.0.0/extensions/file_tools/preferences.h --- gthumb-2.14.3/extensions/file_tools/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_tools/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -19,35 +19,47 @@ * along with this program. If not, see . */ -#ifndef PREFERENCES_H -#define PREFERENCES_H +#ifndef FILE_TOOLS_PREFERENCES_H +#define FILE_TOOLS_PREFERENCES_H #include G_BEGIN_DECLS -#define PREF_CROP_GRID_TYPE "/apps/gthumb/ext/crop/grid_type" -#define PREF_CROP_ASPECT_RATIO "/apps/gthumb/ext/crop/aspect_ratio" -#define PREF_CROP_ASPECT_RATIO_INVERT "/apps/gthumb/ext/crop/aspect_ratio_invert" -#define PREF_CROP_ASPECT_RATIO_WIDTH "/apps/gthumb/ext/crop/aspect_ratio_width" -#define PREF_CROP_ASPECT_RATIO_HEIGHT "/apps/gthumb/ext/crop/aspect_ratio_height" -#define PREF_CROP_BIND_DIMENSIONS "/apps/gthumb/ext/crop/bind_dimensions" -#define PREF_CROP_BIND_FACTOR "/apps/gthumb/ext/crop/bind_factor" - -#define PREF_RESIZE_UNIT "/apps/gthumb/ext/resize/unit" -#define PREF_RESIZE_WIDTH "/apps/gthumb/ext/resize/width" -#define PREF_RESIZE_HEIGHT "/apps/gthumb/ext/resize/height" -#define PREF_RESIZE_ASPECT_RATIO_WIDTH "/apps/gthumb/ext/resize/aspect_ratio_width" -#define PREF_RESIZE_ASPECT_RATIO_HEIGHT "/apps/gthumb/ext/resize/aspect_ratio_height" -#define PREF_RESIZE_ASPECT_RATIO "/apps/gthumb/ext/resize/aspect_ratio" -#define PREF_RESIZE_ASPECT_RATIO_INVERT "/apps/gthumb/ext/resize/aspect_ratio_invert" -#define PREF_RESIZE_HIGH_QUALITY "/apps/gthumb/ext/resize/high_quality" - -#define PREF_ROTATE_RESIZE "/apps/gthumb/ext/rotate/resize" -#define PREF_ROTATE_KEEP_ASPECT_RATIO "/apps/gthumb/ext/rotate/keep_aspect_ratio" -#define PREF_ROTATE_GRID_TYPE "/apps/gthumb/ext/rotate/grid_type" -#define PREF_ROTATE_BACKGROUND_COLOR "/apps/gthumb/ext/rotate/background_color" +/* schemas */ + +#define GTHUMB_CROP_SCHEMA GTHUMB_SCHEMA ".crop" +#define GTHUMB_RESIZE_SCHEMA GTHUMB_SCHEMA ".resize" +#define GTHUMB_ROTATE_SCHEMA GTHUMB_SCHEMA ".rotate" + +/* keys: crop */ + +#define PREF_CROP_GRID_TYPE "grid-type" +#define PREF_CROP_ASPECT_RATIO "aspect-ratio" +#define PREF_CROP_ASPECT_RATIO_INVERT "aspect-ratio-invert" +#define PREF_CROP_ASPECT_RATIO_WIDTH "aspect-ratio-width" +#define PREF_CROP_ASPECT_RATIO_HEIGHT "aspect-ratio-height" +#define PREF_CROP_BIND_DIMENSIONS "bind-dimensions" +#define PREF_CROP_BIND_FACTOR "bind-factor" + +/* keys: resize */ + +#define PREF_RESIZE_UNIT "unit" +#define PREF_RESIZE_WIDTH "width" +#define PREF_RESIZE_HEIGHT "height" +#define PREF_RESIZE_ASPECT_RATIO_WIDTH "aspect-ratio-width" +#define PREF_RESIZE_ASPECT_RATIO_HEIGHT "aspect-ratio-height" +#define PREF_RESIZE_ASPECT_RATIO "aspect-ratio" +#define PREF_RESIZE_ASPECT_RATIO_INVERT "aspect-ratio-invert" +#define PREF_RESIZE_HIGH_QUALITY "high-quality" + +/* keys: rotate */ + +#define PREF_ROTATE_RESIZE "resize" +#define PREF_ROTATE_KEEP_ASPECT_RATIO "keep-aspect-ratio" +#define PREF_ROTATE_GRID_TYPE "grid-type" +#define PREF_ROTATE_BACKGROUND_COLOR "background-color" G_END_DECLS -#endif /* PREFERENCES_H */ +#endif /* FILE_TOOLS_PREFERENCES_H */ diff -Nru gthumb-2.14.3/extensions/file_viewer/file_viewer.extension.in.in gthumb-3.0.0/extensions/file_viewer/file_viewer.extension.in.in --- gthumb-2.14.3/extensions/file_viewer/file_viewer.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/file_viewer/file_viewer.extension.in.in 2012-04-21 09:25:24.000000000 +0000 @@ -4,3 +4,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/file_viewer/gth-file-viewer-page.c gthumb-3.0.0/extensions/file_viewer/gth-file-viewer-page.c --- gthumb-2.14.3/extensions/file_viewer/gth-file-viewer-page.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/file_viewer/gth-file-viewer-page.c 2012-02-19 15:01:32.000000000 +0000 @@ -45,7 +45,14 @@ }; -static gpointer gth_file_viewer_page_parent_class = NULL; +static void gth_viewer_page_interface_init (GthViewerPageInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthFileViewerPage, + gth_file_viewer_page, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTH_TYPE_VIEWER_PAGE, + gth_viewer_page_interface_init)) static gboolean @@ -100,11 +107,12 @@ self->priv->viewer = gtk_event_box_new (); gtk_widget_show (self->priv->viewer); - vbox1 = gtk_vbox_new (TRUE, 0); + vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous (GTK_BOX (vbox1), TRUE); gtk_widget_show (vbox1); gtk_container_add (GTK_CONTAINER (self->priv->viewer), vbox1); - vbox2 = gtk_vbox_new (FALSE, 6); + vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_widget_show (vbox2); gtk_box_pack_start (GTK_BOX (vbox1), vbox2, FALSE, FALSE, 0); @@ -314,6 +322,16 @@ static void +gth_file_viewer_page_real_shrink_wrap (GthViewerPage *base, + gboolean value, + int *other_width, + int *other_height) +{ + /* void */ +} + + +static void gth_file_viewer_page_finalize (GObject *obj) { GthFileViewerPage *self; @@ -330,15 +348,13 @@ static void gth_file_viewer_page_class_init (GthFileViewerPageClass *klass) { - gth_file_viewer_page_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthFileViewerPagePrivate)); - G_OBJECT_CLASS (klass)->finalize = gth_file_viewer_page_finalize; } static void -gth_viewer_page_interface_init (GthViewerPageIface *iface) +gth_viewer_page_interface_init (GthViewerPageInterface *iface) { iface->activate = gth_file_viewer_page_real_activate; iface->deactivate = gth_file_viewer_page_real_deactivate; @@ -352,40 +368,14 @@ iface->update_sensitivity = gth_file_viewer_page_real_update_sensitivity; iface->can_save = gth_file_viewer_page_real_can_save; iface->update_info = gth_file_viewer_page_real_update_info; + iface->shrink_wrap = gth_file_viewer_page_real_shrink_wrap; } static void -gth_file_viewer_page_instance_init (GthFileViewerPage *self) +gth_file_viewer_page_init (GthFileViewerPage *self) { self->priv = GTH_FILE_VIEWER_PAGE_GET_PRIVATE (self); self->priv->thumb_loader = NULL; self->priv->file_data = NULL; } - - -GType gth_file_viewer_page_get_type (void) { - static GType gth_file_viewer_page_type_id = 0; - if (gth_file_viewer_page_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileViewerPageClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_viewer_page_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileViewerPage), - 0, - (GInstanceInitFunc) gth_file_viewer_page_instance_init, - NULL - }; - static const GInterfaceInfo gth_viewer_page_info = { - (GInterfaceInitFunc) gth_viewer_page_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - gth_file_viewer_page_type_id = g_type_register_static (G_TYPE_OBJECT, "GthFileViewerPage", &g_define_type_info, 0); - g_type_add_interface_static (gth_file_viewer_page_type_id, GTH_TYPE_VIEWER_PAGE, >h_viewer_page_info); - } - return gth_file_viewer_page_type_id; -} diff -Nru gthumb-2.14.3/extensions/file_viewer/Makefile.in gthumb-3.0.0/extensions/file_viewer/Makefile.in --- gthumb-2.14.3/extensions/file_viewer/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/file_viewer/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -119,6 +136,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libfile_viewer_la_SOURCES) DIST_SOURCES = $(libfile_viewer_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) ETAGS = etags CTAGS = ctags @@ -167,10 +189,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -178,6 +198,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -217,6 +238,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -265,8 +288,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -297,6 +318,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -379,7 +401,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -387,6 +408,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -462,8 +485,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/find_duplicates/data/Makefile.in gthumb-3.0.0/extensions/find_duplicates/data/Makefile.in --- gthumb-2.14.3/extensions/find_duplicates/data/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/find_duplicates/data/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui gthumb-3.0.0/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui --- gthumb-2.14.3/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/find_duplicates/data/ui/find-duplicates-dialog.ui 2012-02-19 15:01:32.000000000 +0000 @@ -22,7 +22,7 @@ True dialog - + True False vertical @@ -34,6 +34,7 @@ gtk-help + False True True True @@ -50,6 +51,7 @@ gtk-stop + False True True True @@ -65,6 +67,7 @@ gtk-close + False True True True @@ -188,7 +191,7 @@ - True + False True 0 @@ -322,7 +325,7 @@ - True + False True 0 @@ -348,8 +351,6 @@ True True in - automatic - automatic True @@ -449,6 +450,7 @@ _View + False True False True @@ -465,6 +467,7 @@ _Delete + False True True True @@ -505,7 +508,7 @@ - True + False True 1 diff -Nru gthumb-2.14.3/extensions/find_duplicates/data/ui/find-duplicates.ui gthumb-3.0.0/extensions/find_duplicates/data/ui/find-duplicates.ui --- gthumb-2.14.3/extensions/find_duplicates/data/ui/find-duplicates.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/find_duplicates/data/ui/find-duplicates.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,32 +1,106 @@ - + - + + + + + + + False 5 Find Duplicates False normal - + True + False + vertical 2 + + + True + False + end + + + gtk-help + False + True + True + True + False + True + + + False + False + 0 + True + + + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 1 + + + + + gtk-find + False + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 6 6 True + False 6 True + False 6 True + False 0 Start _at: True @@ -34,53 +108,66 @@ False + True 0 True - False + False select-folder + False False + True + True 1 + True + True 0 _Include sub-folders + False True True False + False True True True False + True 1 + True + True 0 True + False 6 True + False 0 _Filter: True @@ -88,12 +175,14 @@ False + True 0 True + False file_type_liststore @@ -104,74 +193,24 @@ False + True 1 + True + True 1 False + True 1 - - - True - end - - - gtk-help - True - True - True - True - - - False - False - 0 - True - - - - - gtk-cancel - True - True - True - True - - - False - False - 1 - - - - - gtk-find - True - True - True - True - - - False - False - 2 - - - - - False - end - 0 - - @@ -186,10 +225,4 @@ - - - - - - diff -Nru gthumb-2.14.3/extensions/find_duplicates/data/ui/Makefile.in gthumb-3.0.0/extensions/find_duplicates/data/ui/Makefile.in --- gthumb-2.14.3/extensions/find_duplicates/data/ui/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/find_duplicates/data/ui/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -338,8 +360,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/find_duplicates/dlg-find-duplicates.c gthumb-3.0.0/extensions/find_duplicates/dlg-find-duplicates.c --- gthumb-2.14.3/extensions/find_duplicates/dlg-find-duplicates.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/find_duplicates/dlg-find-duplicates.c 2012-02-19 15:01:32.000000000 +0000 @@ -78,6 +78,7 @@ dlg_find_duplicates (GthBrowser *browser) { DialogData *data; + GSettings *settings; GtkWidget *file_chooser; GList *tests; char *general_filter; @@ -95,6 +96,8 @@ data->browser = browser; data->builder = _gtk_builder_new_from_file ("find-duplicates.ui", "find_duplicates"); + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + /* Get the widgets. */ data->dialog = _gtk_builder_get_widget (data->builder, "find_duplicates_dialog"); @@ -110,7 +113,7 @@ gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (file_chooser), get_home_uri ()); tests = gth_main_get_registered_objects_id (GTH_TYPE_TEST); - general_filter = eel_gconf_get_string (PREF_GENERAL_FILTER, DEFAULT_GENERAL_FILTER); + general_filter = g_settings_get_string (settings, PREF_BROWSER_GENERAL_FILTER); active_filter = 0; for (i = 0, i_general = -1, scan = tests; scan; scan = scan->next, i++) { const char *registered_test_id = scan->data; @@ -141,6 +144,7 @@ g_free (general_filter); _g_string_list_free (tests); + g_object_unref (settings); /* Set the signals handlers. */ @@ -163,7 +167,6 @@ /* Run dialog. */ - gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (browser)); gtk_window_set_modal (GTK_WINDOW (data->dialog), FALSE); gtk_widget_show (data->dialog); diff -Nru gthumb-2.14.3/extensions/find_duplicates/find_duplicates.extension.in.in gthumb-3.0.0/extensions/find_duplicates/find_duplicates.extension.in.in --- gthumb-2.14.3/extensions/find_duplicates/find_duplicates.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/find_duplicates/find_duplicates.extension.in.in 2012-04-21 09:25:21.000000000 +0000 @@ -9,4 +9,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=catalogs diff -Nru gthumb-2.14.3/extensions/find_duplicates/gth-find-duplicates.c gthumb-3.0.0/extensions/find_duplicates/gth-find-duplicates.c --- gthumb-2.14.3/extensions/find_duplicates/gth-find-duplicates.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/find_duplicates/gth-find-duplicates.c 2012-02-19 15:01:32.000000000 +0000 @@ -88,7 +88,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthFindDuplicates, gth_find_duplicates, G_TYPE_OBJECT) typedef struct { @@ -149,7 +149,7 @@ _g_object_unref (self->priv->file_stream); g_hash_table_unref (self->priv->duplicated); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_find_duplicates_parent_class)->finalize (object); } @@ -158,7 +158,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthFindDuplicatesPrivate)); object_class = (GObjectClass*) klass; @@ -192,34 +191,6 @@ } -GType -gth_find_duplicates_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthFindDuplicatesClass), - NULL, - NULL, - (GClassInitFunc) gth_find_duplicates_class_init, - NULL, - NULL, - sizeof (GthFindDuplicates), - 0, - (GInstanceInitFunc) gth_find_duplicates_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthFindDuplicates", - &type_info, - 0); - } - - return type; -} - - static void update_file_list_sensitivity (GthFindDuplicates *self) { @@ -280,7 +251,7 @@ while (gtk_tree_model_iter_next (model, &iter)); } - size_formatted = g_format_size_for_display (total_size); + size_formatted = g_format_size (total_size); text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_files), n_files, size_formatted); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("total_files_label")), text); @@ -372,7 +343,7 @@ char *size_formatted; char *text; - size_formatted = g_format_size_for_display (self->priv->duplicates_size); + size_formatted = g_format_size (self->priv->duplicates_size); text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", self->priv->n_duplicates), self->priv->n_duplicates, size_formatted); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("total_duplicates_label")), text); @@ -988,11 +959,14 @@ const char *filter) { GthFindDuplicates *self; + GSettings *settings; const char *test_attributes; int i; self = (GthFindDuplicates *) g_object_new (GTH_TYPE_FIND_DUPLICATES, NULL); + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + self->priv->browser = browser; self->priv->location = g_object_ref (location); self->priv->recursive = recursive; @@ -1002,7 +976,7 @@ self->priv->file_source = gth_main_get_file_source (self->priv->location); gth_file_source_set_cancellable (self->priv->file_source, self->priv->cancellable); - self->priv->attributes = g_string_new (eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE : GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE); + self->priv->attributes = g_string_new (g_settings_get_boolean (settings, PREF_BROWSER_FAST_FILE_TYPE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE : GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE); g_string_append (self->priv->attributes, ",gth::file::display-size"); test_attributes = gth_test_get_attributes (self->priv->test); if (test_attributes[0] != '\0') { @@ -1011,7 +985,7 @@ } self->priv->builder = _gtk_builder_new_from_file ("find-duplicates-dialog.ui", "find_duplicates"); - self->priv->duplicates_list = gth_file_list_new (gth_icon_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); + self->priv->duplicates_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); gth_file_selection_set_selection_mode (GTH_FILE_SELECTION (gth_file_list_get_view (GTH_FILE_LIST (self->priv->duplicates_list))), GTK_SELECTION_MULTIPLE); gth_file_list_set_caption (GTH_FILE_LIST (self->priv->duplicates_list), "find-duplicates::n-duplicates,gth::file::display-size"); gth_file_list_set_thumb_size (GTH_FILE_LIST (self->priv->duplicates_list), 112); @@ -1041,6 +1015,8 @@ } gth_menu_button_set_menu (GTH_MENU_BUTTON (self->priv->select_button), self->priv->select_menu); + g_object_unref (settings); + g_signal_connect (GET_WIDGET ("find_duplicates_dialog"), "destroy", G_CALLBACK (find_duplicates_dialog_destroy_cb), diff -Nru gthumb-2.14.3/extensions/find_duplicates/gth-folder-chooser-dialog.c gthumb-3.0.0/extensions/find_duplicates/gth-folder-chooser-dialog.c --- gthumb-2.14.3/extensions/find_duplicates/gth-folder-chooser-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/find_duplicates/gth-folder-chooser-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -33,7 +33,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthFolderChooserDialog, gth_folder_chooser_dialog, GTK_TYPE_DIALOG) struct _GthFolderChooserDialogPrivate { @@ -50,7 +50,7 @@ _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_folder_chooser_dialog_parent_class)->finalize (object); } @@ -59,7 +59,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthFolderChooserDialogPrivate)); object_class = (GObjectClass*) klass; @@ -125,34 +124,6 @@ } -GType -gth_folder_chooser_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFolderChooserDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_folder_chooser_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFolderChooserDialog), - 0, - (GInstanceInitFunc) gth_folder_chooser_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthFolderChooserDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void gth_folder_chooser_dialog_construct (GthFolderChooserDialog *self, GList *folders) diff -Nru gthumb-2.14.3/extensions/find_duplicates/Makefile.in gthumb-3.0.0/extensions/find_duplicates/Makefile.in --- gthumb-2.14.3/extensions/find_duplicates/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/find_duplicates/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -129,6 +146,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -208,10 +230,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -219,6 +239,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -258,6 +279,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -306,8 +329,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -338,6 +359,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -429,7 +451,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -437,6 +458,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -544,8 +567,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -728,13 +754,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/flicker/callbacks.c gthumb-3.0.0/extensions/flicker/callbacks.c --- gthumb-2.14.3/extensions/flicker/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker/callbacks.c 2012-02-19 15:01:32.000000000 +0000 @@ -54,14 +54,16 @@ ""; -static GtkActionEntry action_entries[] = { +static GthActionEntryExt action_entries[] = { { "File_Import_Flicker", "site-flickr", N_("_Flickr..."), NULL, N_("Download photos from Flickr"), + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, G_CALLBACK (gth_browser_activate_action_import_flicker) }, { "File_Export_Flicker", "site-flickr", N_("_Flickr..."), NULL, N_("Upload photos to Flickr"), + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, G_CALLBACK (gth_browser_activate_action_export_flicker) }, }; @@ -91,10 +93,10 @@ data->action_group = gtk_action_group_new ("Flicker Actions"); gtk_action_group_set_translation_domain (data->action_group, NULL); - gtk_action_group_add_actions (data->action_group, - action_entries, - G_N_ELEMENTS (action_entries), - browser); + _gtk_action_group_add_actions_with_flags (data->action_group, + action_entries, + G_N_ELEMENTS (action_entries), + browser); gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->action_group, 0); merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), ui_info, -1, &error); @@ -103,9 +105,5 @@ g_clear_error (&error); } - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Import/Web_Services/File_Import_Flicker")), TRUE); - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Export/Web_Services/File_Export_Flicker")), TRUE); - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ExportPopup/Web_Services/File_Export_Flicker")), TRUE); - g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } diff -Nru gthumb-2.14.3/extensions/flicker/flicker.extension.in.in gthumb-3.0.0/extensions/flicker/flicker.extension.in.in --- gthumb-2.14.3/extensions/flicker/flicker.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker/flicker.extension.in.in 2012-04-21 09:25:11.000000000 +0000 @@ -10,4 +10,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=importer;export_tools;flicker_utils diff -Nru gthumb-2.14.3/extensions/flicker/Makefile.in gthumb-3.0.0/extensions/flicker/Makefile.in --- gthumb-2.14.3/extensions/flicker/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -123,6 +140,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libflicker_la_SOURCES) DIST_SOURCES = $(am__libflicker_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) ETAGS = etags CTAGS = ctags @@ -171,10 +193,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -182,6 +202,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -221,6 +242,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -269,8 +292,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -301,6 +322,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -385,7 +407,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -393,6 +414,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -476,8 +499,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/flicker_utils/data/Makefile.in gthumb-3.0.0/extensions/flicker_utils/data/Makefile.in --- gthumb-2.14.3/extensions/flicker_utils/data/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/data/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/flicker_utils/data/ui/export-to-flickr.ui gthumb-3.0.0/extensions/flicker_utils/data/ui/export-to-flickr.ui --- gthumb-2.14.3/extensions/flicker_utils/data/ui/export-to-flickr.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/data/ui/export-to-flickr.ui 2012-02-19 15:01:32.000000000 +0000 @@ -14,9 +14,10 @@ 5 dialog - + True False + vertical 6 @@ -26,6 +27,7 @@ gtk-cancel + False True True True @@ -41,6 +43,7 @@ _Upload + False True True True @@ -57,6 +60,7 @@ gtk-help + False True True True @@ -142,6 +146,7 @@ GTK_FILL + GTK_FILL @@ -175,6 +180,7 @@ + False True True True @@ -196,7 +202,7 @@ - True + False True 0 @@ -239,7 +245,7 @@ - True + False True 1 @@ -248,6 +254,7 @@ 1 2 + GTK_FILL @@ -262,6 +269,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -277,6 +285,7 @@ 2 3 GTK_FILL + GTK_FILL @@ -297,11 +306,13 @@ 2 2 3 + GTK_FILL Hi_de from public searches + False True True False @@ -314,6 +325,7 @@ 2 4 5 + GTK_FILL @@ -329,6 +341,7 @@ 3 4 GTK_FILL + GTK_FILL @@ -349,6 +362,7 @@ 2 3 4 + GTK_FILL @@ -364,6 +378,7 @@ 2 1 2 + GTK_FILL diff -Nru gthumb-2.14.3/extensions/flicker_utils/data/ui/flicker-account-chooser.ui gthumb-3.0.0/extensions/flicker_utils/data/ui/flicker-account-chooser.ui --- gthumb-2.14.3/extensions/flicker_utils/data/ui/flicker-account-chooser.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/data/ui/flicker-account-chooser.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,24 +1,39 @@ - + + + + + + + + + + + + True + False 5 6 True + False 6 True + False 0 A_ccount: True False + True 0 @@ -26,28 +41,21 @@ 300 True + False account_liststore + True + True 1 + False + True 0 - - - - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/flicker_utils/data/ui/flicker-account-manager.ui gthumb-3.0.0/extensions/flicker_utils/data/ui/flicker-account-manager.ui --- gthumb-2.14.3/extensions/flicker_utils/data/ui/flicker-account-manager.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/data/ui/flicker-account-manager.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,6 @@ - + - @@ -12,11 +11,12 @@ True + False 5 - vertical True + False 0 A_ccounts: True @@ -24,24 +24,24 @@ False + True 0 True + False 6 + 300 + 150 True True - automatic - automatic in - 300 - 150 True True accounts_liststore @@ -49,6 +49,9 @@ False True 1 + + + @@ -63,39 +66,48 @@ + True + True 0 True - vertical + False 6 + False True True True + False True + False gtk-delete False + True 0 False + True 1 + True + True 1 diff -Nru gthumb-2.14.3/extensions/flicker_utils/data/ui/flicker-ask-authorization.ui gthumb-3.0.0/extensions/flicker_utils/data/ui/flicker-ask-authorization.ui --- gthumb-2.14.3/extensions/flicker_utils/data/ui/flicker-ask-authorization.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/data/ui/flicker-ask-authorization.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,8 +1,13 @@ - + + True + False + gtk-dialog-authentication + + False 5 False True @@ -11,19 +16,24 @@ other icon_image - + True + False + vertical 2 - + True + False end gtk-cancel + False True True True + False True @@ -35,9 +45,11 @@ _Authorize... + False True True True + False button_image True @@ -50,6 +62,7 @@ False + True end 0 @@ -61,12 +74,9 @@ authorize_button - - True - gtk-dialog-authentication - True + False 0 gtk-dialog-authentication 6 diff -Nru gthumb-2.14.3/extensions/flicker_utils/data/ui/flicker-complete-authorization.ui gthumb-3.0.0/extensions/flicker_utils/data/ui/flicker-complete-authorization.ui --- gthumb-2.14.3/extensions/flicker_utils/data/ui/flicker-complete-authorization.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/data/ui/flicker-complete-authorization.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,8 +1,13 @@ - + + True + False + gtk-dialog-authentication + + False 5 False True @@ -11,19 +16,24 @@ other icon_image1 - + True + False + vertical 2 - + True + False end gtk-cancel + False True True True + False True 0.50999999046325684 @@ -36,9 +46,11 @@ C_ontinue + False True True True + False button_image1 True @@ -51,6 +63,7 @@ False + True end 0 @@ -64,12 +77,9 @@ True + False 0 gtk-dialog-authentication 6 - - True - gtk-dialog-authentication - diff -Nru gthumb-2.14.3/extensions/flicker_utils/data/ui/flicker-export-completed.ui gthumb-3.0.0/extensions/flicker_utils/data/ui/flicker-export-completed.ui --- gthumb-2.14.3/extensions/flicker_utils/data/ui/flicker-export-completed.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/data/ui/flicker-export-completed.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,8 +1,14 @@ - + + True + False + 0 + gtk-jump-to + + False 5 False True @@ -10,19 +16,24 @@ True Files successfully uploaded to the server. - + True + False + vertical 2 - + True + False end _Open in the Browser + False True True True + False icon_image True @@ -35,9 +46,11 @@ gtk-close + False True True True + False True @@ -49,6 +62,7 @@ False + True end 0 @@ -60,9 +74,4 @@ button2 - - True - 0 - gtk-jump-to - diff -Nru gthumb-2.14.3/extensions/flicker_utils/data/ui/import-from-flickr.ui gthumb-3.0.0/extensions/flicker_utils/data/ui/import-from-flickr.ui --- gthumb-2.14.3/extensions/flicker_utils/data/ui/import-from-flickr.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/data/ui/import-from-flickr.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,28 +1,106 @@ - + - + + + + + + + + + + True + False + gtk-goto-bottom + + False 5 dialog - + True + False vertical + + + True + False + end + + + gtk-help + False + True + True + True + False + True + + + False + False + 0 + True + + + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 1 + + + + + _Import + False + True + True + True + False + download_image + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 5 - vertical 12 True - vertical + False 6 True + False 2 2 6 @@ -30,16 +108,18 @@ True - vertical + False 3 True + False 6 300 True + False account_liststore @@ -49,29 +129,37 @@ + True + True 0 + False True True True Edit accounts + False True + False gtk-edit False + True 1 + False + True 0 @@ -79,22 +167,26 @@ 1 2 + GTK_FILL True + False 0 A_ccount: True GTK_FILL + GTK_FILL True + False 0 Ph_otoset: True @@ -103,11 +195,13 @@ 1 2 GTK_FILL + GTK_FILL True + False photoset_liststore @@ -115,17 +209,20 @@ 2 1 2 + GTK_FILL False + True 0 False + True 0 @@ -134,113 +231,72 @@ 460 250 True + False 3 True + False 0 False + True 0 + True + True 1 True + False 6 True + False 0 _Destination: True False + True 0 True + False + True + True 1 False - 2 - - - - - 1 - - - - - True - end - - - gtk-help - True - True - True - True - - - False - False - 0 - True - - - - - gtk-cancel - True - True - True - True - - - False - False - 1 - - - - - _Import - True - True - True - download_image - True - - - False - False + True 2 False - end - 0 + True + 1 @@ -251,18 +307,6 @@ download_button - - True - gtk-goto-bottom - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/flicker_utils/data/ui/Makefile.in gthumb-3.0.0/extensions/flicker_utils/data/ui/Makefile.in --- gthumb-2.14.3/extensions/flicker_utils/data/ui/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/data/ui/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -342,8 +364,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/flicker_utils/dlg-export-to-flickr.c gthumb-3.0.0/extensions/flicker_utils/dlg-export-to-flickr.c --- gthumb-2.14.3/extensions/flicker_utils/dlg-export-to-flickr.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/dlg-export-to-flickr.c 2012-02-19 15:01:32.000000000 +0000 @@ -368,7 +368,7 @@ } gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx); - free_space = g_format_size_for_display (data->user->max_bandwidth - data->user->used_bandwidth); + free_space = g_format_size (data->user->max_bandwidth - data->user->used_bandwidth); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("free_space_label")), free_space); g_free (free_space); } @@ -562,7 +562,7 @@ return; } - total_size_formatted = g_format_size_for_display (total_size); + total_size_formatted = g_format_size (total_size); text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_total), n_total, total_size_formatted); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("images_info_label")), text); g_free (text); @@ -572,9 +572,8 @@ /* Set the widget data */ - data->list_view = gth_file_list_new (gth_icon_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); + data->list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); gth_file_list_set_thumb_size (GTH_FILE_LIST (data->list_view), 112); - gth_file_view_set_spacing (GTH_FILE_VIEW (gth_file_list_get_view (GTH_FILE_LIST (data->list_view))), 0); gth_file_list_enable_thumbs (GTH_FILE_LIST (data->list_view), TRUE); gth_file_list_set_ignore_hidden (GTH_FILE_LIST (data->list_view), TRUE); gth_file_list_set_caption (GTH_FILE_LIST (data->list_view), "none"); diff -Nru gthumb-2.14.3/extensions/flicker_utils/dlg-import-from-flickr.c gthumb-3.0.0/extensions/flicker_utils/dlg-import-from-flickr.c --- gthumb-2.14.3/extensions/flicker_utils/dlg-import-from-flickr.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/dlg-import-from-flickr.c 2012-02-19 15:01:32.000000000 +0000 @@ -145,6 +145,7 @@ file_list = get_files_to_download (data); if (file_list != NULL) { + GSettings *settings; GFile *destination; gboolean single_subfolder; GthSubfolderType subfolder_type; @@ -152,11 +153,12 @@ char *custom_format; GthTask *task; + settings = g_settings_new (GTHUMB_IMPORTER_SCHEMA); destination = gth_import_preferences_get_destination (); - subfolder_type = eel_gconf_get_enum (PREF_IMPORT_SUBFOLDER_TYPE, GTH_TYPE_SUBFOLDER_TYPE, GTH_SUBFOLDER_TYPE_FILE_DATE); - subfolder_format = eel_gconf_get_enum (PREF_IMPORT_SUBFOLDER_FORMAT, GTH_TYPE_SUBFOLDER_FORMAT, GTH_SUBFOLDER_FORMAT_YYYYMMDD); - single_subfolder = eel_gconf_get_boolean (PREF_IMPORT_SUBFOLDER_SINGLE, FALSE); - custom_format = eel_gconf_get_string (PREF_IMPORT_SUBFOLDER_CUSTOM_FORMAT, ""); + subfolder_type = g_settings_get_enum (settings, PREF_IMPORTER_SUBFOLDER_TYPE); + subfolder_format = g_settings_get_enum (settings, PREF_IMPORTER_SUBFOLDER_FORMAT); + single_subfolder = g_settings_get_boolean (settings, PREF_IMPORTER_SUBFOLDER_SINGLE); + custom_format = g_settings_get_string (settings, PREF_IMPORTER_SUBFOLDER_CUSTOM_FORMAT); task = gth_import_task_new (data->browser, file_list, @@ -175,6 +177,7 @@ g_object_unref (task); _g_object_unref (destination); + g_object_unref (settings); } _g_object_list_unref (file_list); @@ -546,12 +549,11 @@ /* Set the widget data */ - data->file_list = gth_file_list_new (gth_icon_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); + data->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); thumb_loader = gth_file_list_get_thumb_loader (GTH_FILE_LIST (data->file_list)); gth_thumb_loader_set_use_cache (thumb_loader, FALSE); gth_thumb_loader_set_loader_func (thumb_loader, flickr_thumbnail_loader); gth_file_list_set_thumb_size (GTH_FILE_LIST (data->file_list), FLICKR_SIZE_THUMBNAIL); - gth_file_view_set_spacing (GTH_FILE_VIEW (gth_file_list_get_view (GTH_FILE_LIST (data->file_list))), 0); gth_file_list_enable_thumbs (GTH_FILE_LIST (data->file_list), TRUE); gth_file_list_set_ignore_hidden (GTH_FILE_LIST (data->file_list), TRUE); gth_file_list_set_caption (GTH_FILE_LIST (data->file_list), "none"); diff -Nru gthumb-2.14.3/extensions/flicker_utils/flicker_utils.extension.in.in gthumb-3.0.0/extensions/flicker_utils/flicker_utils.extension.in.in --- gthumb-2.14.3/extensions/flicker_utils/flicker_utils.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/flicker_utils.extension.in.in 2012-04-21 09:25:15.000000000 +0000 @@ -4,4 +4,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=importer;export_tools diff -Nru gthumb-2.14.3/extensions/flicker_utils/flickr-account.c gthumb-3.0.0/extensions/flicker_utils/flickr-account.c --- gthumb-2.14.3/extensions/flicker_utils/flickr-account.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/flickr-account.c 2012-02-19 15:01:32.000000000 +0000 @@ -29,7 +29,14 @@ #include "flickr-account.h" -static gpointer flickr_account_parent_class = NULL; +static void flickr_account_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (FlickrAccount, + flickr_account, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + flickr_account_dom_domizable_interface_init)) static void @@ -49,7 +56,6 @@ static void flickr_account_class_init (FlickrAccountClass *klass) { - flickr_account_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = flickr_account_finalize; } @@ -101,7 +107,7 @@ static void -flickr_account_dom_domizable_interface_init (DomDomizableIface *iface) +flickr_account_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = flickr_account_create_element; iface->load_from_element = flickr_account_load_from_element; @@ -109,43 +115,9 @@ static void -flickr_account_instance_init (FlickrAccount *self) +flickr_account_init (FlickrAccount *self) { -} - - -GType -flickr_account_get_type (void) -{ - static GType flickr_account_type_id = 0; - - if (flickr_account_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FlickrAccountClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) flickr_account_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FlickrAccount), - 0, - (GInstanceInitFunc) flickr_account_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) flickr_account_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - flickr_account_type_id = g_type_register_static (G_TYPE_OBJECT, - "FlickrAccount", - &g_define_type_info, - 0); - g_type_add_interface_static (flickr_account_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return flickr_account_type_id; + /* void */ } diff -Nru gthumb-2.14.3/extensions/flicker_utils/flickr-account-chooser-dialog.c gthumb-3.0.0/extensions/flicker_utils/flickr-account-chooser-dialog.c --- gthumb-2.14.3/extensions/flicker_utils/flickr-account-chooser-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/flickr-account-chooser-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -34,7 +34,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (FlickrAccountChooserDialog, flickr_account_chooser_dialog, GTK_TYPE_DIALOG) struct _FlickrAccountChooserDialogPrivate { @@ -51,7 +51,7 @@ _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (flickr_account_chooser_dialog_parent_class)->finalize (object); } @@ -60,7 +60,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (FlickrAccountChooserDialogPrivate)); object_class = (GObjectClass*) klass; @@ -163,34 +162,6 @@ } -GType -flickr_account_chooser_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FlickrAccountChooserDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) flickr_account_chooser_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FlickrAccountChooserDialog), - 0, - (GInstanceInitFunc) flickr_account_chooser_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "FlickrAccountChooserDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void flickr_account_chooser_dialog_construct (FlickrAccountChooserDialog *self, GList *accounts, diff -Nru gthumb-2.14.3/extensions/flicker_utils/flickr-account-manager-dialog.c gthumb-3.0.0/extensions/flicker_utils/flickr-account-manager-dialog.c --- gthumb-2.14.3/extensions/flicker_utils/flickr-account-manager-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/flickr-account-manager-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -34,7 +34,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (FlickrAccountManagerDialog, flickr_account_manager_dialog, GTK_TYPE_DIALOG) struct _FlickrAccountManagerDialogPrivate { @@ -51,7 +51,7 @@ _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (flickr_account_manager_dialog_parent_class)->finalize (object); } @@ -60,7 +60,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (FlickrAccountManagerDialogPrivate)); object_class = (GObjectClass*) klass; @@ -160,34 +159,6 @@ } -GType -flickr_account_manager_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FlickrAccountManagerDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) flickr_account_manager_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FlickrAccountManagerDialog), - 0, - (GInstanceInitFunc) flickr_account_manager_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "FlickrAccountManagerDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void flickr_account_manager_dialog_construct (FlickrAccountManagerDialog *self, GList *accounts) diff -Nru gthumb-2.14.3/extensions/flicker_utils/flickr-authentication.c gthumb-3.0.0/extensions/flicker_utils/flickr-authentication.c --- gthumb-2.14.3/extensions/flicker_utils/flickr-authentication.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/flickr-authentication.c 2012-02-19 15:01:32.000000000 +0000 @@ -53,10 +53,12 @@ }; -static GObjectClass *parent_class = NULL; static guint flickr_authentication_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (FlickrAuthentication, flickr_authentication, G_TYPE_OBJECT) + + static void flickr_authentication_finalize (GObject *object) { @@ -69,7 +71,7 @@ _g_object_list_unref (self->priv->accounts); _g_object_unref (self->priv->account); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (flickr_authentication_parent_class)->finalize (object); } @@ -78,7 +80,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (FlickrAuthenticationPrivate)); object_class = (GObjectClass*) class; @@ -118,34 +119,6 @@ } -GType -flickr_authentication_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTaskClass), - NULL, - NULL, - (GClassInitFunc) flickr_authentication_class_init, - NULL, - NULL, - sizeof (GthTask), - 0, - (GInstanceInitFunc) flickr_authentication_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "FlickrAuthentication", - &type_info, - 0); - } - - return type; -} - - FlickrAuthentication * flickr_authentication_new (FlickrConnection *conn, FlickrService *service, diff -Nru gthumb-2.14.3/extensions/flicker_utils/flickr-connection.c gthumb-3.0.0/extensions/flicker_utils/flickr-connection.c --- gthumb-2.14.3/extensions/flicker_utils/flickr-connection.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/flickr-connection.c 2012-02-19 15:01:32.000000000 +0000 @@ -58,7 +58,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (FlickrConnection, flickr_connection, GTH_TYPE_TASK) static void @@ -75,7 +75,7 @@ g_free (self->priv->frob); _g_object_unref (self->priv->session); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (flickr_connection_parent_class)->finalize (object); } @@ -104,7 +104,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (FlickrConnectionPrivate)); object_class = (GObjectClass*) klass; @@ -130,34 +129,6 @@ } -GType -flickr_connection_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (FlickrConnectionClass), - NULL, - NULL, - (GClassInitFunc) flickr_connection_class_init, - NULL, - NULL, - sizeof (FlickrConnection), - 0, - (GInstanceInitFunc) flickr_connection_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "FlickrConnection", - &type_info, - 0); - } - - return type; -} - - FlickrConnection * flickr_connection_new (FlickrServer *server) { diff -Nru gthumb-2.14.3/extensions/flicker_utils/flickr-photo.c gthumb-3.0.0/extensions/flicker_utils/flickr-photo.c --- gthumb-2.14.3/extensions/flicker_utils/flickr-photo.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/flickr-photo.c 2012-02-19 15:01:32.000000000 +0000 @@ -42,7 +42,14 @@ }; -static gpointer flickr_photo_parent_class = NULL; +static void flickr_photo_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (FlickrPhoto, + flickr_photo, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + flickr_photo_dom_domizable_interface_init)) static void @@ -70,7 +77,6 @@ static void flickr_photo_class_init (FlickrPhotoClass *klass) { - flickr_photo_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (FlickrPhotoPrivate)); G_OBJECT_CLASS (klass)->finalize = flickr_photo_finalize; } @@ -132,7 +138,7 @@ static void -flickr_photo_dom_domizable_interface_init (DomDomizableIface *iface) +flickr_photo_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = flickr_photo_create_element; iface->load_from_element = flickr_photo_load_from_element; @@ -140,7 +146,7 @@ static void -flickr_photo_instance_init (FlickrPhoto *self) +flickr_photo_init (FlickrPhoto *self) { int i; @@ -159,41 +165,6 @@ } -GType -flickr_photo_get_type (void) -{ - static GType flickr_photo_type_id = 0; - - if (flickr_photo_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FlickrPhotoClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) flickr_photo_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FlickrPhoto), - 0, - (GInstanceInitFunc) flickr_photo_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) flickr_photo_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - flickr_photo_type_id = g_type_register_static (G_TYPE_OBJECT, - "FlickrPhoto", - &g_define_type_info, - 0); - g_type_add_interface_static (flickr_photo_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return flickr_photo_type_id; -} - - FlickrPhoto * flickr_photo_new (FlickrServer *server) { diff -Nru gthumb-2.14.3/extensions/flicker_utils/flickr-photoset.c gthumb-3.0.0/extensions/flicker_utils/flickr-photoset.c --- gthumb-2.14.3/extensions/flicker_utils/flickr-photoset.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/flickr-photoset.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,14 @@ #include "flickr-photoset.h" -static gpointer flickr_photoset_parent_class = NULL; +static void flickr_photoset_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (FlickrPhotoset, + flickr_photoset, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + flickr_photoset_dom_domizable_interface_init)) static void @@ -51,7 +58,6 @@ static void flickr_photoset_class_init (FlickrPhotosetClass *klass) { - flickr_photoset_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = flickr_photoset_finalize; } @@ -123,7 +129,7 @@ static void -flickr_photoset_dom_domizable_interface_init (DomDomizableIface *iface) +flickr_photoset_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = flickr_photoset_create_element; iface->load_from_element = flickr_photoset_load_from_element; @@ -131,7 +137,7 @@ static void -flickr_photoset_instance_init (FlickrPhotoset *self) +flickr_photoset_init (FlickrPhotoset *self) { self->id = NULL; self->title = NULL; @@ -144,41 +150,6 @@ } -GType -flickr_photoset_get_type (void) -{ - static GType flickr_photoset_type_id = 0; - - if (flickr_photoset_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FlickrPhotosetClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) flickr_photoset_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FlickrPhotoset), - 0, - (GInstanceInitFunc) flickr_photoset_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) flickr_photoset_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - flickr_photoset_type_id = g_type_register_static (G_TYPE_OBJECT, - "FlickrPhotoset", - &g_define_type_info, - 0); - g_type_add_interface_static (flickr_photoset_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return flickr_photoset_type_id; -} - - FlickrPhotoset * flickr_photoset_new (void) { diff -Nru gthumb-2.14.3/extensions/flicker_utils/flickr-service.c gthumb-3.0.0/extensions/flicker_utils/flickr-service.c --- gthumb-2.14.3/extensions/flicker_utils/flickr-service.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/flickr-service.c 2012-02-19 15:01:32.000000000 +0000 @@ -34,6 +34,9 @@ #define IMAGES_PER_PAGE 500 +G_DEFINE_TYPE (FlickrService, flickr_service, G_TYPE_OBJECT) + + typedef struct { FlickrPrivacyType privacy_level; FlickrSafetyType safety_level; @@ -97,9 +100,6 @@ }; -static gpointer parent_class = NULL; - - static void flickr_service_finalize (GObject *object) { @@ -112,7 +112,7 @@ post_photos_data_free (self->priv->post_photos); add_photos_data_free (self->priv->add_photos); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (flickr_service_parent_class)->finalize (object); } @@ -121,7 +121,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (FlickrServicePrivate)); object_class = (GObjectClass*) klass; @@ -139,34 +138,6 @@ } -GType -flickr_service_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (FlickrServiceClass), - NULL, - NULL, - (GClassInitFunc) flickr_service_class_init, - NULL, - NULL, - sizeof (FlickrService), - 0, - (GInstanceInitFunc) flickr_service_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "FlickrService", - &type_info, - 0); - } - - return type; -} - - FlickrService * flickr_service_new (FlickrConnection *conn) { diff -Nru gthumb-2.14.3/extensions/flicker_utils/flickr-user.c gthumb-3.0.0/extensions/flicker_utils/flickr-user.c --- gthumb-2.14.3/extensions/flicker_utils/flickr-user.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/flickr-user.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,14 @@ #include "flickr-user.h" -static gpointer flickr_user_parent_class = NULL; +static void flickr_user_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (FlickrUser, + flickr_user, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + flickr_user_dom_domizable_interface_init)) static void @@ -46,12 +53,11 @@ static void flickr_user_class_init (FlickrUserClass *klass) { - flickr_user_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = flickr_user_finalize; } -static DomElement* +static DomElement * flickr_user_create_element (DomDomizable *base, DomDocument *doc) { @@ -105,7 +111,7 @@ static void -flickr_user_dom_domizable_interface_init (DomDomizableIface *iface) +flickr_user_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = flickr_user_create_element; iface->load_from_element = flickr_user_load_from_element; @@ -113,48 +119,13 @@ static void -flickr_user_instance_init (FlickrUser *self) +flickr_user_init (FlickrUser *self) { self->id = NULL; self->username = NULL; } -GType -flickr_user_get_type (void) -{ - static GType flickr_user_type_id = 0; - - if (flickr_user_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (FlickrUserClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) flickr_user_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (FlickrUser), - 0, - (GInstanceInitFunc) flickr_user_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) flickr_user_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - flickr_user_type_id = g_type_register_static (G_TYPE_OBJECT, - "FlickrUser", - &g_define_type_info, - 0); - g_type_add_interface_static (flickr_user_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return flickr_user_type_id; -} - - FlickrUser * flickr_user_new (void) { diff -Nru gthumb-2.14.3/extensions/flicker_utils/Makefile.in gthumb-3.0.0/extensions/flicker_utils/Makefile.in --- gthumb-2.14.3/extensions/flicker_utils/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/flicker_utils/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -149,6 +166,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -228,10 +250,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -239,6 +259,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -278,6 +299,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -326,8 +349,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -358,6 +379,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -462,7 +484,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -470,6 +491,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -625,8 +648,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -809,13 +835,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/actions.c gthumb-3.0.0/extensions/gstreamer_tools/actions.c --- gthumb-2.14.3/extensions/gstreamer_tools/actions.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/actions.c 2012-02-19 15:01:32.000000000 +0000 @@ -36,6 +36,7 @@ typedef struct { GthBrowser *browser; + GSettings *settings; GthMediaViewerPage *page; gboolean playing_before_screenshot; GdkPixbuf *pixbuf; @@ -48,6 +49,7 @@ { _g_object_unref (save_data->file_data); _g_object_unref (save_data->pixbuf); + _g_object_unref (save_data->settings); g_free (save_data); } @@ -94,7 +96,7 @@ folder = g_file_get_parent (file); folder_uri = g_file_get_uri (folder); - eel_gconf_set_string (PREF_GSTREAMER_SCREESHOT_LOCATION, folder_uri); + g_settings_set_string (save_data->settings, PREF_GSTREAMER_TOOLS_SCREESHOT_LOCATION, folder_uri); save_data->file_data = gth_file_data_new (file, NULL); gth_file_data_set_mime_type (save_data->file_data, mime_type); @@ -137,7 +139,7 @@ char *display_name; int attempt; - last_uri = eel_gconf_get_string (PREF_GSTREAMER_SCREESHOT_LOCATION, "~"); + last_uri = g_settings_get_string (save_data->settings, PREF_GSTREAMER_TOOLS_SCREESHOT_LOCATION); if ((last_uri == NULL) || (strcmp (last_uri, "~") == 0)) last_folder = g_file_new_for_path (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)); else @@ -196,6 +198,7 @@ save_data = g_new0 (SaveData, 1); save_data->browser = gth_media_viewer_page_get_browser (page); + save_data->settings = g_settings_new (GTHUMB_GSTREAMER_TOOLS_SCHEMA); save_data->page = page; save_data->playing_before_screenshot = gth_media_viewer_page_is_playing (page); diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/data/gthumb-gstreamer.schemas.in gthumb-3.0.0/extensions/gstreamer_tools/data/gthumb-gstreamer.schemas.in --- gthumb-2.14.3/extensions/gstreamer_tools/data/gthumb-gstreamer.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/data/gthumb-gstreamer.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/gstreamer/screenshot_location - /apps/gthumb/ext/gstreamer/screenshot_location - gthumb - string - ~ - - - - - - - - diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/data/Makefile.am gthumb-3.0.0/extensions/gstreamer_tools/data/Makefile.am --- gthumb-2.14.3/extensions/gstreamer_tools/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-gstreamer.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/gstreamer_tools/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/data/Makefile.in gthumb-3.0.0/extensions/gstreamer_tools/data/Makefile.in --- gthumb-2.14.3/extensions/gstreamer_tools/data/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/data/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-gstreamer.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/gstreamer_tools/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/data/ui/Makefile.in gthumb-3.0.0/extensions/gstreamer_tools/data/ui/Makefile.in --- gthumb-2.14.3/extensions/gstreamer_tools/data/ui/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/data/ui/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/data/ui/mediabar.ui gthumb-3.0.0/extensions/gstreamer_tools/data/ui/mediabar.ui --- gthumb-2.14.3/extensions/gstreamer_tools/data/ui/mediabar.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/data/ui/mediabar.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,191 +1,135 @@ - - + + 100 1 + 10 - - 200 - 100 - 1 - - + True False + 3 + 3 + 3 + 3 + 34 - + True False - 36 + 6 - + + False True - False - 6 + True + True + Slower + False + none - + True - True - True - Slower - False - none - - - True - False - gtk-media-rewind - - + False + media-seek-backward-symbolic + 2 - - False - False - 0 - + + + False + True + 0 + + + + + False + True + True + True + Play + False + none - + True - True - True - Play - False - none - - - True - False - gtk-media-play - 3 - - + False + media-playback-start-symbolic + 3 - - False - False - 1 - + + + False + True + 1 + + + + + False + True + True + True + Faster + False + none - + True - True - True - Faster - False - none - - - True - False - gtk-media-forward - - + False + media-seek-forward-symbolic + 2 - - False - False - 2 - False - False - 0 + True + 2 + + + False + True + 0 + + + + + True + False + 6 - + True False - 6 - + True False - - - True - False - Time: - - - False - False - 0 - - - - - True - True - adjustment_position - 100 - False - - - True - True - 1 - - + Time: - True + False True 0 - + True - False - 2 - - - True - False - --:-- - 6 - - - True - True - 0 - - - - - True - False - / - - - False - False - 1 - - - - - True - False - --:-- - 6 - - - True - True - 2 - - + True + position_adjustment + 1 + False - False - False + True + True 1 @@ -193,29 +137,19 @@ True True - 1 + 0 - + True False - 6 + 2 - + True - True - True - Toggle volume - False - none - - - True - False - audio-volume-high - - + False + --:-- False @@ -224,35 +158,98 @@ - - 180 + True - True - Change volume level - adjustment_volume - 0 - right + False + / - True + False True 1 + + + True + False + --:-- + + + False + True + 2 + + False - False - end - 2 + True + 1 + + + + + True + True + 1 + + + + + True + False + 6 + + + False + True + True + True + Toggle volume + False + none + + + True + False + audio-volume-high-symbolic + + + + + False + True + 0 + + + + + 180 + True + True + Change volume level + volume_adjustment + 1 + right + + + False + True + 1 False - False - 0 + True + 2 + + 100 + 1 + 10 + diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/data/ui/save-screenshot.ui gthumb-3.0.0/extensions/gstreamer_tools/data/ui/save-screenshot.ui --- gthumb-2.14.3/extensions/gstreamer_tools/data/ui/save-screenshot.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/data/ui/save-screenshot.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,25 +1,72 @@ - + - + False 5 False normal - + True + False vertical 2 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 0 + + + + + gtk-save + False + True + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + True + False 5 12 True - vertical + False 240 @@ -48,10 +95,11 @@ True - vertical + False True + False 2 2 6 @@ -59,14 +107,19 @@ True + False 0 _Name: True + + GTK_FILL + True + False 0 _Destination: True @@ -74,25 +127,28 @@ 1 2 + GTK_FILL True True - + 1 2 + GTK_FILL True - False - False + False select-folder + False + False Choose a folder @@ -100,6 +156,7 @@ 2 1 2 + GTK_FILL @@ -118,48 +175,11 @@ + True + True 1 - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - gtk-save - True - True - True - True - - - False - False - 1 - - - - - False - end - 0 - - diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/gstreamer_tools.extension.in.in gthumb-3.0.0/extensions/gstreamer_tools/gstreamer_tools.extension.in.in --- gthumb-2.14.3/extensions/gstreamer_tools/gstreamer_tools.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/gstreamer_tools.extension.in.in 2012-04-21 09:25:04.000000000 +0000 @@ -10,4 +10,5 @@ [Loader] Type=module File=%LIBRARY% -Requires=gstreamer_utils \ No newline at end of file +API=%GTHUMB_API_VERSION% +Requires=gstreamer_utils diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/gth-media-viewer-page.c gthumb-3.0.0/extensions/gstreamer_tools/gth-media-viewer-page.c --- gthumb-2.14.3/extensions/gstreamer_tools/gth-media-viewer-page.c 2011-11-06 09:39:36.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/gth-media-viewer-page.c 2012-03-31 09:42:32.000000000 +0000 @@ -31,11 +31,20 @@ #include "gth-media-viewer-page.h" -#define GTH_MEDIA_VIEWER_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_MEDIA_VIEWER_PAGE, GthMediaViewerPagePrivate)) #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) #define PROGRESS_DELAY 500 +static void gth_viewer_page_interface_init (GthViewerPageInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthMediaViewerPage, + gth_media_viewer_page, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTH_TYPE_VIEWER_PAGE, + gth_viewer_page_interface_init)) + + struct _GthMediaViewerPagePrivate { GthBrowser *browser; GtkActionGroup *actions; @@ -45,6 +54,7 @@ GtkBuilder *builder; GtkWidget *area; GtkWidget *area_box; + gboolean visible; gboolean playing; gboolean paused; gdouble last_volume; @@ -58,6 +68,7 @@ gdouble rate; GtkWidget *mediabar; GtkWidget *fullscreen_toolbar; + gulong video_window_xid; gboolean xwin_assigned; GdkPixbuf *icon; PangoLayout *caption_layout; @@ -69,7 +80,6 @@ }; -static gpointer gth_media_viewer_page_parent_class = NULL; static double default_rates[] = { 0.03, 0.06, 0.12, 0.25, 0.33, 0.50, 0.66, 1.0, 1.50, 2.0, 3.0, 4.0, 8.0, 16.0, 32.0 }; @@ -137,6 +147,7 @@ { GthMediaViewerPage *self = user_data; + self->priv->video_window_xid = GDK_WINDOW_XID (gtk_widget_get_window (widget)); self->priv->cursor = gdk_cursor_new (GDK_LEFT_PTR); self->priv->cursor_void = gdk_cursor_new_for_display (gtk_widget_get_display (self->priv->area), GDK_BLANK_CURSOR); if (self->priv->cursor_visible) @@ -156,13 +167,16 @@ { GthMediaViewerPage *self = user_data; + self->priv->video_window_xid = 0; + self->priv->xwin_assigned = FALSE; + if (self->priv->cursor) { - gdk_cursor_unref (self->priv->cursor); + g_object_unref (self->priv->cursor); self->priv->cursor = NULL; } if (self->priv->cursor_void) { - gdk_cursor_unref (self->priv->cursor_void); + g_object_unref (self->priv->cursor_void); self->priv->cursor_void = NULL; } @@ -172,23 +186,19 @@ static gboolean -video_area_expose_event_cb (GtkWidget *widget, - GdkEventExpose *event, - gpointer user_data) +video_area_draw_cb (GtkWidget *widget, + cairo_t *cr, + gpointer user_data) { GthMediaViewerPage *self = user_data; GtkAllocation allocation; - GtkStyle *style; - cairo_t *cr; - - if (event->count > 0) - return FALSE; + GtkStyleContext *style_context; if (self->priv->xwin_assigned && self->priv->has_video) return FALSE; gtk_widget_get_allocation (widget, &allocation); - style = gtk_widget_get_style (widget); + style_context = gtk_widget_get_style_context (widget); if (self->priv->icon == NULL) { char *type; @@ -211,14 +221,8 @@ g_free (type); } - cr = gdk_cairo_create (gtk_widget_get_window (widget)); - gdk_cairo_region (cr, event->region); - cairo_clip (cr); - if (self->priv->has_video) - cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); - else - gdk_cairo_set_source_color (cr, &style->text[gtk_widget_get_state (widget)]); - gdk_cairo_region (cr, event->region); + cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); + cairo_rectangle (cr, 0, 0, allocation.width, allocation.height); cairo_fill (cr); if (self->priv->icon != NULL) { @@ -246,13 +250,12 @@ cairo_fill (cr); cairo_move_to (cr, x, y); + pango_layout_set_font_description (self->priv->caption_layout, gtk_style_context_get_font (style_context, gtk_widget_get_state (widget))); pango_cairo_layout_path (cr, self->priv->caption_layout); - gdk_cairo_set_source_color (cr, &style->base[gtk_widget_get_state (widget)]); + cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); cairo_fill (cr); } - cairo_destroy (cr); - return TRUE; } @@ -263,7 +266,7 @@ GthMediaViewerPage *self) { if ((event->type == GDK_BUTTON_PRESS) && (event->button == 1) ) { - gtk_button_clicked (GTK_BUTTON (GET_WIDGET ("button_play"))); + gtk_button_clicked (GTK_BUTTON (GET_WIDGET ("play_button"))); return TRUE; } @@ -342,9 +345,9 @@ */ if (update_progressbar) { - g_signal_handlers_block_by_func(GET_WIDGET ("adjustment_position"), position_value_changed_cb, self); - gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("adjustment_position")), (self->priv->duration > 0) ? ((double) current_value / self->priv->duration) * 100.0 : 0.0); - g_signal_handlers_unblock_by_func(GET_WIDGET ("adjustment_position"), position_value_changed_cb, self); + g_signal_handlers_block_by_func(GET_WIDGET ("position_adjustment"), position_value_changed_cb, self); + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("position_adjustment")), (self->priv->duration > 0) ? ((double) current_value / self->priv->duration) * 100.0 : 0.0); + g_signal_handlers_unblock_by_func(GET_WIDGET ("position_adjustment"), position_value_changed_cb, self); } s = _g_format_duration_for_display (GST_TIME_AS_MSECONDS (current_value)); @@ -384,7 +387,7 @@ static char * -hscale_volume_format_value_cb (GtkScale *scale, +volume_scale_format_value_cb (GtkScale *scale, double value, gpointer user_data) { @@ -393,7 +396,7 @@ static gboolean -hscale_position_change_value_cb (GtkRange *range, +position_scale_change_value_cb (GtkRange *range, GtkScrollType scroll, gdouble value, gpointer user_data) @@ -410,12 +413,37 @@ static gboolean -hscale_position_button_release_event_cb (GtkWidget *widget, +position_scale_button_press_event_cb (GtkWidget *widget, + GdkEventButton *event, + gpointer user_data) +{ + /* In a video player when clicking on the progress bar the user expect + * to jump to the specified position directly instead of scrolling one + * page up or down as happens by default in Gtk+. The button 2 + * behavior is what we want by default for button 1. */ + + if (event->button == 1) + event->button = 2; + else if (event->button == 2) + event->button = 1; + + return FALSE; +} + + +static gboolean +position_scale_button_release_event_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data) { GthMediaViewerPage *self = user_data; + /* Swap button 1 and 2 behaviors, see position_scale_button_press_event_cb */ + if (event->button == 1) + event->button = 2; + else if (event->button == 2) + event->button = 1; + if (self->priv->playing) self->priv->block_next_jump = TRUE; @@ -453,7 +481,7 @@ if (! self->priv->playing) return; - current_value = (gint64) (gtk_adjustment_get_value (GTK_ADJUSTMENT (GET_WIDGET ("adjustment_position"))) / 100.0 * self->priv->duration); + current_value = (gint64) (gtk_adjustment_get_value (GTK_ADJUSTMENT (GET_WIDGET ("position_adjustment"))) / 100.0 * self->priv->duration); if (! gst_element_seek (self->priv->playbin, self->priv->rate, GST_FORMAT_TIME, @@ -469,7 +497,7 @@ static void -button_play_clicked_cb (GtkButton *button, +play_button_clicked_cb (GtkButton *button, gpointer user_data) { GthMediaViewerPage *self = user_data; @@ -491,7 +519,7 @@ else { gint64 current_value; - current_value = (gint64) (gtk_adjustment_get_value (GTK_ADJUSTMENT (GET_WIDGET ("adjustment_position"))) / 100.0 * self->priv->duration); + current_value = (gint64) (gtk_adjustment_get_value (GTK_ADJUSTMENT (GET_WIDGET ("position_adjustment"))) / 100.0 * self->priv->duration); gst_element_seek (self->priv->playbin, self->priv->rate, GST_FORMAT_TIME, @@ -509,7 +537,7 @@ static void -togglebutton_volume_toggled_cb (GtkToggleButton *button, +volume_togglebutton_toggled_cb (GtkToggleButton *button, gpointer user_data) { GthMediaViewerPage *self = user_data; @@ -530,7 +558,7 @@ get_nearest_rate (double rate) { int min_idx = -1; - double min_delta; + double min_delta = 0; int i; for (i = 0; i < G_N_ELEMENTS (default_rates); i++) { @@ -548,7 +576,7 @@ static void -button_play_slower_clicked_cb (GtkButton *button, +play_slower_button_clicked_cb (GtkButton *button, gpointer user_data) { GthMediaViewerPage *self = user_data; @@ -565,7 +593,7 @@ static void -button_play_faster_clicked_cb (GtkButton *button, +play_faster_button_clicked_cb (GtkButton *button, gpointer user_data) { GthMediaViewerPage *self = user_data; @@ -590,18 +618,19 @@ return; g_object_get (self->priv->playbin, "volume", &volume, NULL); + if (volume == 0.0) - gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("togglebutton_volume_image")), "audio-volume-muted", GTK_ICON_SIZE_BUTTON); - else if (volume < 3.3) - gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("togglebutton_volume_image")), "audio-volume-low", GTK_ICON_SIZE_BUTTON); - else if (volume < 6.6) - gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("togglebutton_volume_image")), "audio-volume-medium", GTK_ICON_SIZE_BUTTON); + gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("volume_togglebutton_image")), "audio-volume-muted-symbolic", GTK_ICON_SIZE_BUTTON); + else if (volume < 0.33) + gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("volume_togglebutton_image")), "audio-volume-low-symbolic", GTK_ICON_SIZE_BUTTON); + else if (volume < 0.66) + gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("volume_togglebutton_image")), "audio-volume-medium-symbolic", GTK_ICON_SIZE_BUTTON); else - gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("togglebutton_volume_image")), "audio-volume-high", GTK_ICON_SIZE_BUTTON); + gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("volume_togglebutton_image")), "audio-volume-high-symbolic", GTK_ICON_SIZE_BUTTON); - g_signal_handlers_block_by_func(GET_WIDGET ("adjustment_volume"), volume_value_changed_cb, self); - gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("adjustment_volume")), volume * 100.0); - g_signal_handlers_unblock_by_func(GET_WIDGET ("adjustment_volume"), volume_value_changed_cb, self); + g_signal_handlers_block_by_func(GET_WIDGET ("volume_adjustment"), volume_value_changed_cb, self); + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("volume_adjustment")), volume * 100.0); + g_signal_handlers_unblock_by_func(GET_WIDGET ("volume_adjustment"), volume_value_changed_cb, self); } @@ -643,8 +672,8 @@ { if (! self->priv->playing && (new_state == GST_STATE_PLAYING)) { set_playing_state (self, TRUE); - gtk_image_set_from_stock (GTK_IMAGE (GET_WIDGET ("button_play_image")), GTK_STOCK_MEDIA_PAUSE, GTK_ICON_SIZE_LARGE_TOOLBAR); - gtk_widget_set_tooltip_text (GET_WIDGET ("button_play_image"), _("Pause")); + gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("play_button_image")), "media-playback-pause-symbolic", GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_widget_set_tooltip_text (GET_WIDGET ("play_button_image"), _("Pause")); if (self->priv->update_progress_id == 0) self->priv->update_progress_id = gdk_threads_add_timeout (PROGRESS_DELAY, update_progress_cb, self); @@ -653,8 +682,8 @@ } else if (self->priv->playing && (new_state != GST_STATE_PLAYING)) { set_playing_state (self, FALSE); - gtk_image_set_from_stock (GTK_IMAGE (GET_WIDGET ("button_play_image")), GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_LARGE_TOOLBAR); - gtk_widget_set_tooltip_text (GET_WIDGET ("button_play_image"), _("Play")); + gtk_image_set_from_icon_name (GTK_IMAGE (GET_WIDGET ("play_button_image")), "media-playback-start-symbolic", GTK_ICON_SIZE_LARGE_TOOLBAR); + gtk_widget_set_tooltip_text (GET_WIDGET ("play_button_image"), _("Play")); if (self->priv->update_progress_id != 0) { g_source_remove (self->priv->update_progress_id); @@ -689,8 +718,6 @@ self); gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), self->priv->actions, 0); - self->priv->area_box = gtk_vbox_new (FALSE, 0); - /* video area */ self->priv->area = gtk_drawing_area_new (); @@ -704,7 +731,6 @@ | GDK_BUTTON_MOTION_MASK)); gtk_widget_set_can_focus (self->priv->area, TRUE); gtk_widget_show (self->priv->area); - gtk_box_pack_start (GTK_BOX (self->priv->area_box), self->priv->area, TRUE, TRUE, 0); g_signal_connect (G_OBJECT (self->priv->area), "realize", @@ -715,8 +741,8 @@ G_CALLBACK (video_area_unrealize_cb), self); g_signal_connect (G_OBJECT (self->priv->area), - "expose_event", - G_CALLBACK (video_area_expose_event_cb), + "draw", + G_CALLBACK (video_area_draw_cb), self); g_signal_connect (G_OBJECT (self->priv->area), "button_press_event", @@ -740,23 +766,56 @@ self->priv->builder = _gtk_builder_new_from_file ("mediabar.ui", "gstreamer_tools"); self->priv->mediabar = GET_WIDGET ("mediabar"); gtk_widget_show (self->priv->mediabar); - gtk_box_pack_start (GTK_BOX (self->priv->area_box), self->priv->mediabar, FALSE, FALSE, 0); - g_signal_connect (GET_WIDGET ("adjustment_volume"), "value-changed", G_CALLBACK (volume_value_changed_cb), self); - g_signal_connect (GET_WIDGET ("adjustment_position"), "value-changed", G_CALLBACK (position_value_changed_cb), self); - g_signal_connect (GET_WIDGET ("hscale_volume"), "format-value", G_CALLBACK (hscale_volume_format_value_cb), self); - g_signal_connect (GET_WIDGET ("hscale_position"), "change-value", G_CALLBACK (hscale_position_change_value_cb), self); - g_signal_connect (GET_WIDGET ("hscale_position"), "button-release-event", G_CALLBACK (hscale_position_button_release_event_cb), self); - g_signal_connect (GET_WIDGET ("button_play"), "clicked", G_CALLBACK (button_play_clicked_cb), self); - g_signal_connect (GET_WIDGET ("togglebutton_volume"), "toggled", G_CALLBACK (togglebutton_volume_toggled_cb), self); - g_signal_connect (GET_WIDGET ("button_play_slower"), "clicked", G_CALLBACK (button_play_slower_clicked_cb), self); - g_signal_connect (GET_WIDGET ("button_play_faster"), "clicked", G_CALLBACK (button_play_faster_clicked_cb), self); + g_signal_connect (GET_WIDGET ("volume_adjustment"), + "value-changed", + G_CALLBACK (volume_value_changed_cb), + self); + g_signal_connect (GET_WIDGET ("position_adjustment"), + "value-changed", + G_CALLBACK (position_value_changed_cb), + self); + g_signal_connect (GET_WIDGET ("volume_scale"), + "format-value", + G_CALLBACK (volume_scale_format_value_cb), + self); + g_signal_connect (GET_WIDGET ("position_scale"), + "change-value", + G_CALLBACK (position_scale_change_value_cb), + self); + g_signal_connect (GET_WIDGET ("position_scale"), + "button-press-event", + G_CALLBACK (position_scale_button_press_event_cb), + self); + g_signal_connect (GET_WIDGET ("position_scale"), + "button-release-event", + G_CALLBACK (position_scale_button_release_event_cb), + self); + g_signal_connect (GET_WIDGET ("play_button"), + "clicked", + G_CALLBACK (play_button_clicked_cb), + self); + g_signal_connect (GET_WIDGET ("volume_togglebutton"), + "toggled", + G_CALLBACK (volume_togglebutton_toggled_cb), + self); + g_signal_connect (GET_WIDGET ("play_slower_button"), + "clicked", + G_CALLBACK (play_slower_button_clicked_cb), + self); + g_signal_connect (GET_WIDGET ("play_faster_button"), + "clicked", + G_CALLBACK (play_faster_button_clicked_cb), + self); + self->priv->area_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_pack_start (GTK_BOX (self->priv->area_box), self->priv->area, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (self->priv->area_box), self->priv->mediabar, FALSE, FALSE, 0); gtk_widget_show (self->priv->area_box); gth_browser_set_viewer_widget (browser, self->priv->area_box); - gtk_widget_realize (self->priv->area); - gdk_window_ensure_native (gtk_widget_get_window (self->priv->area)); + gtk_widget_realize (self->priv->area_box); + gth_viewer_page_focus (GTH_VIEWER_PAGE (self)); } @@ -818,8 +877,6 @@ GstMessage *message, GthMediaViewerPage *self) { - GstXOverlay *image_sink; - /* ignore anything but 'prepare-xwindow-id' element messages */ if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT) @@ -827,10 +884,17 @@ if (! gst_structure_has_name (message->structure, "prepare-xwindow-id")) return GST_BUS_PASS; - image_sink = GST_X_OVERLAY (GST_MESSAGE_SRC (message)); - gst_x_overlay_set_xwindow_id (image_sink, GDK_WINDOW_XID (gtk_widget_get_window (self->priv->area))); - g_object_set (image_sink, "force-aspect-ratio", TRUE, NULL); - self->priv->xwin_assigned = TRUE; + if (self->priv->video_window_xid != 0) { + GstXOverlay *xoverlay; + + xoverlay = GST_X_OVERLAY (GST_MESSAGE_SRC (message)); + gst_x_overlay_set_window_handle (xoverlay, self->priv->video_window_xid); + self->priv->xwin_assigned = TRUE; + + g_object_set (xoverlay, "force-aspect-ratio", TRUE, NULL); + } + else + g_warning ("Should have obtained video_window_xid by now!"); gst_message_unref (message); @@ -896,9 +960,16 @@ if ((caps = gst_pad_get_negotiated_caps (videopad)) != NULL) { GstStructure *structure; + int video_width; + int video_height; structure = gst_caps_get_structure (caps, 0); gst_structure_get_fraction (structure, "framerate", &self->priv->video_fps_n, &self->priv->video_fps_d); + gst_structure_get_int (structure, "width", &video_width); + gst_structure_get_int (structure, "height", &video_height); + + g_file_info_set_attribute_int32 (self->priv->file_data->info, "frame::width", video_width); + g_file_info_set_attribute_int32 (self->priv->file_data->info, "frame::height", video_height); gst_caps_unref (caps); } @@ -934,9 +1005,15 @@ update_current_position_bar (self, TRUE); + if ((old_state == GST_STATE_NULL) && (new_state == GST_STATE_READY) && (pending_state != GST_STATE_PAUSED)) { + update_stream_info (self); + gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (self)); + gth_viewer_page_file_loaded (GTH_VIEWER_PAGE (self), self->priv->file_data, TRUE); + } if ((old_state == GST_STATE_READY) && (new_state == GST_STATE_PAUSED)) { update_stream_info (self); gth_viewer_page_update_sensitivity (GTH_VIEWER_PAGE (self)); + gth_viewer_page_file_loaded (GTH_VIEWER_PAGE (self), self->priv->file_data, TRUE); } if ((old_state == GST_STATE_READY) || (new_state == GST_STATE_PAUSED)) update_volume_from_playbin (self); @@ -961,7 +1038,11 @@ case GST_MESSAGE_BUFFERING: { int percent = 0; gst_message_parse_buffering (message, &percent); - g_print ("Buffering (%%%u percent done)", percent); + /* g_print ("Buffering (%%%u percent done)", percent); */ + break; + + case GST_MESSAGE_ERROR: + gth_viewer_page_file_loaded (GTH_VIEWER_PAGE (self), self->priv->file_data, FALSE); break; } @@ -981,25 +1062,9 @@ static void -gth_media_viewer_page_real_show (GthViewerPage *base) +create_playbin (GthMediaViewerPage *self) { - GthMediaViewerPage *self; - GError *error = NULL; - GstBus *bus; - char *uri; - - self = (GthMediaViewerPage*) base; - - if (self->priv->merge_id != 0) - return; - - self->priv->merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (self->priv->browser), media_viewer_ui_info, -1, &error); - if (self->priv->merge_id == 0) { - g_warning ("ui building failed: %s", error->message); - g_error_free (error); - } - - gth_viewer_page_focus (GTH_VIEWER_PAGE (self)); + GstBus *bus; if (self->priv->playbin != NULL) return; @@ -1013,14 +1078,36 @@ gst_bus_add_signal_watch (bus); g_signal_connect (bus, "message", G_CALLBACK (bus_message_cb), self); - if (self->priv->file_data == NULL) - return; +} - uri = g_file_get_uri (self->priv->file_data->file); - g_object_set (G_OBJECT (self->priv->playbin), "uri", uri, NULL); - gst_element_set_state (self->priv->playbin, GST_STATE_PAUSED); - g_free (uri); +static void +gth_media_viewer_page_real_show (GthViewerPage *base) +{ + GthMediaViewerPage *self = GTH_MEDIA_VIEWER_PAGE (base); + GError *error = NULL; + + self->priv->visible = TRUE; + + if (self->priv->merge_id == 0) { + self->priv->merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (self->priv->browser), media_viewer_ui_info, -1, &error); + if (self->priv->merge_id == 0) { + g_warning ("ui building failed: %s", error->message); + g_error_free (error); + } + } + gth_viewer_page_focus (GTH_VIEWER_PAGE (self)); + + create_playbin (self); + if (self->priv->file_data != NULL) { + char *uri; + + uri = g_file_get_uri (self->priv->file_data->file); + g_object_set (G_OBJECT (self->priv->playbin), "uri", uri, NULL); + gst_element_set_state (self->priv->playbin, GST_STATE_PLAYING); + + g_free (uri); + } } @@ -1031,6 +1118,8 @@ self = (GthMediaViewerPage*) base; + self->priv->visible = FALSE; + if (self->priv->merge_id != 0) { gtk_ui_manager_remove_ui (gth_browser_get_ui_manager (self->priv->browser), self->priv->merge_id); self->priv->merge_id = 0; @@ -1058,7 +1147,7 @@ self->priv->set_to_pause_id = 0; if (self->priv->playbin != NULL) - gst_element_set_state (self->priv->playbin, GST_STATE_PAUSED); + gst_element_set_state (self->priv->playbin, self->priv->visible ? GST_STATE_PLAYING : GST_STATE_READY); return FALSE; } @@ -1102,12 +1191,12 @@ /**/ - gth_viewer_page_file_loaded (GTH_VIEWER_PAGE (self), self->priv->file_data, TRUE); - g_signal_handlers_block_by_func(GET_WIDGET ("adjustment_position"), position_value_changed_cb, self); - gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("adjustment_position")), 0.0); - g_signal_handlers_unblock_by_func(GET_WIDGET ("adjustment_position"), position_value_changed_cb, self); + g_signal_handlers_block_by_func(GET_WIDGET ("position_adjustment"), position_value_changed_cb, self); + gtk_adjustment_set_value (GTK_ADJUSTMENT (GET_WIDGET ("position_adjustment")), 0.0); + g_signal_handlers_unblock_by_func(GET_WIDGET ("position_adjustment"), position_value_changed_cb, self); reset_player_state (self); + create_playbin (self); if (self->priv->playbin == NULL) return; @@ -1214,9 +1303,6 @@ { GthMediaViewerPage *self = (GthMediaViewerPage *) base; - /*gtk_widget_set_sensitive (GET_WIDGET ("button_play_slower"), self->priv->playing); - gtk_widget_set_sensitive (GET_WIDGET ("button_play_faster"), self->priv->playing);*/ - gtk_widget_set_sensitive (GET_WIDGET ("volume_box"), self->priv->has_audio); set_action_sensitive (self, "MediaViewer_Screenshot", self->priv->has_video); } @@ -1269,6 +1355,20 @@ static void +gth_media_viewer_page_real_shrink_wrap (GthViewerPage *base, + gboolean value, + int *other_width, + int *other_height) +{ + GthMediaViewerPage *self = GTH_MEDIA_VIEWER_PAGE (base); + + if (! value || (other_width == NULL) || (other_height == NULL)) + return; + *other_height += _gtk_widget_get_allocated_height (self->priv->mediabar); +} + + +static void gth_media_viewer_page_finalize (GObject *obj) { GthMediaViewerPage *self; @@ -1304,7 +1404,6 @@ static void gth_media_viewer_page_class_init (GthMediaViewerPageClass *klass) { - gth_media_viewer_page_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthMediaViewerPagePrivate)); G_OBJECT_CLASS (klass)->finalize = gth_media_viewer_page_finalize; @@ -1312,7 +1411,7 @@ static void -gth_viewer_page_interface_init (GthViewerPageIface *iface) +gth_viewer_page_interface_init (GthViewerPageInterface *iface) { iface->activate = gth_media_viewer_page_real_activate; iface->deactivate = gth_media_viewer_page_real_deactivate; @@ -1329,15 +1428,17 @@ iface->save_as = gth_media_viewer_page_real_save_as; iface->revert = gth_media_viewer_page_real_revert; iface->update_info = gth_media_viewer_page_real_update_info; + iface->shrink_wrap = gth_media_viewer_page_real_shrink_wrap; } static void -gth_media_viewer_page_instance_init (GthMediaViewerPage *self) +gth_media_viewer_page_init (GthMediaViewerPage *self) { - self->priv = GTH_MEDIA_VIEWER_PAGE_GET_PRIVATE (self); + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_MEDIA_VIEWER_PAGE, GthMediaViewerPagePrivate); self->priv->update_progress_id = 0; self->priv->set_to_pause_id = 0; + self->priv->video_window_xid = 0; self->priv->xwin_assigned = FALSE; self->priv->has_video = FALSE; self->priv->has_audio = FALSE; @@ -1346,34 +1447,7 @@ self->priv->icon = NULL; self->priv->cursor_visible = TRUE; self->priv->screensaver = gth_screensaver_new (NULL); -} - - -GType -gth_media_viewer_page_get_type (void) { - static GType gth_media_viewer_page_type_id = 0; - if (gth_media_viewer_page_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthMediaViewerPageClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_media_viewer_page_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthMediaViewerPage), - 0, - (GInstanceInitFunc) gth_media_viewer_page_instance_init, - NULL - }; - static const GInterfaceInfo gth_viewer_page_info = { - (GInterfaceInitFunc) gth_viewer_page_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - gth_media_viewer_page_type_id = g_type_register_static (G_TYPE_OBJECT, "GthMediaViewerPage", &g_define_type_info, 0); - g_type_add_interface_static (gth_media_viewer_page_type_id, GTH_TYPE_VIEWER_PAGE, >h_viewer_page_info); - } - return gth_media_viewer_page_type_id; + self->priv->visible = FALSE; } diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/gth-metadata-provider-gstreamer.c gthumb-3.0.0/extensions/gstreamer_tools/gth-metadata-provider-gstreamer.c --- gthumb-2.14.3/extensions/gstreamer_tools/gth-metadata-provider-gstreamer.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/gth-metadata-provider-gstreamer.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,7 @@ #include "gth-metadata-provider-gstreamer.h" -static GthMetadataProviderClass *parent_class = NULL; +G_DEFINE_TYPE (GthMetadataProviderGstreamer, gth_metadata_provider_gstreamer, GTH_TYPE_METADATA_PROVIDER) static gboolean @@ -73,36 +73,16 @@ static void gth_metadata_provider_gstreamer_class_init (GthMetadataProviderGstreamerClass *klass) { - parent_class = g_type_class_peek_parent (klass); + GthMetadataProviderClass *metadata_provider_class; - GTH_METADATA_PROVIDER_CLASS (klass)->can_read = gth_metadata_provider_gstreamer_can_read; - GTH_METADATA_PROVIDER_CLASS (klass)->read = gth_metadata_provider_gstreamer_read; + metadata_provider_class = GTH_METADATA_PROVIDER_CLASS (klass); + metadata_provider_class->can_read = gth_metadata_provider_gstreamer_can_read; + metadata_provider_class->read = gth_metadata_provider_gstreamer_read; } -GType -gth_metadata_provider_gstreamer_get_type (void) +static void +gth_metadata_provider_gstreamer_init (GthMetadataProviderGstreamer *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthMetadataProviderGstreamerClass), - NULL, - NULL, - (GClassInitFunc) gth_metadata_provider_gstreamer_class_init, - NULL, - NULL, - sizeof (GthMetadataProviderGstreamer), - 0, - (GInstanceInitFunc) NULL - }; - - type = g_type_register_static (GTH_TYPE_METADATA_PROVIDER, - "GthMetadataProviderGstreamer", - &type_info, - 0); - } - - return type; + /* void */ } diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/Makefile.in gthumb-3.0.0/extensions/gstreamer_tools/Makefile.in --- gthumb-2.14.3/extensions/gstreamer_tools/Makefile.in 2012-03-25 18:34:11.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -134,6 +151,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -213,10 +235,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -224,6 +244,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -263,6 +284,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -311,8 +334,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -343,6 +364,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -431,7 +453,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -439,6 +460,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -530,8 +553,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -714,13 +740,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/gstreamer_tools/preferences.h gthumb-3.0.0/extensions/gstreamer_tools/preferences.h --- gthumb-2.14.3/extensions/gstreamer_tools/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_tools/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -22,6 +22,12 @@ #ifndef PREFERENCES_H #define PREFERENCES_H -#define PREF_GSTREAMER_SCREESHOT_LOCATION "/apps/gthumb/ext/gstreamer/screenshot_location" +/* schema */ + +#define GTHUMB_GSTREAMER_TOOLS_SCHEMA GTHUMB_SCHEMA ".gstreamer-tools" + +/* keys */ + +#define PREF_GSTREAMER_TOOLS_SCREESHOT_LOCATION "screenshot-location" #endif /* PREFERENCES_H */ diff -Nru gthumb-2.14.3/extensions/gstreamer_utils/gstreamer_utils.extension.in.in gthumb-3.0.0/extensions/gstreamer_utils/gstreamer_utils.extension.in.in --- gthumb-2.14.3/extensions/gstreamer_utils/gstreamer_utils.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_utils/gstreamer_utils.extension.in.in 2012-04-21 09:24:55.000000000 +0000 @@ -4,3 +4,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/gstreamer_utils/Makefile.in gthumb-3.0.0/extensions/gstreamer_utils/Makefile.in --- gthumb-2.14.3/extensions/gstreamer_utils/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/gstreamer_utils/Makefile.in 2012-04-23 18:09:47.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -123,6 +140,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libgstreamer_utils_la_SOURCES) DIST_SOURCES = $(am__libgstreamer_utils_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) ETAGS = etags CTAGS = ctags @@ -171,10 +193,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -182,6 +202,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -221,6 +242,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -269,8 +292,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -301,6 +322,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -385,7 +407,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -393,6 +414,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -476,8 +499,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/image_print/callbacks.c gthumb-3.0.0/extensions/image_print/callbacks.c --- gthumb-2.14.3/extensions/image_print/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/callbacks.c 2012-02-19 15:01:32.000000000 +0000 @@ -48,10 +48,11 @@ ""; -static GtkActionEntry action_entries[] = { +static GthActionEntryExt action_entries[] = { { "File_Print", GTK_STOCK_PRINT, NULL, "P", N_("Print the selected images"), + GTH_ACTION_FLAG_IS_IMPORTANT, G_CALLBACK (gth_browser_activate_action_file_print) }, }; @@ -81,10 +82,10 @@ data->action_group = gtk_action_group_new ("Image Print Actions"); gtk_action_group_set_translation_domain (data->action_group, NULL); - gtk_action_group_add_actions (data->action_group, - action_entries, - G_N_ELEMENTS (action_entries), - browser); + _gtk_action_group_add_actions_with_flags (data->action_group, + action_entries, + G_N_ELEMENTS (action_entries), + browser); gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->action_group, 0); data->fixed_merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), fixed_ui_info, -1, &error); @@ -92,7 +93,6 @@ g_warning ("building ui failed: %s", error->message); g_error_free (error); } - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ToolBar/Export_Actions/File_Print")), TRUE); g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } diff -Nru gthumb-2.14.3/extensions/image_print/data/gthumb_image_print.schemas.in gthumb-3.0.0/extensions/image_print/data/gthumb_image_print.schemas.in --- gthumb-2.14.3/extensions/image_print/data/gthumb_image_print.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/data/gthumb_image_print.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,122 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/image_print/caption - /apps/gthumb/ext/image_print/caption - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/image_print/font_name - /apps/gthumb/ext/image_print/font_name - gthumb - string - sans normal 12 - - - - - - - - - /schemas/apps/gthumb/ext/image_print/header_font_name - /apps/gthumb/ext/image_print/header_font_name - gthumb - string - sans bold 12 - - - - - - - - - /schemas/apps/gthumb/ext/image_print/footer_font_name - /apps/gthumb/ext/image_print/footer_font_name - gthumb - string - sans normal 8 - - - - - - - - - /schemas/apps/gthumb/ext/image_print/header - /apps/gthumb/ext/image_print/header - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/image_print/footer - /apps/gthumb/ext/image_print/footer - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/image_print/n_rows - /apps/gthumb/ext/image_print/n_rows - gthumb - int - 1 - - - - - - - - - /schemas/apps/gthumb/ext/image_print/n_columns - /apps/gthumb/ext/image_print/n_columns - gthumb - int - 1 - - - - - - - - - /schemas/apps/gthumb/ext/image_print/unit - /apps/gthumb/ext/image_print/unit - gthumb - string - pixels - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/image_print/data/Makefile.am gthumb-3.0.0/extensions/image_print/data/Makefile.am --- gthumb-2.14.3/extensions/image_print/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_image_print.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/image_print/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/image_print/data/Makefile.in gthumb-3.0.0/extensions/image_print/data/Makefile.in --- gthumb-2.14.3/extensions/image_print/data/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/data/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_image_print.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/image_print/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/image_print/data/ui/Makefile.in gthumb-3.0.0/extensions/image_print/data/ui/Makefile.in --- gthumb-2.14.3/extensions/image_print/data/ui/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/data/ui/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/image_print/data/ui/print-layout.ui gthumb-3.0.0/extensions/image_print/data/ui/print-layout.ui --- gthumb-2.14.3/extensions/image_print/data/ui/print-layout.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/data/ui/print-layout.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,24 +1,6 @@ - + - - - - - - - - - pixels - - - millimeters - - - inches - - - @@ -37,51 +19,63 @@ - + + 1 + 100 + 1 + 1 + 10 + + + 100 + 1 + 10 + + + 100 + 1 + 10 + + - + - + - 1 - 1 - - - 2 - 2 - - - 4 - 3 + 0° + 0 - 8 - 4 + 90° + 90 - 16 - 5 + 180° + 180 - 32 - 6 + 270° + 270 True + False 12 24 True + False 12 True + False 3 2 6 @@ -89,6 +83,7 @@ True + False 0 _Header: True @@ -96,11 +91,13 @@ GTK_FILL + GTK_FILL True + False 0 _Footer: True @@ -110,31 +107,29 @@ 1 2 GTK_FILL + GTK_FILL True True - + gtk-help - True - True Help 1 2 + GTK_FILL True True - + gtk-help - True - True Help @@ -142,13 +137,12 @@ 2 1 2 + GTK_FILL - - - + False 6 2 12 @@ -156,6 +150,7 @@ True + False 0 0.49000000953674316 %p @@ -166,11 +161,13 @@ 1 2 + GTK_FILL True + False 0 %P @@ -180,11 +177,13 @@ 2 3 + GTK_FILL True + False 0 The current page number @@ -196,11 +195,13 @@ 2 1 2 + GTK_FILL True + False 0 The total number of pages @@ -212,11 +213,13 @@ 2 2 3 + GTK_FILL True + False 0 Special code @@ -224,10 +227,14 @@ + + GTK_FILL + True + False 0 Description @@ -238,11 +245,13 @@ 1 2 + GTK_FILL True + False 0 %D{ format } @@ -252,11 +261,13 @@ 3 4 + GTK_FILL True + False 0 The current date @@ -268,11 +279,13 @@ 2 3 4 + GTK_FILL True + False 0 %F @@ -282,11 +295,13 @@ 4 5 + GTK_FILL True + False 0 %E @@ -296,11 +311,13 @@ 5 6 + GTK_FILL True + False 0 The total number of files @@ -312,11 +329,13 @@ 2 4 5 + GTK_FILL True + False 0 The event description @@ -328,6 +347,7 @@ 2 5 6 + GTK_FILL @@ -339,23 +359,30 @@ GTK_FILL + + + False + True 0 True + False 6 True + False 6 True + False 0 Layout True @@ -365,25 +392,31 @@ False + True 0 + False + True 0 True + False 12 True + False 6 True + False 2 2 6 @@ -392,7 +425,7 @@ True True - + 6 columns_adjustment 1 @@ -403,13 +436,14 @@ 1 2 GTK_FILL + GTK_FILL True True - + 6 rows_adjustment 1 @@ -418,11 +452,13 @@ 1 2 GTK_FILL + GTK_FILL True + False 0 Columns: True @@ -431,21 +467,26 @@ 1 2 GTK_FILL + GTK_FILL True + False 0 _Rows: True GTK_FILL + GTK_FILL + False + True 0 @@ -453,22 +494,27 @@ + False + True 1 False + True 1 True + False 6 True + False 0 Caption @@ -477,16 +523,19 @@ False + True 0 True + False 12 True + False 6 @@ -494,14 +543,14 @@ 150 True True - automatic - automatic in + True + True 0 @@ -509,25 +558,32 @@ + True + True 1 + True + True 2 True + False 6 True + False 6 True + False 0 Image True @@ -537,25 +593,31 @@ False + True 0 + False + True 0 True + False 12 True + False 6 True + False 4 2 6 @@ -563,26 +625,33 @@ True + False 0 Position: + + GTK_FILL + GTK_FILL + True + False 6 True True Left - + 6 left_adjustment 1 False + True 0 @@ -591,19 +660,21 @@ True True Top - + 6 top_adjustment 1 False + True 1 True + False align_liststore 0 @@ -614,6 +685,8 @@ + True + True 2 @@ -621,35 +694,41 @@ 1 2 + GTK_FILL True + False 0 Size: 1 2 + GTK_FILL + GTK_FILL True + False 6 True True Width - + 6 width_adjustment 1 False + True 0 @@ -658,13 +737,14 @@ True True Height - + 6 height_adjustment 1 False + True 1 @@ -677,6 +757,8 @@ right + True + True 2 @@ -686,14 +768,17 @@ 2 1 2 + GTK_FILL True + False True + False rotation_liststore 0 @@ -705,6 +790,7 @@ False + True 0 @@ -714,11 +800,13 @@ 2 2 3 + GTK_FILL True + False 0 Rotation: True @@ -726,18 +814,23 @@ 2 3 + GTK_FILL + GTK_FILL True + False 12 True + False True + False unit_liststore 0 @@ -749,6 +842,7 @@ False + True 0 @@ -760,15 +854,18 @@ 2 3 4 + GTK_FILL True + False 12 True + False 0 Unit: @@ -777,10 +874,14 @@ 3 4 + GTK_FILL + GTK_FILL + False + True 0 @@ -788,30 +889,37 @@ + False + True 1 False + True 3 False + True 0 True + False 6 True + False + False 0 Preview @@ -820,39 +928,49 @@ False + True 0 True + False True + False True + False 6 True + False 0 + True + True 0 - + + False True False True True + False none - + True - gtk-go-back + False + gtk-go-forward @@ -860,20 +978,23 @@ False False end - 2 + 1 - + + False True False True True + False none - + True - gtk-go-forward + False + gtk-go-back @@ -881,30 +1002,36 @@ False False end - 1 + 2 False + True 0 True + False True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK + True False 0 + False + True 1 @@ -912,85 +1039,97 @@ + False + True 1 False + True 0 + True False 1 - + + 1 + 100 1 + 1 + 10 + + 0.01 1 + 1 0.10000000000000001 0.10000000000000001 - + - + - + - 0° - 0 + 1 + 1 - 90° - 90 + 2 + 2 - 180° - 180 + 4 + 3 - 270° - 270 + 8 + 4 + + + 16 + 5 + + + 32 + 6 - - 100 - 1 - 10 - - - 100 - 1 - 10 - - - 100 - 1 - 10 - 100 1 10 - - 1 - 1 - 100 - 1 - 10 + + + + + + + + pixels + + + millimeters + + + inches + + - - 1 - 1 + 100 1 10 diff -Nru gthumb-2.14.3/extensions/image_print/data/ui/print-preferences.ui gthumb-3.0.0/extensions/image_print/data/ui/print-preferences.ui --- gthumb-2.14.3/extensions/image_print/data/ui/print-preferences.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/data/ui/print-preferences.ui 2012-03-31 09:42:32.000000000 +0000 @@ -1,171 +1,161 @@ - + - - - - - - - - - - - - + True + False 12 - 12 + 0 + none - + True - 6 + False + 6 + 12 - + True - 6 - - - True - 0 - Fonts - - - - - - 0 - - + False + vertical - + True - 12 + False + 6 + 6 + + + True + False + 0 + Caption: + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + _Header: + True + header_fontbutton + + + 0 + 1 + 1 + 1 + + - + True - - - True - 3 - 2 - 6 - 6 - - - True - 0 - Caption: - True - caption_fontbutton - - - GTK_FILL - - - - - True - True - True - Select Caption Font - True - True - - - 1 - 2 - GTK_FILL - - - - - True - 0 - _Header: - True - header_fontbutton - - - 1 - 2 - GTK_FILL - - - - - True - 0 - _Footer: - True - footer_fontbutton - - - 2 - 3 - GTK_FILL - - - - - True - True - True - Select Header Font - Sans Bold 12 - True - True - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - True - True - True - Select Footer Font - Sans 8 - True - True - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - False - 0 - - + False + 0 + _Footer: + True + footer_fontbutton + + 0 + 2 + 1 + 1 + + + + + False + True + True + True + False + Sans 12 + + False + Select Caption Font + True + True + + + 1 + 0 + 1 + 1 + + + + + False + True + True + True + False + Sans 12 + + False + Select Header Font + Sans Bold 12 + True + True + + + 1 + 1 + 1 + 1 + + + + + False + True + True + True + False + Sans 12 + + False + Select Footer Font + Sans 8 + True + True + + + 1 + 2 + 1 + 1 + - 1 + False + True + 0 - - False - 0 - - - 0 - + + + + True + False + Fonts + True + + + + - diff -Nru gthumb-2.14.3/extensions/image_print/gth-image-print-job.c gthumb-3.0.0/extensions/image_print/gth-image-print-job.c --- gthumb-2.14.3/extensions/image_print/gth-image-print-job.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/gth-image-print-job.c 2012-02-19 15:01:32.000000000 +0000 @@ -33,10 +33,11 @@ #define GET_WIDGET(name) _gtk_builder_get_widget (self->priv->builder, (name)) -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthImagePrintJob, gth_image_print_job, G_TYPE_OBJECT) struct _GthImagePrintJobPrivate { + GSettings *settings; GtkPrintOperationAction action; GthBrowser *browser; GtkPrintOperation *print_operation; @@ -113,8 +114,9 @@ _g_object_unref (self->priv->print_operation); _g_object_unref (self->priv->builder); g_free (self->priv->event_name); + _g_object_unref (self->priv->settings); - G_OBJECT_CLASS (parent_class)->finalize (base); + G_OBJECT_CLASS (gth_image_print_job_parent_class)->finalize (base); } @@ -123,7 +125,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthImagePrintJobPrivate)); object_class = (GObjectClass*) klass; @@ -135,57 +136,30 @@ gth_image_print_job_init (GthImagePrintJob *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_PRINT_JOB, GthImagePrintJobPrivate); + self->priv->settings = g_settings_new (GTHUMB_IMAGE_PRINT_SCHEMA); self->priv->event_name = NULL; self->priv->builder = NULL; self->priv->task = NULL; self->priv->page_setup = NULL; self->priv->current_page = 0; - self->priv->caption_attributes = eel_gconf_get_string (PREF_IMAGE_PRINT_CAPTION, ""); - self->priv->caption_font_name = eel_gconf_get_string (PREF_IMAGE_PRINT_FONT_NAME, DEFAULT_CAPTION_FONT_NAME); - self->priv->header_font_name = eel_gconf_get_string (PREF_IMAGE_PRINT_HEADER_FONT_NAME, DEFAULT_HEADER_FONT_NAME); - self->priv->footer_font_name = eel_gconf_get_string (PREF_IMAGE_PRINT_FOOTER_FONT_NAME, DEFAULT_FOOTER_FONT_NAME); + self->priv->caption_attributes = g_settings_get_string (self->priv->settings, PREF_IMAGE_PRINT_CAPTION); + self->priv->caption_font_name = g_settings_get_string (self->priv->settings, PREF_IMAGE_PRINT_FONT_NAME); + self->priv->header_font_name = g_settings_get_string (self->priv->settings, PREF_IMAGE_PRINT_HEADER_FONT_NAME); + self->priv->footer_font_name = g_settings_get_string (self->priv->settings, PREF_IMAGE_PRINT_FOOTER_FONT_NAME); self->priv->selected = NULL; - self->priv->n_rows = eel_gconf_get_integer (PREF_IMAGE_PRINT_N_ROWS, 1); - self->priv->n_columns = eel_gconf_get_integer (PREF_IMAGE_PRINT_N_COLUMNS, 1); - self->priv->unit = eel_gconf_get_enum (PREF_IMAGE_PRINT_UNIT, GTH_TYPE_METRIC, GTH_METRIC_PIXELS); + self->priv->n_rows = g_settings_get_int (self->priv->settings, PREF_IMAGE_PRINT_N_ROWS); + self->priv->n_columns = g_settings_get_int (self->priv->settings, PREF_IMAGE_PRINT_N_COLUMNS); + self->priv->unit = g_settings_get_enum (self->priv->settings, PREF_IMAGE_PRINT_UNIT); self->priv->header_rectangle.height = 0; self->priv->footer_rectangle.height = 0; - self->priv->header_template = eel_gconf_get_string (PREF_IMAGE_PRINT_HEADER, DEFAULT_HEADER); - self->priv->footer_template = eel_gconf_get_string (PREF_IMAGE_PRINT_FOOTER, DEFAULT_FOOTER); + self->priv->header_template = g_settings_get_string (self->priv->settings, PREF_IMAGE_PRINT_HEADER); + self->priv->footer_template = g_settings_get_string (self->priv->settings, PREF_IMAGE_PRINT_FOOTER); self->priv->header = NULL; self->priv->footer = NULL; self->priv->printing = FALSE; } -GType -gth_image_print_job_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthImagePrintJobClass), - NULL, - NULL, - (GClassInitFunc) gth_image_print_job_class_init, - NULL, - NULL, - sizeof (GthImagePrintJob), - 0, - (GInstanceInitFunc) gth_image_print_job_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthImagePrintJob", - &type_info, - 0); - } - - return type; -} - - static double get_text_height (GthImagePrintJob *self, PangoLayout *pango_layout, @@ -1029,20 +1003,17 @@ } -static void -preview_expose_event_cb (GtkWidget *widget, - GdkEventExpose *event, - gpointer user_data) +static gboolean +preview_draw_cb (GtkWidget *widget, + cairo_t *cr, + gpointer user_data) { GthImagePrintJob *self = user_data; - cairo_t *cr; GtkAllocation allocation; PangoLayout *pango_layout; - g_return_if_fail (GTH_IS_IMAGE_PRINT_JOB (self)); - g_return_if_fail ((self->priv->page_setup != NULL) && GTK_IS_PAGE_SETUP (self->priv->page_setup)); - - cr = gdk_cairo_create (gtk_widget_get_window (widget)); + g_return_val_if_fail (GTH_IS_IMAGE_PRINT_JOB (self), FALSE); + g_return_val_if_fail ((self->priv->page_setup != NULL) && GTK_IS_PAGE_SETUP (self->priv->page_setup), FALSE); /* paint the paper */ @@ -1065,7 +1036,8 @@ TRUE); g_object_unref (pango_layout); - cairo_destroy (cr); + + return TRUE; } @@ -1269,7 +1241,7 @@ reload_required = attribute_list_reload_required (self->priv->caption_attributes, new_caption_attributes); g_free (self->priv->caption_attributes); self->priv->caption_attributes = new_caption_attributes; - eel_gconf_set_string (PREF_IMAGE_PRINT_CAPTION, self->priv->caption_attributes); + g_settings_set_string (self->priv->settings, PREF_IMAGE_PRINT_CAPTION, self->priv->caption_attributes); if (reload_required) gth_image_print_job_load_metadata (self); @@ -1514,11 +1486,12 @@ gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("rows_spinbutton")), self->priv->n_rows); gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("columns_spinbutton")), self->priv->n_columns); - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("unit_combobox")), eel_gconf_get_enum (PREF_IMAGE_PRINT_UNIT, GTH_TYPE_METRIC, GTH_METRIC_PIXELS)); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("unit_combobox")), + g_settings_get_enum (self->priv->settings, PREF_IMAGE_PRINT_UNIT)); g_signal_connect (GET_WIDGET ("preview_drawingarea"), - "expose_event", - G_CALLBACK (preview_expose_event_cb), + "draw", + G_CALLBACK (preview_draw_cb), self); g_signal_connect (GET_WIDGET ("preview_drawingarea"), "motion-notify-event", @@ -1665,11 +1638,11 @@ { GthImagePrintJob *self = user_data; - eel_gconf_set_integer (PREF_IMAGE_PRINT_N_ROWS, self->priv->n_rows); - eel_gconf_set_integer (PREF_IMAGE_PRINT_N_COLUMNS, self->priv->n_columns); - eel_gconf_set_enum (PREF_IMAGE_PRINT_UNIT, GTH_TYPE_METRIC, gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("unit_combobox")))); - eel_gconf_set_string (PREF_IMAGE_PRINT_HEADER, gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("header_entry")))); - eel_gconf_set_string (PREF_IMAGE_PRINT_FOOTER, gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("footer_entry")))); + g_settings_set_int (self->priv->settings, PREF_IMAGE_PRINT_N_ROWS, self->priv->n_rows); + g_settings_set_int (self->priv->settings, PREF_IMAGE_PRINT_N_COLUMNS, self->priv->n_columns); + g_settings_set_enum (self->priv->settings, PREF_IMAGE_PRINT_UNIT, gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("unit_combobox")))); + g_settings_set_string (self->priv->settings, PREF_IMAGE_PRINT_HEADER, gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("header_entry")))); + g_settings_set_string (self->priv->settings, PREF_IMAGE_PRINT_FOOTER, gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("footer_entry")))); } diff -Nru gthumb-2.14.3/extensions/image_print/gth-load-image-info-task.c gthumb-3.0.0/extensions/image_print/gth-load-image-info-task.c --- gthumb-2.14.3/extensions/image_print/gth-load-image-info-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/gth-load-image-info-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -32,7 +32,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthLoadImageInfoTask, gth_load_image_info_task, GTH_TYPE_TASK) static void @@ -49,7 +49,7 @@ g_free (self->priv->attributes); g_object_unref (self->priv->loader); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_load_image_info_task_parent_class)->finalize (object); } @@ -209,7 +209,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthLoadImageInfoTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -229,34 +228,6 @@ } -GType -gth_load_image_info_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthLoadImageInfoTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_load_image_info_task_class_init, - NULL, - NULL, - sizeof (GthLoadImageInfoTask), - 0, - (GInstanceInitFunc) gth_load_image_info_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthLoadImageInfoTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_load_image_info_task_new (GthImageInfo **images, int n_images, diff -Nru gthumb-2.14.3/extensions/image_print/image_print.extension.in.in gthumb-3.0.0/extensions/image_print/image_print.extension.in.in --- gthumb-2.14.3/extensions/image_print/image_print.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/image_print.extension.in.in 2012-04-21 09:24:48.000000000 +0000 @@ -10,3 +10,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/image_print/Makefile.in gthumb-3.0.0/extensions/image_print/Makefile.in --- gthumb-2.14.3/extensions/image_print/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -129,6 +146,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -208,10 +230,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -219,6 +239,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -258,6 +279,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -306,8 +329,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -338,6 +359,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -431,7 +453,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -439,6 +460,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -554,8 +577,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -738,13 +764,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/image_print/preferences.c gthumb-3.0.0/extensions/image_print/preferences.c --- gthumb-2.14.3/extensions/image_print/preferences.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/preferences.c 2012-02-19 15:01:32.000000000 +0000 @@ -31,6 +31,7 @@ typedef struct { GtkBuilder *builder; + GSettings *settings; } BrowserData; @@ -38,6 +39,7 @@ browser_data_free (BrowserData *data) { g_object_unref (data->builder); + g_object_unref (data->settings); g_free (data); } @@ -55,21 +57,22 @@ data = g_new0 (BrowserData, 1); data->builder = _gtk_builder_new_from_file ("print-preferences.ui", "image_print"); + data->settings = g_settings_new (GTHUMB_IMAGE_PRINT_SCHEMA); notebook = _gtk_builder_get_widget (dialog_builder, "notebook"); page = _gtk_builder_get_widget (data->builder, "preferences_page"); gtk_widget_show (page); - font_name = eel_gconf_get_string (PREF_IMAGE_PRINT_FONT_NAME, DEFAULT_CAPTION_FONT_NAME); + font_name = g_settings_get_string (data->settings, PREF_IMAGE_PRINT_FONT_NAME); gtk_font_button_set_font_name (GTK_FONT_BUTTON (GET_WIDGET ("caption_fontbutton")), font_name); g_free (font_name); - font_name = eel_gconf_get_string (PREF_IMAGE_PRINT_HEADER_FONT_NAME, DEFAULT_HEADER_FONT_NAME); + font_name = g_settings_get_string (data->settings, PREF_IMAGE_PRINT_HEADER_FONT_NAME); gtk_font_button_set_font_name (GTK_FONT_BUTTON (GET_WIDGET ("header_fontbutton")), font_name); g_free (font_name); - font_name = eel_gconf_get_string (PREF_IMAGE_PRINT_FOOTER_FONT_NAME, DEFAULT_FOOTER_FONT_NAME); + font_name = g_settings_get_string (data->settings, PREF_IMAGE_PRINT_FOOTER_FONT_NAME); gtk_font_button_set_font_name (GTK_FONT_BUTTON (GET_WIDGET ("footer_fontbutton")), font_name); g_free (font_name); @@ -91,7 +94,7 @@ data = g_object_get_data (G_OBJECT (dialog), BROWSER_DATA_KEY); g_return_if_fail (data != NULL); - eel_gconf_set_string (PREF_IMAGE_PRINT_FONT_NAME, gtk_font_button_get_font_name (GTK_FONT_BUTTON (GET_WIDGET ("caption_fontbutton")))); - eel_gconf_set_string (PREF_IMAGE_PRINT_HEADER_FONT_NAME, gtk_font_button_get_font_name (GTK_FONT_BUTTON (GET_WIDGET ("header_fontbutton")))); - eel_gconf_set_string (PREF_IMAGE_PRINT_FOOTER_FONT_NAME, gtk_font_button_get_font_name (GTK_FONT_BUTTON (GET_WIDGET ("footer_fontbutton")))); + g_settings_set_string (data->settings, PREF_IMAGE_PRINT_FONT_NAME, gtk_font_button_get_font_name (GTK_FONT_BUTTON (GET_WIDGET ("caption_fontbutton")))); + g_settings_set_string (data->settings, PREF_IMAGE_PRINT_HEADER_FONT_NAME, gtk_font_button_get_font_name (GTK_FONT_BUTTON (GET_WIDGET ("header_fontbutton")))); + g_settings_set_string (data->settings, PREF_IMAGE_PRINT_FOOTER_FONT_NAME, gtk_font_button_get_font_name (GTK_FONT_BUTTON (GET_WIDGET ("footer_fontbutton")))); } diff -Nru gthumb-2.14.3/extensions/image_print/preferences.h gthumb-3.0.0/extensions/image_print/preferences.h --- gthumb-2.14.3/extensions/image_print/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_print/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -26,21 +26,22 @@ G_BEGIN_DECLS -#define PREF_IMAGE_PRINT_CAPTION "/apps/gthumb/ext/image_print/caption" -#define PREF_IMAGE_PRINT_FONT_NAME "/apps/gthumb/ext/image_print/font_name" -#define PREF_IMAGE_PRINT_HEADER_FONT_NAME "/apps/gthumb/ext/image_print/header_font_name" -#define PREF_IMAGE_PRINT_FOOTER_FONT_NAME "/apps/gthumb/ext/image_print/footer_font_name" -#define PREF_IMAGE_PRINT_HEADER "/apps/gthumb/ext/image_print/header" -#define PREF_IMAGE_PRINT_FOOTER "/apps/gthumb/ext/image_print/footer" -#define PREF_IMAGE_PRINT_N_ROWS "/apps/gthumb/ext/image_print/n_rows" -#define PREF_IMAGE_PRINT_N_COLUMNS "/apps/gthumb/ext/image_print/n_columns" -#define PREF_IMAGE_PRINT_UNIT "/apps/gthumb/ext/image_print/unit" - -#define DEFAULT_CAPTION_FONT_NAME "sans normal 10" -#define DEFAULT_HEADER_FONT_NAME "sans bold 12" -#define DEFAULT_FOOTER_FONT_NAME "sans normal 8" -#define DEFAULT_HEADER "" -#define DEFAULT_FOOTER "" +/* schemas */ + +#define GTHUMB_IMAGE_PRINT_SCHEMA GTHUMB_SCHEMA ".image-print" + +/* keys */ + +#define PREF_IMAGE_PRINT_CAPTION "caption" +#define PREF_IMAGE_PRINT_FONT_NAME "font-name" +#define PREF_IMAGE_PRINT_HEADER_FONT_NAME "header-font-name" +#define PREF_IMAGE_PRINT_FOOTER_FONT_NAME "footer-font-name" +#define PREF_IMAGE_PRINT_HEADER "header" +#define PREF_IMAGE_PRINT_FOOTER "footer" +#define PREF_IMAGE_PRINT_N_ROWS "n-rows" +#define PREF_IMAGE_PRINT_N_COLUMNS "n-columns" +#define PREF_IMAGE_PRINT_UNIT "unit" + void ip__dlg_preferences_construct_cb (GtkWidget *dialog, GthBrowser *browser, diff -Nru gthumb-2.14.3/extensions/image_rotation/callbacks.c gthumb-3.0.0/extensions/image_rotation/callbacks.c --- gthumb-2.14.3/extensions/image_rotation/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_rotation/callbacks.c 2012-02-19 15:01:32.000000000 +0000 @@ -44,25 +44,29 @@ ""; -static GtkActionEntry action_entries[] = { +static GthActionEntryExt action_entries[] = { { "Tool_RotateRight", "object-rotate-right", N_("Rotate Right"), "R", N_("Rotate the selected images 90° to the right"), + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, G_CALLBACK (gth_browser_activate_action_tool_rotate_right) }, { "Tool_RotateLeft", "object-rotate-left", N_("Rotate Left"), "L", N_("Rotate the selected images 90° to the left"), + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, G_CALLBACK (gth_browser_activate_action_tool_rotate_left) }, { "Tool_ApplyOrientation", NULL, N_("Rotate Physically"), NULL, N_("Rotate the selected images according to the embedded orientation"), + 0, G_CALLBACK (gth_browser_activate_action_tool_apply_orientation) }, { "Tool_ResetOrientation", NULL, N_("Reset the EXIF Orientation"), NULL, N_("Reset the embedded orientation without rotating the images"), + 0, G_CALLBACK (gth_browser_activate_action_tool_reset_orientation) } }; @@ -90,10 +94,10 @@ data = g_new0 (BrowserData, 1); data->action_group = gtk_action_group_new ("Image Rotation Actions"); gtk_action_group_set_translation_domain (data->action_group, NULL); - gtk_action_group_add_actions (data->action_group, - action_entries, - G_N_ELEMENTS (action_entries), - browser); + _gtk_action_group_add_actions_with_flags (data->action_group, + action_entries, + G_N_ELEMENTS (action_entries), + browser); gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->action_group, 0); if (! gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), fixed_ui_info, -1, &error)) { @@ -101,9 +105,6 @@ g_clear_error (&error); } - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ListToolsPopup/Tools/RotateRight")), TRUE); - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ListToolsPopup/Tools/RotateLeft")), TRUE); - g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } @@ -143,12 +144,12 @@ gpointer result = NULL; switch (event->keyval) { - case GDK_bracketright: + case GDK_KEY_bracketright: gth_browser_activate_action_tool_rotate_right (NULL, browser); result = GINT_TO_POINTER (1); break; - case GDK_bracketleft: + case GDK_KEY_bracketleft: gth_browser_activate_action_tool_rotate_left (NULL, browser); result = GINT_TO_POINTER (1); break; diff -Nru gthumb-2.14.3/extensions/image_rotation/gth-reset-orientation-task.c gthumb-3.0.0/extensions/image_rotation/gth-reset-orientation-task.c --- gthumb-2.14.3/extensions/image_rotation/gth-reset-orientation-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_rotation/gth-reset-orientation-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -23,6 +23,9 @@ #include "gth-reset-orientation-task.h" +G_DEFINE_TYPE (GthResetOrientationTask, gth_reset_orientation_task, GTH_TYPE_TASK) + + struct _GthResetOrientationTaskPrivate { GthBrowser *browser; GList *file_list; @@ -33,9 +36,6 @@ }; -static gpointer parent_class = NULL; - - static void gth_reset_orientation_task_finalize (GObject *object) { @@ -46,7 +46,7 @@ _g_object_unref (self->priv->file_data); _g_object_list_unref (self->priv->file_list); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_reset_orientation_task_parent_class)->finalize (object); } @@ -173,7 +173,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthResetOrientationTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -192,34 +191,6 @@ } -GType -gth_reset_orientation_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthResetOrientationTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_reset_orientation_task_class_init, - NULL, - NULL, - sizeof (GthResetOrientationTask), - 0, - (GInstanceInitFunc) gth_reset_orientation_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthResetOrientationTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_reset_orientation_task_new (GthBrowser *browser, GList *file_list) diff -Nru gthumb-2.14.3/extensions/image_rotation/gth-transform-task.c gthumb-3.0.0/extensions/image_rotation/gth-transform-task.c --- gthumb-2.14.3/extensions/image_rotation/gth-transform-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_rotation/gth-transform-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -24,6 +24,9 @@ #include "rotation-utils.h" +G_DEFINE_TYPE (GthTransformTask, gth_transform_task, GTH_TYPE_TASK) + + struct _GthTransformTaskPrivate { GthBrowser *browser; GList *file_list; @@ -36,9 +39,6 @@ }; -static gpointer parent_class = NULL; - - static void gth_transform_task_finalize (GObject *object) { @@ -49,7 +49,7 @@ _g_object_unref (self->priv->file_data); _g_object_list_unref (self->priv->file_list); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_transform_task_parent_class)->finalize (object); } @@ -198,7 +198,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthTransformTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -213,39 +212,11 @@ gth_transform_task_init (GthTransformTask *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TRANSFORM_TASK, GthTransformTaskPrivate); - self->priv->default_action = JPEG_MCU_ACTION_ABORT; /* FIXME: save a gconf value for this */ + self->priv->default_action = JPEG_MCU_ACTION_ABORT; self->priv->file_data = NULL; } -GType -gth_transform_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTransformTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_transform_task_class_init, - NULL, - NULL, - sizeof (GthTransformTask), - 0, - (GInstanceInitFunc) gth_transform_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthTransformTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_transform_task_new (GthBrowser *browser, GList *file_list, diff -Nru gthumb-2.14.3/extensions/image_rotation/image_rotation.extension.in.in gthumb-3.0.0/extensions/image_rotation/image_rotation.extension.in.in --- gthumb-2.14.3/extensions/image_rotation/image_rotation.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_rotation/image_rotation.extension.in.in 2012-04-21 09:24:45.000000000 +0000 @@ -9,4 +9,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=jpeg_utils diff -Nru gthumb-2.14.3/extensions/image_rotation/Makefile.am gthumb-3.0.0/extensions/image_rotation/Makefile.am --- gthumb-2.14.3/extensions/image_rotation/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_rotation/Makefile.am 2012-04-20 20:54:14.000000000 +0000 @@ -1,3 +1,5 @@ +if ENABLE_JPEG_TOOLS + extensiondir = $(pkglibdir)/extensions extension_LTLIBRARIES = libimage_rotation.la @@ -23,12 +25,13 @@ extensioninidir = $(extensiondir) extensionini_in_files = image_rotation.extension.in.in extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) +DISTCLEANFILES = $(extensionini_DATA) + +endif @GTHUMB_EXTENSION_IN_RULE@ @GTHUMB_EXTENSION_RULE@ EXTRA_DIST = $(extensionini_in_files) -DISTCLEANFILES = $(extensionini_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/image_rotation/Makefile.in gthumb-3.0.0/extensions/image_rotation/Makefile.in --- gthumb-2.14.3/extensions/image_rotation/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/image_rotation/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -80,12 +97,17 @@ "$(DESTDIR)$(extensioninidir)" LTLIBRARIES = $(extension_LTLIBRARIES) am__DEPENDENCIES_1 = -am_libimage_rotation_la_OBJECTS = libimage_rotation_la-actions.lo \ - libimage_rotation_la-callbacks.lo \ - libimage_rotation_la-gth-reset-orientation-task.lo \ - libimage_rotation_la-gth-transform-task.lo \ - libimage_rotation_la-main.lo \ - libimage_rotation_la-rotation-utils.lo +am__libimage_rotation_la_SOURCES_DIST = actions.c actions.h \ + callbacks.c callbacks.h gth-reset-orientation-task.c \ + gth-reset-orientation-task.h gth-transform-task.c \ + gth-transform-task.h main.c rotation-utils.c rotation-utils.h +@ENABLE_JPEG_TOOLS_TRUE@am_libimage_rotation_la_OBJECTS = \ +@ENABLE_JPEG_TOOLS_TRUE@ libimage_rotation_la-actions.lo \ +@ENABLE_JPEG_TOOLS_TRUE@ libimage_rotation_la-callbacks.lo \ +@ENABLE_JPEG_TOOLS_TRUE@ libimage_rotation_la-gth-reset-orientation-task.lo \ +@ENABLE_JPEG_TOOLS_TRUE@ libimage_rotation_la-gth-transform-task.lo \ +@ENABLE_JPEG_TOOLS_TRUE@ libimage_rotation_la-main.lo \ +@ENABLE_JPEG_TOOLS_TRUE@ libimage_rotation_la-rotation-utils.lo libimage_rotation_la_OBJECTS = $(am_libimage_rotation_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -94,6 +116,8 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libimage_rotation_la_CFLAGS) $(CFLAGS) \ $(libimage_rotation_la_LDFLAGS) $(LDFLAGS) -o $@ +@ENABLE_JPEG_TOOLS_TRUE@am_libimage_rotation_la_rpath = -rpath \ +@ENABLE_JPEG_TOOLS_TRUE@ $(extensiondir) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -121,7 +145,12 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libimage_rotation_la_SOURCES) -DIST_SOURCES = $(libimage_rotation_la_SOURCES) +DIST_SOURCES = $(am__libimage_rotation_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) ETAGS = etags CTAGS = ctags @@ -170,10 +199,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +208,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +248,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +298,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +328,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -330,31 +359,31 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -extensiondir = $(pkglibdir)/extensions -extension_LTLIBRARIES = libimage_rotation.la -libimage_rotation_la_SOURCES = \ - $(JPEG_FILES) \ - actions.c \ - actions.h \ - callbacks.c \ - callbacks.h \ - gth-reset-orientation-task.c \ - gth-reset-orientation-task.h \ - gth-transform-task.c \ - gth-transform-task.h \ - main.c \ - rotation-utils.c \ - rotation-utils.h - -libimage_rotation_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb -libimage_rotation_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libimage_rotation_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) ../jpeg_utils/libjpeg_utils.la -libimage_rotation_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) -extensioninidir = $(extensiondir) -extensionini_in_files = image_rotation.extension.in.in -extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) +@ENABLE_JPEG_TOOLS_TRUE@extensiondir = $(pkglibdir)/extensions +@ENABLE_JPEG_TOOLS_TRUE@extension_LTLIBRARIES = libimage_rotation.la +@ENABLE_JPEG_TOOLS_TRUE@libimage_rotation_la_SOURCES = \ +@ENABLE_JPEG_TOOLS_TRUE@ $(JPEG_FILES) \ +@ENABLE_JPEG_TOOLS_TRUE@ actions.c \ +@ENABLE_JPEG_TOOLS_TRUE@ actions.h \ +@ENABLE_JPEG_TOOLS_TRUE@ callbacks.c \ +@ENABLE_JPEG_TOOLS_TRUE@ callbacks.h \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-reset-orientation-task.c \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-reset-orientation-task.h \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-transform-task.c \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-transform-task.h \ +@ENABLE_JPEG_TOOLS_TRUE@ main.c \ +@ENABLE_JPEG_TOOLS_TRUE@ rotation-utils.c \ +@ENABLE_JPEG_TOOLS_TRUE@ rotation-utils.h + +@ENABLE_JPEG_TOOLS_TRUE@libimage_rotation_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +@ENABLE_JPEG_TOOLS_TRUE@libimage_rotation_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) +@ENABLE_JPEG_TOOLS_TRUE@libimage_rotation_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) ../jpeg_utils/libjpeg_utils.la +@ENABLE_JPEG_TOOLS_TRUE@libimage_rotation_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) +@ENABLE_JPEG_TOOLS_TRUE@extensioninidir = $(extensiondir) +@ENABLE_JPEG_TOOLS_TRUE@extensionini_in_files = image_rotation.extension.in.in +@ENABLE_JPEG_TOOLS_TRUE@extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) +@ENABLE_JPEG_TOOLS_TRUE@DISTCLEANFILES = $(extensionini_DATA) EXTRA_DIST = $(extensionini_in_files) -DISTCLEANFILES = $(extensionini_DATA) all: all-am .SUFFIXES: @@ -391,7 +420,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -399,6 +427,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -421,7 +451,7 @@ rm -f "$${dir}/so_locations"; \ done libimage_rotation.la: $(libimage_rotation_la_OBJECTS) $(libimage_rotation_la_DEPENDENCIES) $(EXTRA_libimage_rotation_la_DEPENDENCIES) - $(AM_V_CCLD)$(libimage_rotation_la_LINK) -rpath $(extensiondir) $(libimage_rotation_la_OBJECTS) $(libimage_rotation_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libimage_rotation_la_LINK) $(am_libimage_rotation_la_rpath) $(libimage_rotation_la_OBJECTS) $(libimage_rotation_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -506,8 +536,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/image_rotation/rotation-utils.c gthumb-3.0.0/extensions/image_rotation/rotation-utils.c --- gthumb-2.14.3/extensions/image_rotation/rotation-utils.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_rotation/rotation-utils.c 2012-02-19 15:01:32.000000000 +0000 @@ -88,8 +88,7 @@ /* If the user disabled the warning dialog trim the image */ - /* - * FIXME + /* FIXME if (! eel_gconf_get_boolean (PREF_MSG_JPEG_MCU_WARNING, TRUE)) { if (done_func != NULL) done_func (JPEG_MCU_ACTION_TRIM, done_data); diff -Nru gthumb-2.14.3/extensions/image_viewer/data/gthumb-image-viewer.schemas.in gthumb-3.0.0/extensions/image_viewer/data/gthumb-image-viewer.schemas.in --- gthumb-2.14.3/extensions/image_viewer/data/gthumb-image-viewer.schemas.in 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/data/gthumb-image-viewer.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ - - - - - /schemas/apps/gthumb/viewer/zoom_quality - /apps/gthumb/viewer/zoom_quality - gthumb - string - low - - - Possible values are: high, low. - - - - - - /schemas/apps/gthumb/viewer/zoom_change - /apps/gthumb/viewer/zoom_change - gthumb - string - fit-size-if-larger - - - Possible values are: actual-size, keep-prev, fit-size, - fit-size-if-larger, fit-width, fit-width-if-larger. - - - - - - /schemas/apps/gthumb/viewer/transparency_type - /apps/gthumb/viewer/transparency_type - gthumb - string - none - - - Possible values are: white, black, checked, none. - - - - - - /schemas/apps/gthumb/viewer/reset_scrollbars - /apps/gthumb/viewer/reset_scrollbars - gthumb - bool - true - - - Whether to reset the scrollbar positions after changing image - - - - - - /schemas/apps/gthumb/viewer/check_type - /apps/gthumb/viewer/check_type - gthumb - string - midtone - - - Possible values are: light, midtone, dark. - - - - - - /schemas/apps/gthumb/viewer/check_size - /apps/gthumb/viewer/check_size - gthumb - string - medium - - - Possible values are: small, medium, large. - - - - - - /schemas/apps/gthumb/viewer/black_background - /apps/gthumb/viewer/black_background - gthumb - bool - false - - - Whether to always use a black background. - - - - - - /schemas/apps/gthumb/viewer/shrink_wrap - /apps/gthumb/viewer/shrink_wrap - gthumb - bool - false - - - Whether to resize the window to fit the size of the image - - - - - - diff -Nru gthumb-2.14.3/extensions/image_viewer/data/Makefile.am gthumb-3.0.0/extensions/image_viewer/data/Makefile.am --- gthumb-2.14.3/extensions/image_viewer/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-image-viewer.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/image_viewer/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/image_viewer/data/Makefile.in gthumb-3.0.0/extensions/image_viewer/data/Makefile.in --- gthumb-2.14.3/extensions/image_viewer/data/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/data/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-image-viewer.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/image_viewer/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/image_viewer/data/ui/image-viewer-preferences.ui gthumb-3.0.0/extensions/image_viewer/data/ui/image-viewer-preferences.ui --- gthumb-2.14.3/extensions/image_viewer/data/ui/image-viewer-preferences.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/data/ui/image-viewer-preferences.ui 2012-03-31 09:42:32.000000000 +0000 @@ -1,217 +1,204 @@ - + - - - + + True + False 12 vertical 12 - + True - vertical - 6 - - - True - 5 - - - True - After loading an image: - center - - - - - - False - False - 0 - - - - - False - 0 - - + False + 0 + none True + False + 6 12 - + True + False vertical 6 - + True + False - + + True + False + + Set to actual size + Keep previous zoom + Fit to window + Fit to window if larger + Fit to width + Fit to width if larger + + + + False + True + 0 + False - False + True 0 Reset scrollbar positions + False True True False - True + False + 0 True False - False + True 1 - - 1 - + + + + True + False + After loading an image: + True + + + + False + True 0 - + True - vertical - 6 + False + 0 + none - - True - 5 - - - True - Other - center - - - - - - False - False - 0 - - - - - False - 0 - - - - + True + False + 6 12 - + True - 2 - 2 - 6 + False 6 + 6 - + True + False 0 - Transparency _type: + _Zoom quality: True - center + zoom_quality_combobox - 1 - 2 - GTK_FILL + 0 + 0 + 1 + 1 - + True - - - + False + 0 + Transparency _type: + True + transp_type_combobox - 1 - 2 + 0 1 - 2 - GTK_FILL + 1 + 1 - + True - 0 - _Zoom quality: - True + False + + High + Low + - GTK_FILL + 1 + 0 + 1 + 1 - + True - zoom_quality_liststore - 0 - - - - 0 - - + False + + White + None + Black + Checked + 1 - 2 - GTK_FILL + 1 + 1 + 1 - - 1 - + + + + True + False + Other + True + + + + False + True 1 - - - - - - - - High - - - Low - - - diff -Nru gthumb-2.14.3/extensions/image_viewer/data/ui/Makefile.in gthumb-3.0.0/extensions/image_viewer/data/ui/Makefile.in --- gthumb-2.14.3/extensions/image_viewer/data/ui/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/data/ui/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/image_viewer/gth-image-histogram.c gthumb-3.0.0/extensions/image_viewer/gth-image-histogram.c --- gthumb-2.14.3/extensions/image_viewer/gth-image-histogram.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/gth-image-histogram.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,11 +26,21 @@ #include "gth-image-histogram.h" #include "gth-image-viewer-page.h" -#define GTH_IMAGE_HISTOGRAM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_IMAGE_HISTOGRAM, GthImageHistogramPrivate)) -#define MIN_HISTOGRAM_HEIGHT 250 +#define MIN_HISTOGRAM_HEIGHT 280 -static gpointer parent_class = NULL; + +static void gth_image_histogram_gth_multipage_child_interface_init (GthMultipageChildInterface *iface); +static void gth_image_histogram_gth_property_view_interface_init (GthPropertyViewInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthImageHistogram, + gth_image_histogram, + GTK_TYPE_BOX, + G_IMPLEMENT_INTERFACE (GTH_TYPE_MULTIPAGE_CHILD, + gth_image_histogram_gth_multipage_child_interface_init) + G_IMPLEMENT_INTERFACE (GTH_TYPE_PROPERTY_VIEW, + gth_image_histogram_gth_property_view_interface_init)) struct _GthImageHistogramPrivate { @@ -88,39 +98,20 @@ GthImageHistogram *self = GTH_IMAGE_HISTOGRAM (base); g_object_unref (self->priv->histogram); - G_OBJECT_CLASS (parent_class)->finalize (base); + G_OBJECT_CLASS (gth_image_histogram_parent_class)->finalize (base); } static void gth_image_histogram_class_init (GthImageHistogramClass *klass) { - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthImageHistogramPrivate)); - G_OBJECT_CLASS (klass)->finalize = gth_image_histogram_finalize; } static void -gth_image_histogram_init (GthImageHistogram *self) -{ - self->priv = GTH_IMAGE_HISTOGRAM_GET_PRIVATE (self); - self->priv->histogram = gth_histogram_new (); - - gtk_box_set_spacing (GTK_BOX (self), 6); - gtk_container_set_border_width (GTK_CONTAINER (self), 2); - - self->priv->histogram_view = gth_histogram_view_new (self->priv->histogram); - gth_histogram_view_show_info (GTH_HISTOGRAM_VIEW (self->priv->histogram_view), TRUE); - gtk_widget_set_size_request (self->priv->histogram_view, -1, MIN_HISTOGRAM_HEIGHT); - gtk_widget_show (self->priv->histogram_view); - gtk_box_pack_start (GTK_BOX (self), self->priv->histogram_view, FALSE, FALSE, 0); -} - - -static void -gth_image_histogram_gth_multipage_child_interface_init (GthMultipageChildIface *iface) +gth_image_histogram_gth_multipage_child_interface_init (GthMultipageChildInterface *iface) { iface->get_name = gth_image_histogram_real_get_name; iface->get_icon = gth_image_histogram_real_get_icon; @@ -128,47 +119,25 @@ static void -gth_image_histogram_gth_property_view_interface_init (GthPropertyViewIface *iface) +gth_image_histogram_gth_property_view_interface_init (GthPropertyViewInterface *iface) { iface->set_file = gth_image_histogram_real_set_file; } -GType -gth_image_histogram_get_type (void) +static void +gth_image_histogram_init (GthImageHistogram *self) { - static GType type = 0; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_HISTOGRAM, GthImageHistogramPrivate); + self->priv->histogram = gth_histogram_new (); - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthImageHistogramClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_image_histogram_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthImageHistogram), - 0, - (GInstanceInitFunc) gth_image_histogram_init, - NULL - }; - static const GInterfaceInfo gth_multipage_child_info = { - (GInterfaceInitFunc) gth_image_histogram_gth_multipage_child_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo gth_property_view_info = { - (GInterfaceInitFunc) gth_image_histogram_gth_property_view_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - type = g_type_register_static (GTK_TYPE_VBOX, - "GthImageHistogram", - &g_define_type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_MULTIPAGE_CHILD, >h_multipage_child_info); - g_type_add_interface_static (type, GTH_TYPE_PROPERTY_VIEW, >h_property_view_info); - } + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL); + gtk_box_set_spacing (GTK_BOX (self), 6); + gtk_container_set_border_width (GTK_CONTAINER (self), 2); - return type; + self->priv->histogram_view = gth_histogram_view_new (self->priv->histogram); + gth_histogram_view_show_info (GTH_HISTOGRAM_VIEW (self->priv->histogram_view), TRUE); + gtk_widget_set_size_request (self->priv->histogram_view, -1, MIN_HISTOGRAM_HEIGHT); + gtk_widget_show (self->priv->histogram_view); + gtk_box_pack_start (GTK_BOX (self), self->priv->histogram_view, FALSE, FALSE, 0); } diff -Nru gthumb-2.14.3/extensions/image_viewer/gth-image-histogram.h gthumb-3.0.0/extensions/image_viewer/gth-image-histogram.h --- gthumb-2.14.3/extensions/image_viewer/gth-image-histogram.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/gth-image-histogram.h 2012-02-19 15:01:32.000000000 +0000 @@ -38,12 +38,12 @@ typedef struct _GthImageHistogramPrivate GthImageHistogramPrivate; struct _GthImageHistogram { - GtkVBox parent_instance; + GtkBox parent_instance; GthImageHistogramPrivate *priv; }; struct _GthImageHistogramClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; }; GType gth_image_histogram_get_type (void); diff -Nru gthumb-2.14.3/extensions/image_viewer/gth-image-viewer-page.c gthumb-3.0.0/extensions/image_viewer/gth-image-viewer-page.c --- gthumb-2.14.3/extensions/image_viewer/gth-image-viewer-page.c 2011-11-04 08:41:57.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/gth-image-viewer-page.c 2012-03-31 09:42:32.000000000 +0000 @@ -26,31 +26,37 @@ #include "gth-image-viewer-page.h" #include "preferences.h" -#define GTH_IMAGE_VIEWER_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_IMAGE_VIEWER_PAGE, GthImageViewerPagePrivate)) -#define GCONF_NOTIFICATIONS 8 + +static void gth_viewer_page_interface_init (GthViewerPageInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthImageViewerPage, + gth_image_viewer_page, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTH_TYPE_VIEWER_PAGE, + gth_viewer_page_interface_init)) struct _GthImageViewerPagePrivate { GthBrowser *browser; + GSettings *settings; GtkWidget *image_navigator; GtkWidget *viewer; GthImagePreloader *preloader; GtkActionGroup *actions; - guint merge_id; + guint viewer_merge_id; + guint browser_merge_id; GthImageHistory *history; GthFileData *file_data; gulong requested_ready_id; gulong original_size_ready_id; - guint cnxn_id[GCONF_NOTIFICATIONS]; guint hide_mouse_timeout; guint motion_signal; gboolean image_changed; - gboolean shrink_wrap; GFile *last_loaded; gboolean can_paste; }; -static gpointer gth_image_viewer_page_parent_class = NULL; static const char *image_viewer_ui_info = "" @@ -64,11 +70,6 @@ " " " " " " -" " -" " -" " -" " -" " " " " " " " @@ -78,9 +79,6 @@ " " " " " " -" " -" " -" " " " " " " " @@ -90,9 +88,6 @@ " " " " " " -" " -" " -" " " " ""; @@ -169,14 +164,6 @@ } -static void -image_viewer_activate_action_view_shrink_wrap (GtkAction *action, - GthImageViewerPage *self) -{ - eel_gconf_set_boolean (PREF_VIEWER_SHRINK_WRAP, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); -} - - static GtkActionEntry image_viewer_action_entries[] = { { "ImageViewer_Edit_Undo", GTK_STOCK_UNDO, NULL, "z", @@ -225,15 +212,6 @@ }; -static GtkToggleActionEntry image_viewer_toggle_action_entries[] = { - { "ImageViewer_View_ShrinkWrap", NULL, - N_("_Fit Window to Image"), "e", - N_("Resize the window to the size of the image"), - G_CALLBACK (image_viewer_activate_action_view_shrink_wrap), - FALSE } -}; - - static void gth_image_viewer_page_file_loaded (GthImageViewerPage *self, gboolean success) @@ -414,7 +392,7 @@ if (! _g_file_equal (requested->file, self->priv->file_data->file)) return; - if (error != NULL) { + if ((error != NULL) || (image == NULL)) { gth_image_viewer_page_file_loaded (self, FALSE); return; } @@ -426,12 +404,24 @@ original_width, original_height); - if (self->priv->shrink_wrap) - gth_image_viewer_page_shrink_wrap (self, TRUE); gth_image_history_clear (self->priv->history); gth_image_history_add_image (self->priv->history, gth_image_viewer_get_current_image (GTH_IMAGE_VIEWER (self->priv->viewer)), FALSE); + + if ((original_width == -1) || (original_height == -1)) + /* In this case the image was loaded at its original size, + * so we get the original size from the image surface size. */ + gth_image_viewer_get_original_size (GTH_IMAGE_VIEWER (self->priv->viewer), + &original_width, + &original_height); + g_file_info_set_attribute_int32 (self->priv->file_data->info, + "frame::width", + original_width); + g_file_info_set_attribute_int32 (self->priv->file_data->info, + "frame::height", + original_height); + gth_image_viewer_page_file_loaded (self, TRUE); } @@ -463,116 +453,97 @@ static void -pref_zoom_quality_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_zoom_quality_changed (GSettings *settings, + char *key, + gpointer user_data) { GthImageViewerPage *self = user_data; - GthImageViewer *image_viewer = GTH_IMAGE_VIEWER (self->priv->viewer); - gth_image_viewer_set_zoom_quality (image_viewer, eel_gconf_get_enum (PREF_ZOOM_QUALITY, GTH_TYPE_ZOOM_QUALITY, GTH_ZOOM_QUALITY_HIGH)); - gth_image_viewer_update_view (image_viewer); + gth_image_viewer_set_zoom_quality (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_ZOOM_QUALITY)); + gtk_widget_queue_draw (self->priv->viewer); } static void -pref_zoom_change_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_zoom_change_changed (GSettings *settings, + char *key, + gpointer user_data) { GthImageViewerPage *self = user_data; - GthImageViewer *image_viewer = GTH_IMAGE_VIEWER (self->priv->viewer); - gth_image_viewer_set_zoom_change (image_viewer, eel_gconf_get_enum (PREF_ZOOM_CHANGE, GTH_TYPE_ZOOM_CHANGE, GTH_ZOOM_CHANGE_FIT_SIZE_IF_LARGER)); - gth_image_viewer_update_view (image_viewer); + gth_image_viewer_set_zoom_change (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_ZOOM_CHANGE)); + gtk_widget_queue_draw (self->priv->viewer); } static void -pref_transp_type_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_transp_type_changed (GSettings *settings, + char *key, + gpointer user_data) { GthImageViewerPage *self = user_data; - GthImageViewer *image_viewer = GTH_IMAGE_VIEWER (self->priv->viewer); - gth_image_viewer_set_transp_type (image_viewer, eel_gconf_get_enum (PREF_TRANSP_TYPE, GTH_TYPE_TRANSP_TYPE, GTH_TRANSP_TYPE_NONE)); - gth_image_viewer_update_view (image_viewer); + gth_image_viewer_set_transp_type (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_TRANSP_TYPE)); + gtk_widget_queue_draw (self->priv->viewer); } static void -pref_check_type_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_check_type_changed (GSettings *settings, + char *key, + gpointer user_data) { GthImageViewerPage *self = user_data; - GthImageViewer *image_viewer = GTH_IMAGE_VIEWER (self->priv->viewer); - gth_image_viewer_set_check_type (image_viewer, eel_gconf_get_enum (PREF_CHECK_TYPE, GTH_TYPE_CHECK_TYPE, GTH_CHECK_TYPE_MIDTONE)); - gth_image_viewer_update_view (image_viewer); + gth_image_viewer_set_check_type (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_CHECK_TYPE)); + gtk_widget_queue_draw (self->priv->viewer); } static void -pref_check_size_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_check_size_changed (GSettings *settings, + char *key, + gpointer user_data) { GthImageViewerPage *self = user_data; - GthImageViewer *image_viewer = GTH_IMAGE_VIEWER (self->priv->viewer); - gth_image_viewer_set_check_size (image_viewer, eel_gconf_get_enum (PREF_CHECK_SIZE, GTH_TYPE_CHECK_SIZE, GTH_CHECK_SIZE_MEDIUM)); - gth_image_viewer_update_view (image_viewer); + gth_image_viewer_set_check_size (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_CHECK_SIZE)); + gtk_widget_queue_draw (self->priv->viewer); } static void -pref_black_background_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_black_background_changed (GSettings *settings, + char *key, + gpointer user_data) { GthImageViewerPage *self = user_data; - GthImageViewer *image_viewer = GTH_IMAGE_VIEWER (self->priv->viewer); - gth_image_viewer_set_black_background (image_viewer, eel_gconf_get_boolean (PREF_BLACK_BACKGROUND, FALSE)); + gth_image_viewer_set_black_background (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_boolean (self->priv->settings, PREF_IMAGE_VIEWER_BLACK_BACKGROUND)); + gtk_widget_queue_draw (self->priv->viewer); } static void -pref_reset_scrollbars_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_reset_scrollbars_changed (GSettings *settings, + char *key, + gpointer user_data) { GthImageViewerPage *self = user_data; - GthImageViewer *image_viewer = GTH_IMAGE_VIEWER (self->priv->viewer); - gth_image_viewer_set_reset_scrollbars (image_viewer, eel_gconf_get_boolean (PREF_RESET_SCROLLBARS, TRUE)); -} - - -static void -pref_viewer_shrink_wrap_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) -{ - GthImageViewerPage *self = user_data; - - gth_image_viewer_page_shrink_wrap (self, eel_gconf_get_boolean (PREF_VIEWER_SHRINK_WRAP, FALSE)); + gth_image_viewer_set_reset_scrollbars (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_boolean (self->priv->settings, PREF_IMAGE_VIEWER_RESET_SCROLLBARS)); } static void paint_comment_over_image_func (GthImageViewer *image_viewer, - GdkEventExpose *event, cairo_t *cr, gpointer user_data) { @@ -723,7 +694,6 @@ { GthImageViewerPage *self; GtkAction *action; - int i; self = (GthImageViewerPage*) base; @@ -735,12 +705,11 @@ image_viewer_action_entries, G_N_ELEMENTS (image_viewer_action_entries), self); - gtk_action_group_add_toggle_actions (self->priv->actions, - image_viewer_toggle_action_entries, - G_N_ELEMENTS (image_viewer_toggle_action_entries), - self); gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), self->priv->actions, 0); + action = gtk_action_group_get_action (gth_browser_get_actions (browser), "Viewer_Tools"); + g_object_set (action, "sensitive", TRUE, NULL); + self->priv->preloader = gth_browser_get_image_preloader (browser); self->priv->requested_ready_id = g_signal_connect (G_OBJECT (self->priv->preloader), "requested_ready", @@ -752,18 +721,20 @@ self); self->priv->viewer = gth_image_viewer_new (); - gth_image_viewer_set_zoom_quality (GTH_IMAGE_VIEWER (self->priv->viewer), eel_gconf_get_enum (PREF_ZOOM_QUALITY, GTH_TYPE_ZOOM_QUALITY, GTH_ZOOM_QUALITY_HIGH)); - gth_image_viewer_set_zoom_change (GTH_IMAGE_VIEWER (self->priv->viewer), eel_gconf_get_enum (PREF_ZOOM_CHANGE, GTH_TYPE_ZOOM_CHANGE, GTH_ZOOM_CHANGE_FIT_SIZE_IF_LARGER)); - gth_image_viewer_set_transp_type (GTH_IMAGE_VIEWER (self->priv->viewer), eel_gconf_get_enum (PREF_TRANSP_TYPE, GTH_TYPE_TRANSP_TYPE, GTH_TRANSP_TYPE_NONE)); - gth_image_viewer_set_check_type (GTH_IMAGE_VIEWER (self->priv->viewer), eel_gconf_get_enum (PREF_CHECK_TYPE, GTH_TYPE_CHECK_TYPE, GTH_CHECK_TYPE_MIDTONE)); - gth_image_viewer_set_check_size (GTH_IMAGE_VIEWER (self->priv->viewer), eel_gconf_get_enum (PREF_CHECK_SIZE, GTH_TYPE_CHECK_SIZE, GTH_CHECK_SIZE_MEDIUM)); - gth_image_viewer_set_black_background (GTH_IMAGE_VIEWER (self->priv->viewer), eel_gconf_get_boolean (PREF_BLACK_BACKGROUND, FALSE)); - gth_image_viewer_set_reset_scrollbars (GTH_IMAGE_VIEWER (self->priv->viewer), eel_gconf_get_boolean (PREF_RESET_SCROLLBARS, TRUE)); - - self->priv->shrink_wrap = eel_gconf_get_boolean (PREF_VIEWER_SHRINK_WRAP, FALSE); - action = gtk_action_group_get_action (self->priv->actions, "ImageViewer_View_ShrinkWrap"); - if (action != NULL) - g_object_set (action, "active", self->priv->shrink_wrap, NULL); + gth_image_viewer_set_zoom_quality (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_ZOOM_QUALITY)); + gth_image_viewer_set_zoom_change (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_ZOOM_CHANGE)); + gth_image_viewer_set_transp_type (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_TRANSP_TYPE)); + gth_image_viewer_set_check_type (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_CHECK_TYPE)); + gth_image_viewer_set_check_size (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_enum (self->priv->settings, PREF_IMAGE_VIEWER_CHECK_SIZE)); + gth_image_viewer_set_black_background (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_boolean (self->priv->settings, PREF_IMAGE_VIEWER_BLACK_BACKGROUND)); + gth_image_viewer_set_reset_scrollbars (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_boolean (self->priv->settings, PREF_IMAGE_VIEWER_RESET_SCROLLBARS)); gtk_widget_show (self->priv->viewer); @@ -806,51 +777,36 @@ gth_browser_set_viewer_widget (browser, self->priv->image_navigator); gth_viewer_page_focus (GTH_VIEWER_PAGE (self)); - /* gconf notifications */ + /* settings notifications */ - for (i = 0; i < GCONF_NOTIFICATIONS; i++) - self->priv->cnxn_id[i] = 0; - - i = 0; - self->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_ZOOM_QUALITY, - pref_zoom_quality_changed, - self); - - self->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_ZOOM_CHANGE, - pref_zoom_change_changed, - self); - - self->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_TRANSP_TYPE, - pref_transp_type_changed, - self); - - self->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_CHECK_TYPE, - pref_check_type_changed, - self); - - self->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_CHECK_SIZE, - pref_check_size_changed, - self); - - self->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_BLACK_BACKGROUND, - pref_black_background_changed, - self); - - self->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_RESET_SCROLLBARS, - pref_reset_scrollbars_changed, - self); - - self->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_VIEWER_SHRINK_WRAP, - pref_viewer_shrink_wrap_changed, - self); + g_signal_connect (self->priv->settings, + "changed::" PREF_IMAGE_VIEWER_ZOOM_QUALITY, + G_CALLBACK (pref_zoom_quality_changed), + self); + g_signal_connect (self->priv->settings, + "changed::" PREF_IMAGE_VIEWER_ZOOM_CHANGE, + G_CALLBACK (pref_zoom_change_changed), + self); + g_signal_connect (self->priv->settings, + "changed::" PREF_IMAGE_VIEWER_TRANSP_TYPE, + G_CALLBACK (pref_transp_type_changed), + self); + g_signal_connect (self->priv->settings, + "changed::" PREF_IMAGE_VIEWER_CHECK_TYPE, + G_CALLBACK (pref_check_type_changed), + self); + g_signal_connect (self->priv->settings, + "changed::" PREF_IMAGE_VIEWER_CHECK_SIZE, + G_CALLBACK (pref_check_size_changed), + self); + g_signal_connect (self->priv->settings, + "changed::" PREF_IMAGE_VIEWER_BLACK_BACKGROUND, + G_CALLBACK (pref_black_background_changed), + self); + g_signal_connect (self->priv->settings, + "changed::" PREF_IMAGE_VIEWER_RESET_SCROLLBARS, + G_CALLBACK (pref_reset_scrollbars_changed), + self); } @@ -858,17 +814,17 @@ gth_image_viewer_page_real_deactivate (GthViewerPage *base) { GthImageViewerPage *self; - int i; + GtkAction *action; self = (GthImageViewerPage*) base; - /* remove gconf notifications */ + action = gtk_action_group_get_action (gth_browser_get_actions (self->priv->browser), "Viewer_Tools"); + g_object_set (action, "sensitive", FALSE, NULL); - for (i = 0; i < GCONF_NOTIFICATIONS; i++) - if (self->priv->cnxn_id[i] != 0) - eel_gconf_notification_remove (self->priv->cnxn_id[i]); - - /**/ + if (self->priv->browser_merge_id != 0) { + gtk_ui_manager_remove_ui (gth_browser_get_ui_manager (self->priv->browser), self->priv->browser_merge_id); + self->priv->browser_merge_id = 0; + } gtk_ui_manager_remove_action_group (gth_browser_get_ui_manager (self->priv->browser), self->priv->actions); g_object_unref (self->priv->actions); @@ -894,11 +850,11 @@ self = (GthImageViewerPage*) base; - if (self->priv->merge_id != 0) + if (self->priv->viewer_merge_id != 0) return; - self->priv->merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (self->priv->browser), image_viewer_ui_info, -1, &error); - if (self->priv->merge_id == 0) { + self->priv->viewer_merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (self->priv->browser), image_viewer_ui_info, -1, &error); + if (self->priv->viewer_merge_id == 0) { g_warning ("ui building failed: %s", error->message); g_error_free (error); } @@ -914,9 +870,9 @@ self = (GthImageViewerPage*) base; - if (self->priv->merge_id != 0) { - gtk_ui_manager_remove_ui (gth_browser_get_ui_manager (self->priv->browser), self->priv->merge_id); - self->priv->merge_id = 0; + if (self->priv->viewer_merge_id != 0) { + gtk_ui_manager_remove_ui (gth_browser_get_ui_manager (self->priv->browser), self->priv->viewer_merge_id); + self->priv->viewer_merge_id = 0; } } @@ -1030,12 +986,13 @@ self = (GthImageViewerPage *) base; if (active) { - gth_image_navigator_set_scrollbars_visible (GTH_IMAGE_NAVIGATOR (self->priv->image_navigator), FALSE); + gth_image_navigator_set_automatic_scrollbars (GTH_IMAGE_NAVIGATOR (self->priv->image_navigator), FALSE); gth_image_viewer_set_black_background (GTH_IMAGE_VIEWER (self->priv->viewer), TRUE); } else { - gth_image_navigator_set_scrollbars_visible (GTH_IMAGE_NAVIGATOR (self->priv->image_navigator), TRUE); - gth_image_viewer_set_black_background (GTH_IMAGE_VIEWER (self->priv->viewer), eel_gconf_get_boolean (PREF_BLACK_BACKGROUND, FALSE)); + gth_image_navigator_set_automatic_scrollbars (GTH_IMAGE_NAVIGATOR (self->priv->image_navigator), TRUE); + gth_image_viewer_set_black_background (GTH_IMAGE_VIEWER (self->priv->viewer), + g_settings_get_boolean (self->priv->settings, PREF_IMAGE_VIEWER_BLACK_BACKGROUND)); } } @@ -1085,6 +1042,7 @@ typedef struct { GthImageViewerPage *self; + GthFileData *file_to_save; GthFileData *original_file; FileSavedFunc func; gpointer user_data; @@ -1092,6 +1050,15 @@ static void +save_data_free (SaveData *data) +{ + g_object_unref (data->file_to_save); + g_object_unref (data->original_file); + g_free (data); +} + + +static void image_saved_cb (GthFileData *file_data, GError *error, gpointer user_data) @@ -1103,17 +1070,12 @@ error_occurred = error != NULL; if (error_occurred) { - GthFileData *current_file; - - current_file = gth_browser_get_current_file (self->priv->browser); - if (current_file != NULL) { - gth_file_data_set_file (current_file, data->original_file->file); - g_file_info_set_attribute_boolean (current_file->info, "gth::file::is-modified", FALSE); - } + gth_file_data_set_file (data->file_to_save, data->original_file->file); + g_file_info_set_attribute_boolean (data->file_to_save->info, "gth::file::is-modified", FALSE); } if (data->func != NULL) - (data->func) ((GthViewerPage *) self, self->priv->file_data, error, data->user_data); + (data->func) ((GthViewerPage *) self, data->file_to_save, error, data->user_data); else if (error != NULL) _gtk_error_dialog_from_gerror_show (GTK_WINDOW (self->priv->browser), _("Could not save the file"), error); @@ -1121,8 +1083,8 @@ GFile *folder; GList *file_list; - folder = g_file_get_parent (self->priv->file_data->file); - file_list = g_list_prepend (NULL, g_object_ref (self->priv->file_data->file)); + folder = g_file_get_parent (data->file_to_save->file); + file_list = g_list_prepend (NULL, g_object_ref (data->file_to_save->file)); gth_monitor_folder_changed (gth_main_get_default_monitor (), folder, file_list, @@ -1132,8 +1094,7 @@ g_object_unref (folder); } - g_object_unref (data->original_file); - g_free (data); + save_data_free (data); } @@ -1160,14 +1121,35 @@ mime_type = gth_file_data_get_mime_type (self->priv->file_data); current_file = gth_browser_get_current_file (self->priv->browser); + if (current_file == NULL) + return; + + data->file_to_save = g_object_ref (current_file); data->original_file = gth_file_data_dup (current_file); if (file != NULL) - gth_file_data_set_file (current_file, file); - g_file_info_set_attribute_boolean (current_file->info, "gth::file::is-modified", FALSE); + gth_file_data_set_file (data->file_to_save, file); + + /* save the value of 'gth::file::is-modified' into 'gth::file::image-changed' + * to allow the exiv2 metadata writer to not change some fields if the + * content wasn't modified. */ + g_file_info_set_attribute_boolean (data->file_to_save->info, + "gth::file::image-changed", + g_file_info_get_attribute_boolean (data->file_to_save->info, "gth::file::is-modified")); + + /* the 'gth::file::is-modified' attribute must be set to false before + * saving the file to avoid a scenario where the user is asked whether + * he wants to save the file after saving it. + * This is because when a file is modified in the current folder the + * folder_changed_cb function in gth-browser.c is called automatically + * and if the current file has been modified it is reloaded + * (see file_attributes_ready_cb in gth-browser.c) and if it has been + * modified ('gth::file::is-modified' is TRUE) the user is asked if he + * wants to save (see load_file_delayed_cb in gth-browser.c). */ + g_file_info_set_attribute_boolean (data->file_to_save->info, "gth::file::is-modified", FALSE); pixbuf = gth_image_viewer_get_current_pixbuf (GTH_IMAGE_VIEWER (self->priv->viewer)); _gdk_pixbuf_save_async (pixbuf, - current_file, + data->file_to_save, mime_type, TRUE, image_saved_cb, @@ -1287,7 +1269,7 @@ data); gtk_window_set_transient_for (GTK_WINDOW (file_sel), GTK_WINDOW (self->priv->browser)); - gtk_window_set_modal (GTK_WINDOW (file_sel), FALSE); + gtk_window_set_modal (GTK_WINDOW (file_sel), TRUE); gtk_widget_show (file_sel); g_free (uri); @@ -1355,7 +1337,7 @@ if (self->priv->viewer == NULL) return; - gth_image_viewer_update_view (GTH_IMAGE_VIEWER (self->priv->viewer)); + gtk_widget_queue_draw (self->priv->viewer); } @@ -1371,7 +1353,18 @@ gth_image_viewer_add_painter (GTH_IMAGE_VIEWER (self->priv->viewer), paint_comment_over_image_func, self); else gth_image_viewer_remove_painter (GTH_IMAGE_VIEWER (self->priv->viewer), paint_comment_over_image_func, self); - gth_image_viewer_update_view (GTH_IMAGE_VIEWER (self->priv->viewer)); + gtk_widget_queue_draw (self->priv->viewer); +} + + +static void +gth_image_viewer_page_real_shrink_wrap (GthViewerPage *base, + gboolean activate, + int *other_width, + int *other_height) +{ + GthImageViewerPage *self = GTH_IMAGE_VIEWER_PAGE (base); + gth_image_viewer_set_fit_mode (GTH_IMAGE_VIEWER (self->priv->viewer), GTH_FIT_SIZE_IF_LARGER); } @@ -1382,6 +1375,7 @@ self = GTH_IMAGE_VIEWER_PAGE (obj); + g_object_unref (self->priv->settings); g_object_unref (self->priv->history); _g_object_unref (self->priv->file_data); _g_object_unref (self->priv->last_loaded); @@ -1393,7 +1387,6 @@ static void gth_image_viewer_page_class_init (GthImageViewerPageClass *klass) { - gth_image_viewer_page_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthImageViewerPagePrivate)); G_OBJECT_CLASS (klass)->finalize = gth_image_viewer_page_finalize; @@ -1401,7 +1394,7 @@ static void -gth_viewer_page_interface_init (GthViewerPageIface *iface) +gth_viewer_page_interface_init (GthViewerPageInterface *iface) { iface->activate = gth_image_viewer_page_real_activate; iface->deactivate = gth_image_viewer_page_real_deactivate; @@ -1419,46 +1412,21 @@ iface->revert = gth_image_viewer_page_real_revert; iface->update_info = gth_image_viewer_page_real_update_info; iface->show_properties = gth_image_viewer_page_real_show_properties; + iface->shrink_wrap = gth_image_viewer_page_real_shrink_wrap; } static void -gth_image_viewer_page_instance_init (GthImageViewerPage *self) +gth_image_viewer_page_init (GthImageViewerPage *self) { - self->priv = GTH_IMAGE_VIEWER_PAGE_GET_PRIVATE (self); + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_VIEWER_PAGE, GthImageViewerPagePrivate); + self->priv->settings = g_settings_new (GTHUMB_IMAGE_VIEWER_SCHEMA); self->priv->history = gth_image_history_new (); - self->priv->shrink_wrap = FALSE; self->priv->last_loaded = NULL; self->priv->image_changed = FALSE; self->priv->can_paste = FALSE; -} - - -GType -gth_image_viewer_page_get_type (void) { - static GType gth_image_viewer_page_type_id = 0; - if (gth_image_viewer_page_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthImageViewerPageClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_image_viewer_page_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthImageViewerPage), - 0, - (GInstanceInitFunc) gth_image_viewer_page_instance_init, - NULL - }; - static const GInterfaceInfo gth_viewer_page_info = { - (GInterfaceInitFunc) gth_viewer_page_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - gth_image_viewer_page_type_id = g_type_register_static (G_TYPE_OBJECT, "GthImageViewerPage", &g_define_type_info, 0); - g_type_add_interface_static (gth_image_viewer_page_type_id, GTH_TYPE_VIEWER_PAGE, >h_viewer_page_info); - } - return gth_image_viewer_page_type_id; + self->priv->viewer_merge_id = 0; + self->priv->browser_merge_id = 0; } @@ -1558,122 +1526,6 @@ } -static int -add_non_content_width (GthImageViewerPage *self, - GtkWidget *non_content) -{ - int width = 0; - - if ((non_content != NULL) && gtk_widget_get_mapped (non_content)) { - GtkAllocation allocation; - - gtk_widget_get_allocation (non_content, &allocation); - width = allocation.width; - } - - return width; -} - - -static int -add_non_content_height (GthImageViewerPage *self, - GtkWidget *non_content) -{ - int height = 0; - - if ((non_content != NULL) && gtk_widget_get_mapped (non_content)) { - GtkAllocation allocation; - - gtk_widget_get_allocation (non_content, &allocation); - height = allocation.height; - } - - return height; -} - - -void -gth_image_viewer_page_shrink_wrap (GthImageViewerPage *self, - gboolean activate) -{ - GthFileData *file_data; - int width; - int height; - double ratio; - int other_width; - int other_height; - GdkScreen *screen; - int max_width; - int max_height; - - self->priv->shrink_wrap = activate; - if (! self->priv->shrink_wrap) { - int width; - int height; - - if (gth_window_get_page_size (GTH_WINDOW (self->priv->browser), - GTH_BROWSER_PAGE_BROWSER, - &width, - &height)) - { - gth_window_save_page_size (GTH_WINDOW (self->priv->browser), GTH_BROWSER_PAGE_VIEWER, width, height); - gth_window_apply_saved_size (GTH_WINDOW (self->priv->browser), GTH_BROWSER_PAGE_VIEWER); - } - else - gth_window_clear_saved_size (GTH_WINDOW (self->priv->browser), GTH_BROWSER_PAGE_VIEWER); - gth_image_viewer_set_fit_mode (GTH_IMAGE_VIEWER (self->priv->viewer), GTH_FIT_SIZE_IF_LARGER); - - return; - } - - file_data = gth_browser_get_current_file (self->priv->browser); - if (file_data == NULL) - return; - - gth_image_viewer_get_original_size (GTH_IMAGE_VIEWER (self->priv->viewer), &width, &height); - if ((width <= 0) || (height <= 0)) - return; - - ratio = (double) width / height; - - other_width = 0; - other_height = 0; - other_height += add_non_content_height (self, gth_window_get_area (GTH_WINDOW (self->priv->browser), GTH_WINDOW_MENUBAR)); - other_height += add_non_content_height (self, gth_window_get_area (GTH_WINDOW (self->priv->browser), GTH_WINDOW_TOOLBAR)); - other_height += add_non_content_height (self, gth_window_get_area (GTH_WINDOW (self->priv->browser), GTH_WINDOW_STATUSBAR)); - other_height += add_non_content_height (self, gth_browser_get_viewer_toolbar (self->priv->browser)); - if (eel_gconf_get_enum (PREF_UI_VIEWER_THUMBNAILS_ORIENT, GTK_TYPE_ORIENTATION, GTK_ORIENTATION_HORIZONTAL) == GTK_ORIENTATION_HORIZONTAL) - other_height += add_non_content_height (self, gth_browser_get_thumbnail_list (self->priv->browser)); - else - other_width += add_non_content_width (self, gth_browser_get_thumbnail_list (self->priv->browser)); - other_width += add_non_content_width (self, gth_browser_get_viewer_sidebar (self->priv->browser)); - other_width += 2; - other_height += 2; - - screen = gtk_widget_get_screen (GTK_WIDGET (self->priv->browser)); - max_width = round ((double) gdk_screen_get_width (screen) * 8.5 / 10.0); - max_height = round ((double) gdk_screen_get_height (screen) * 8.5 / 10.0); - - if (width + other_width > max_width) { - width = max_width - other_width; - height = width / ratio; - } - - if (height + other_height > max_height) { - height = max_height - other_height; - width = height * ratio; - } - - gth_window_save_page_size (GTH_WINDOW (self->priv->browser), - GTH_BROWSER_PAGE_VIEWER, - width + other_width, - height + other_height); - if (gth_window_get_current_page (GTH_WINDOW (self->priv->browser)) == GTH_BROWSER_PAGE_VIEWER) - gth_window_apply_saved_size (GTH_WINDOW (self->priv->browser), GTH_BROWSER_PAGE_VIEWER); - gth_image_viewer_set_fit_mode (GTH_IMAGE_VIEWER (self->priv->viewer), GTH_FIT_SIZE_IF_LARGER); -} - - void gth_image_viewer_page_copy_image (GthImageViewerPage *self) { diff -Nru gthumb-2.14.3/extensions/image_viewer/gth-image-viewer-page.h gthumb-3.0.0/extensions/image_viewer/gth-image-viewer-page.h --- gthumb-2.14.3/extensions/image_viewer/gth-image-viewer-page.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/gth-image-viewer-page.h 2012-02-19 15:01:32.000000000 +0000 @@ -60,8 +60,6 @@ void gth_image_viewer_page_redo (GthImageViewerPage *page); GthImageHistory * gth_image_viewer_page_get_history (GthImageViewerPage *self); void gth_image_viewer_page_reset (GthImageViewerPage *self); -void gth_image_viewer_page_shrink_wrap (GthImageViewerPage *self, - gboolean activate); void gth_image_viewer_page_copy_image (GthImageViewerPage *self); void gth_image_viewer_page_paste_image (GthImageViewerPage *self); diff -Nru gthumb-2.14.3/extensions/image_viewer/gth-metadata-provider-image.c gthumb-3.0.0/extensions/image_viewer/gth-metadata-provider-image.c --- gthumb-2.14.3/extensions/image_viewer/gth-metadata-provider-image.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/gth-metadata-provider-image.c 2012-02-19 15:01:32.000000000 +0000 @@ -30,7 +30,10 @@ #include "gth-metadata-provider-image.h" -static GthMetadataProviderClass *parent_class = NULL; +#define BUFFER_SIZE 32 + + +G_DEFINE_TYPE (GthMetadataProviderImage, gth_metadata_provider_image, GTH_TYPE_METADATA_PROVIDER) static gboolean @@ -48,9 +51,6 @@ } -#define BUFFER_SIZE 32 - - static void gth_metadata_provider_image_read (GthMetadataProvider *self, GthFileData *file_data, @@ -198,36 +198,16 @@ static void gth_metadata_provider_image_class_init (GthMetadataProviderImageClass *klass) { - parent_class = g_type_class_peek_parent (klass); + GthMetadataProviderClass *metadata_provider_class; - GTH_METADATA_PROVIDER_CLASS (klass)->can_read = gth_metadata_provider_image_can_read; - GTH_METADATA_PROVIDER_CLASS (klass)->read = gth_metadata_provider_image_read; + metadata_provider_class = GTH_METADATA_PROVIDER_CLASS (klass); + metadata_provider_class->can_read = gth_metadata_provider_image_can_read; + metadata_provider_class->read = gth_metadata_provider_image_read; } -GType -gth_metadata_provider_image_get_type (void) +static void +gth_metadata_provider_image_init (GthMetadataProviderImage *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthMetadataProviderImageClass), - NULL, - NULL, - (GClassInitFunc) gth_metadata_provider_image_class_init, - NULL, - NULL, - sizeof (GthMetadataProviderImage), - 0, - (GInstanceInitFunc) NULL - }; - - type = g_type_register_static (GTH_TYPE_METADATA_PROVIDER, - "GthMetadataProviderImage", - &type_info, - 0); - } - - return type; + /* void */ } diff -Nru gthumb-2.14.3/extensions/image_viewer/image_viewer.extension.in.in gthumb-3.0.0/extensions/image_viewer/image_viewer.extension.in.in --- gthumb-2.14.3/extensions/image_viewer/image_viewer.extension.in.in 2011-10-25 10:49:38.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/image_viewer.extension.in.in 2012-04-21 09:24:41.000000000 +0000 @@ -8,6 +8,7 @@ Category=Viewer [Loader] -After=file_viewer;jpeg_utils Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% +After=file_viewer;jpeg_utils diff -Nru gthumb-2.14.3/extensions/image_viewer/Makefile.in gthumb-3.0.0/extensions/image_viewer/Makefile.in --- gthumb-2.14.3/extensions/image_viewer/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -129,6 +146,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -208,10 +230,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -219,6 +239,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -258,6 +279,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -306,8 +329,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -338,6 +359,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -427,7 +449,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -435,6 +456,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -534,8 +557,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -718,13 +744,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/image_viewer/preferences.c gthumb-3.0.0/extensions/image_viewer/preferences.c --- gthumb-2.14.3/extensions/image_viewer/preferences.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/preferences.c 2012-03-31 09:42:32.000000000 +0000 @@ -25,12 +25,12 @@ #define BROWSER_DATA_KEY "image-viewer-preference-data" +#define GET_WIDGET(x) (_gtk_builder_get_widget (data->builder, (x))) typedef struct { GtkBuilder *builder; - GtkWidget *change_zoom_combobox; - GtkWidget *transp_type_combobox; + GSettings *settings; } BrowserData; @@ -38,24 +38,25 @@ browser_data_free (BrowserData *data) { g_object_unref (data->builder); + g_object_unref (data->settings); g_free (data); } static void zoom_quality_changed_cb (GtkComboBox *combo_box, - BrowserData *data) + BrowserData *data) { - eel_gconf_set_enum (PREF_ZOOM_QUALITY, GTH_TYPE_ZOOM_QUALITY, gtk_combo_box_get_active (combo_box)); + g_settings_set_enum (data->settings, PREF_IMAGE_VIEWER_ZOOM_QUALITY, gtk_combo_box_get_active (combo_box)); } static void zoom_change_changed_cb (GtkComboBox *combo_box, - BrowserData *data) + BrowserData *data) { - eel_gconf_set_enum (PREF_ZOOM_CHANGE, GTH_TYPE_ZOOM_CHANGE, gtk_combo_box_get_active (combo_box)); + g_settings_set_enum (data->settings, PREF_IMAGE_VIEWER_ZOOM_CHANGE, gtk_combo_box_get_active (combo_box)); } @@ -63,7 +64,7 @@ reset_scrollbars_toggled_cb (GtkToggleButton *button, BrowserData *data) { - eel_gconf_set_boolean (PREF_RESET_SCROLLBARS, gtk_toggle_button_get_active (button)); + g_settings_set_boolean (data->settings, PREF_IMAGE_VIEWER_RESET_SCROLLBARS, gtk_toggle_button_get_active (button)); } @@ -71,7 +72,7 @@ transp_type_changed_cb (GtkComboBox *combo_box, BrowserData *data) { - eel_gconf_set_enum (PREF_TRANSP_TYPE, GTH_TYPE_TRANSP_TYPE, gtk_combo_box_get_active (combo_box)); + g_settings_set_enum (data->settings, PREF_IMAGE_VIEWER_TRANSP_TYPE, gtk_combo_box_get_active (combo_box)); } @@ -87,49 +88,36 @@ data = g_new0 (BrowserData, 1); data->builder = _gtk_builder_new_from_file ("image-viewer-preferences.ui", "image_viewer"); + data->settings = g_settings_new (GTHUMB_IMAGE_VIEWER_SCHEMA); notebook = _gtk_builder_get_widget (dialog_builder, "notebook"); page = _gtk_builder_get_widget (data->builder, "preferences_page"); + g_object_set_data (G_OBJECT (page), "extension-name", "image_viewer"); gtk_widget_show (page); - data->change_zoom_combobox = _gtk_combo_box_new_with_texts (_("Set to actual size"), - _("Keep previous zoom"), - _("Fit to window"), - _("Fit to window if larger"), - _("Fit to width"), - _("Fit to width if larger"), - NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (data->change_zoom_combobox), eel_gconf_get_enum (PREF_ZOOM_CHANGE, GTH_TYPE_ZOOM_CHANGE, GTH_ZOOM_CHANGE_FIT_SIZE_IF_LARGER)); - gtk_widget_show (data->change_zoom_combobox); - gtk_box_pack_start (GTK_BOX (_gtk_builder_get_widget (data->builder, "zoom_change_box")), data->change_zoom_combobox, FALSE, FALSE, 0); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (data->builder, "toggle_reset_scrollbars")), eel_gconf_get_boolean (PREF_RESET_SCROLLBARS, TRUE)); - - data->transp_type_combobox = _gtk_combo_box_new_with_texts (_("White"), - _("None"), - _("Black"), - _("Checked"), - NULL); - gtk_combo_box_set_active (GTK_COMBO_BOX (data->transp_type_combobox), eel_gconf_get_enum (PREF_TRANSP_TYPE, GTH_TYPE_TRANSP_TYPE, GTH_TRANSP_TYPE_NONE)); - gtk_widget_show (data->transp_type_combobox); - gtk_box_pack_start (GTK_BOX (_gtk_builder_get_widget (data->builder, "transp_type_box")), data->transp_type_combobox, FALSE, FALSE, 0); - - gtk_combo_box_set_active (GTK_COMBO_BOX (_gtk_builder_get_widget (data->builder, "zoom_quality_combobox")), eel_gconf_get_enum (PREF_ZOOM_QUALITY, GTH_TYPE_ZOOM_QUALITY, GTH_ZOOM_QUALITY_LOW)); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("change_zoom_combobox")), + g_settings_get_enum (data->settings, PREF_IMAGE_VIEWER_ZOOM_CHANGE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("toggle_reset_scrollbars")), + g_settings_get_boolean (data->settings, PREF_IMAGE_VIEWER_RESET_SCROLLBARS)); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("transp_type_combobox")), + g_settings_get_enum (data->settings, PREF_IMAGE_VIEWER_TRANSP_TYPE)); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("zoom_quality_combobox")), + g_settings_get_enum (data->settings, PREF_IMAGE_VIEWER_ZOOM_QUALITY)); - g_signal_connect (_gtk_builder_get_widget (data->builder, "zoom_quality_combobox"), + g_signal_connect (GET_WIDGET ("zoom_quality_combobox"), "changed", G_CALLBACK (zoom_quality_changed_cb), data); - g_signal_connect (G_OBJECT (data->change_zoom_combobox), + g_signal_connect (GET_WIDGET ("change_zoom_combobox"), "changed", G_CALLBACK (zoom_change_changed_cb), data); - g_signal_connect (G_OBJECT (data->transp_type_combobox), + g_signal_connect (GET_WIDGET ("transp_type_combobox"), "changed", G_CALLBACK (transp_type_changed_cb), data); - g_signal_connect (G_OBJECT (_gtk_builder_get_widget (data->builder, "toggle_reset_scrollbars")), + g_signal_connect (GET_WIDGET ("toggle_reset_scrollbars"), "toggled", G_CALLBACK (reset_scrollbars_toggled_cb), data); diff -Nru gthumb-2.14.3/extensions/image_viewer/preferences.h gthumb-3.0.0/extensions/image_viewer/preferences.h --- gthumb-2.14.3/extensions/image_viewer/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/image_viewer/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -24,14 +24,19 @@ #include -#define PREF_VIEWER_ZOOM_QUALITY "/apps/gthumb/viewer/zoom_quality" -#define PREF_VIEWER_ZOOM_CHANGE "/apps/gthumb/viewer/zoom_change" -#define PREF_VIEWER_TRANSP_TYPE "/apps/gthumb/viewer/transparency_type" -#define PREF_VIEWER_RESET_SCROLLBARS "/apps/gthumb/viewer/reset_scrollbars" -#define PREF_VIEWER_CHECK_TYPE "/apps/gthumb/viewer/check_type" -#define PREF_VIEWER_CHECK_SIZE "/apps/gthumb/viewer/check_size" -#define PREF_VIEWER_BLACK_BACKGROUND "/apps/gthumb/viewer/black_background" -#define PREF_VIEWER_SHRINK_WRAP "/apps/gthumb/viewer/shrink_wrap" +/* schema */ + +#define GTHUMB_IMAGE_VIEWER_SCHEMA GTHUMB_SCHEMA ".image-viewer" + +/* keys */ + +#define PREF_IMAGE_VIEWER_ZOOM_QUALITY "zoom-quality" +#define PREF_IMAGE_VIEWER_ZOOM_CHANGE "zoom-change" +#define PREF_IMAGE_VIEWER_TRANSP_TYPE "transparency-type" +#define PREF_IMAGE_VIEWER_RESET_SCROLLBARS "reset-scrollbars" +#define PREF_IMAGE_VIEWER_CHECK_TYPE "check-type" +#define PREF_IMAGE_VIEWER_CHECK_SIZE "check-size" +#define PREF_IMAGE_VIEWER_BLACK_BACKGROUND "black-background" void image_viewer__dlg_preferences_construct_cb (GtkWidget *dialog, GthBrowser *browser, diff -Nru gthumb-2.14.3/extensions/importer/data/gthumb-importer.schemas.in gthumb-3.0.0/extensions/importer/data/gthumb-importer.schemas.in --- gthumb-2.14.3/extensions/importer/data/gthumb-importer.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/data/gthumb-importer.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/importer/destination - /apps/gthumb/ext/importer/destination - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/importer/subfolder_type - /apps/gthumb/ext/importer/subfolder_type - gthumb - string - none - - - Possible values are: none, file_date, current_date - - - - - - /schemas/apps/gthumb/ext/importer/subfolder_format - /apps/gthumb/ext/importer/subfolder_format - gthumb - string - yyyymmdd - - - Possible values are: yyyymmdd, yyyymm, yyyy - - - - - - /schemas/apps/gthumb/ext/importer/subfolder_single - /apps/gthumb/ext/importer/subfolder_single - gthumb - bool - FALSE - - - - - - - - - /schemas/apps/gthumb/ext/importer/subfolder_custom_format - /apps/gthumb/ext/importer/subfolder_custom_format - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/importer/warn_delete_unsupported - /apps/gthumb/ext/importer/warn_delete_unsupported - gthumb - bool - TRUE - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/importer/data/Makefile.am gthumb-3.0.0/extensions/importer/data/Makefile.am --- gthumb-2.14.3/extensions/importer/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-importer.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/importer/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/importer/data/Makefile.in gthumb-3.0.0/extensions/importer/data/Makefile.in --- gthumb-2.14.3/extensions/importer/data/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/data/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-importer.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/importer/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/importer/data/ui/Makefile.in gthumb-3.0.0/extensions/importer/data/ui/Makefile.in --- gthumb-2.14.3/extensions/importer/data/ui/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/data/ui/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/importer/gth-import-destination-button.c gthumb-3.0.0/extensions/importer/gth-import-destination-button.c --- gthumb-2.14.3/extensions/importer/gth-import-destination-button.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/gth-import-destination-button.c 2012-02-19 15:01:32.000000000 +0000 @@ -24,7 +24,7 @@ #include "gth-import-destination-button.h" -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthImportDestinationButton, gth_import_destination_button, GTK_TYPE_BUTTON) struct _GthImportDestinationButtonPrivate { @@ -83,7 +83,7 @@ static void gth_import_destination_button_realize (GtkWidget *widget) { - GTK_WIDGET_CLASS (parent_class)->realize (widget); + GTK_WIDGET_CLASS (gth_import_destination_button_parent_class)->realize (widget); _update_subfolder_label_color (GTH_IMPORT_DESTINATION_BUTTON (widget)); } @@ -93,7 +93,6 @@ { GtkWidgetClass *widget_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthImportDestinationButtonPrivate)); widget_class = (GtkWidgetClass*) klass; @@ -102,9 +101,9 @@ static void -subfolder_label_state_changed_cb (GtkWidget *widget, - GtkStateType state, - gpointer user_data) +subfolder_label_state_flags_changed_cb (GtkWidget *widget, + GtkStateFlags flags, + gpointer user_data) { _update_subfolder_label_color (GTH_IMPORT_DESTINATION_BUTTON (user_data)); } @@ -118,7 +117,7 @@ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMPORT_DESTINATION_BUTTON, GthImportDestinationButtonPrivate); - box = gtk_hbox_new (FALSE, 6); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (box); gtk_container_add (GTK_CONTAINER (self), box); @@ -126,7 +125,7 @@ gtk_widget_show (self->priv->destination_icon); gtk_box_pack_start (GTK_BOX (box), self->priv->destination_icon, FALSE, FALSE, 0); - label_box = gtk_hbox_new (FALSE, 0); + label_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (label_box); gtk_box_pack_start (GTK_BOX (box), label_box, TRUE, TRUE, 0); @@ -142,40 +141,12 @@ gtk_box_pack_start (GTK_BOX (label_box), self->priv->subfolder_label, TRUE, TRUE, 0); g_signal_connect (self->priv->subfolder_label, - "state-changed", - G_CALLBACK (subfolder_label_state_changed_cb), + "state-flags-changed", + G_CALLBACK (subfolder_label_state_flags_changed_cb), self); } -GType -gth_import_destination_button_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthImportDestinationButtonClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_import_destination_button_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthImportDestinationButton), - 0, - (GInstanceInitFunc) gth_import_destination_button_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_BUTTON, - "GthImportDestinationButton", - &g_define_type_info, - 0); - } - - return type; -} - - static void preferences_dialog_destination_changed_cb (GthImportPreferencesDialog *dialog, GthImportDestinationButton *self) diff -Nru gthumb-2.14.3/extensions/importer/gth-import-preferences-dialog.c gthumb-3.0.0/extensions/importer/gth-import-preferences-dialog.c --- gthumb-2.14.3/extensions/importer/gth-import-preferences-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/gth-import-preferences-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -30,6 +30,9 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) +G_DEFINE_TYPE (GthImportPreferencesDialog, gth_import_preferences_dialog, GTK_TYPE_DIALOG) + + /* Signals */ enum { DESTINATION_CHANGED, @@ -37,12 +40,12 @@ }; -static gpointer parent_class = NULL; static guint signals[LAST_SIGNAL] = { 0 }; struct _GthImportPreferencesDialogPrivate { GtkBuilder *builder; + GSettings *settings; GtkWidget *subfolder_type_list; GtkWidget *subfolder_format_list; char *event; @@ -57,10 +60,11 @@ self = GTH_IMPORT_PREFERENCES_DIALOG (object); + _g_object_unref (self->priv->settings); _g_object_unref (self->priv->builder); g_free (self->priv->event); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_import_preferences_dialog_parent_class)->finalize (object); } @@ -69,7 +73,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthImportPreferencesDialogPrivate)); object_class = (GObjectClass*) klass; @@ -113,22 +116,22 @@ char *uri; uri = g_file_get_uri (destination); - eel_gconf_set_string (PREF_IMPORT_DESTINATION, uri); + g_settings_set_string (self->priv->settings, PREF_IMPORTER_DESTINATION, uri); g_free (uri); } single_subfolder = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_subfolder_checkbutton"))); - eel_gconf_set_boolean (PREF_IMPORT_SUBFOLDER_SINGLE, single_subfolder); + g_settings_set_boolean (self->priv->settings, PREF_IMPORTER_SUBFOLDER_SINGLE, single_subfolder); subfolder_type = get_subfolder_type (self); - eel_gconf_set_enum (PREF_IMPORT_SUBFOLDER_TYPE, GTH_TYPE_SUBFOLDER_TYPE, subfolder_type); + g_settings_set_enum (self->priv->settings, PREF_IMPORTER_SUBFOLDER_TYPE, subfolder_type); subfolder_format = gtk_combo_box_get_active (GTK_COMBO_BOX (self->priv->subfolder_format_list)); - eel_gconf_set_enum (PREF_IMPORT_SUBFOLDER_FORMAT, GTH_TYPE_SUBFOLDER_FORMAT, subfolder_format); + g_settings_set_enum (self->priv->settings, PREF_IMPORTER_SUBFOLDER_FORMAT, subfolder_format); custom_format = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("custom_format_entry"))); - eel_gconf_set_string (PREF_IMPORT_SUBFOLDER_CUSTOM_FORMAT, custom_format); + g_settings_set_string (self->priv->settings, PREF_IMPORTER_SUBFOLDER_CUSTOM_FORMAT, custom_format); _g_object_unref (destination); } @@ -309,6 +312,7 @@ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMPORT_PREFERENCES_DIALOG, GthImportPreferencesDialogPrivate); self->priv->builder = _gtk_builder_new_from_file ("import-preferences.ui", "importer"); + self->priv->settings = g_settings_new (GTHUMB_IMPORTER_SCHEMA); self->priv->help_visible = FALSE; gtk_window_set_title (GTK_WINDOW (self), _("Preferences")); @@ -352,13 +356,16 @@ gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), destination, NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_subfolder_checkbutton")), eel_gconf_get_boolean (PREF_IMPORT_SUBFOLDER_SINGLE, FALSE)); - subfolder_type = eel_gconf_get_enum (PREF_IMPORT_SUBFOLDER_TYPE, GTH_TYPE_SUBFOLDER_TYPE, GTH_SUBFOLDER_TYPE_FILE_DATE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_subfolder_checkbutton")), + g_settings_get_boolean (self->priv->settings, PREF_IMPORTER_SUBFOLDER_SINGLE)); + subfolder_type = g_settings_get_enum (self->priv->settings, PREF_IMPORTER_SUBFOLDER_TYPE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("autosubfolder_checkbutton")), subfolder_type != GTH_SUBFOLDER_TYPE_NONE); - gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->subfolder_type_list), (subfolder_type == 0) ? 0 : subfolder_type - 1); - gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->subfolder_format_list), eel_gconf_get_enum (PREF_IMPORT_SUBFOLDER_FORMAT, GTH_TYPE_SUBFOLDER_FORMAT, GTH_SUBFOLDER_FORMAT_YYYYMMDD)); + gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->subfolder_type_list), + (subfolder_type == 0) ? 0 : subfolder_type - 1); + gtk_combo_box_set_active (GTK_COMBO_BOX (self->priv->subfolder_format_list), + g_settings_get_enum (self->priv->settings, PREF_IMPORTER_SUBFOLDER_FORMAT)); - custom_format = eel_gconf_get_string (PREF_IMPORT_SUBFOLDER_CUSTOM_FORMAT, ""); + custom_format = g_settings_get_string (self->priv->settings, PREF_IMPORTER_SUBFOLDER_CUSTOM_FORMAT); if (custom_format != NULL) { gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("custom_format_entry")), custom_format); g_free (custom_format); @@ -411,34 +418,6 @@ } -GType -gth_import_preferences_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthImportPreferencesDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_import_preferences_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthImportPreferencesDialog), - 0, - (GInstanceInitFunc) gth_import_preferences_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthImportPreferencesDialog", - &g_define_type_info, - 0); - } - - return type; -} - - GtkWidget * gth_import_preferences_dialog_new (void) { diff -Nru gthumb-2.14.3/extensions/importer/gth-import-task.c gthumb-3.0.0/extensions/importer/gth-import-task.c --- gthumb-2.14.3/extensions/importer/gth-import-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/gth-import-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -31,6 +31,9 @@ #define IMPORTED_KEY "imported" +G_DEFINE_TYPE (GthImportTask, gth_import_task, GTH_TYPE_TASK) + + struct _GthImportTaskPrivate { GthBrowser *browser; GList *files; @@ -62,9 +65,6 @@ }; -static gpointer parent_class = NULL; - - static void gth_import_task_finalize (GObject *object) { @@ -88,7 +88,7 @@ _g_object_unref (self->priv->imported_catalog); g_object_unref (self->priv->browser); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_import_task_parent_class)->finalize (object); } @@ -605,12 +605,15 @@ gtk_widget_show (d); } else { + GSettings *settings; + if ((self->priv->subfolder_type != GTH_SUBFOLDER_TYPE_NONE) && (self->priv->imported_catalog != NULL)) gth_browser_go_to (self->priv->browser, self->priv->imported_catalog, NULL); else gth_browser_go_to (self->priv->browser, self->priv->destination, NULL); - if (self->priv->delete_not_supported && eel_gconf_get_boolean (PREF_IMPORT_WARN_DELETE_UNSUPPORTED, TRUE)) { + settings = g_settings_new (GTHUMB_IMPORTER_SCHEMA); + if (self->priv->delete_not_supported && g_settings_get_boolean (settings, PREF_IMPORTER_WARN_DELETE_UNSUPPORTED)) { GtkWidget *d; d = _gtk_message_dialog_new (GTK_WINDOW (self->priv->browser), @@ -625,8 +628,10 @@ NULL); gtk_widget_show (d); - eel_gconf_set_boolean (PREF_IMPORT_WARN_DELETE_UNSUPPORTED, FALSE); + g_settings_set_boolean (settings, PREF_IMPORTER_WARN_DELETE_UNSUPPORTED, FALSE); } + + g_object_unref (settings); } gth_task_completed (GTH_TASK (self), NULL); @@ -731,7 +736,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthImportTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -756,34 +760,6 @@ } -GType -gth_import_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthImportTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_import_task_class_init, - NULL, - NULL, - sizeof (GthImportTask), - 0, - (GInstanceInitFunc) gth_import_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthImportTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_import_task_new (GthBrowser *browser, GList *files, @@ -867,8 +843,8 @@ char *free_space_s; destination_name = g_file_get_parse_name (destination); - min_free_space_s = g_format_size_for_display (min_free_space); - free_space_s = g_format_size_for_display (free_space); + min_free_space_s = g_format_size (min_free_space); + free_space_s = g_format_size (free_space); *error = g_error_new (G_IO_ERROR, G_IO_ERROR_NO_SPACE, diff -Nru gthumb-2.14.3/extensions/importer/importer.extension.in.in gthumb-3.0.0/extensions/importer/importer.extension.in.in --- gthumb-2.14.3/extensions/importer/importer.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/importer.extension.in.in 2012-04-21 09:24:32.000000000 +0000 @@ -4,4 +4,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% After=catalogs diff -Nru gthumb-2.14.3/extensions/importer/Makefile.am gthumb-3.0.0/extensions/importer/Makefile.am --- gthumb-2.14.3/extensions/importer/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/Makefile.am 2012-04-20 21:11:10.000000000 +0000 @@ -45,9 +45,12 @@ main.c \ utils.c -libimporter_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +libimporter_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libimporter_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libimporter_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la ../image_rotation/libimage_rotation.la +libimporter_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la +if ENABLE_JPEG_TOOLS +libimporter_la_LIBADD += ../image_rotation/libimage_rotation.la +endif if ENABLE_EXIV2 libimporter_la_LIBADD += ../exiv2_tools/libexiv2_tools.la endif diff -Nru gthumb-2.14.3/extensions/importer/Makefile.in gthumb-3.0.0/extensions/importer/Makefile.in --- gthumb-2.14.3/extensions/importer/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,7 +52,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@ENABLE_EXIV2_TRUE@am__append_1 = ../exiv2_tools/libexiv2_tools.la +@ENABLE_JPEG_TOOLS_TRUE@am__append_1 = ../image_rotation/libimage_rotation.la +@ENABLE_EXIV2_TRUE@am__append_2 = ../exiv2_tools/libexiv2_tools.la subdir = extensions/importer DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -131,6 +149,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -210,10 +233,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -221,6 +242,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -260,6 +282,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -308,8 +332,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -340,6 +362,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -394,10 +417,10 @@ main.c \ utils.c -libimporter_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +libimporter_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libimporter_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) libimporter_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la \ - ../image_rotation/libimage_rotation.la $(am__append_1) + $(am__append_1) $(am__append_2) libimporter_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) extensionini_in_files = importer.extension.in.in @@ -443,7 +466,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -451,6 +473,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -558,8 +582,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -742,13 +769,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/importer/preferences.h gthumb-3.0.0/extensions/importer/preferences.h --- gthumb-2.14.3/extensions/importer/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -26,12 +26,18 @@ G_BEGIN_DECLS -#define PREF_IMPORT_DESTINATION "/apps/gthumb/ext/importer/destination" -#define PREF_IMPORT_SUBFOLDER_TYPE "/apps/gthumb/ext/importer/subfolder_type" -#define PREF_IMPORT_SUBFOLDER_FORMAT "/apps/gthumb/ext/importer/subfolder_format" -#define PREF_IMPORT_SUBFOLDER_SINGLE "/apps/gthumb/ext/importer/subfolder_single" -#define PREF_IMPORT_SUBFOLDER_CUSTOM_FORMAT "/apps/gthumb/ext/importer/subfolder_custom_format" -#define PREF_IMPORT_WARN_DELETE_UNSUPPORTED "/apps/gthumb/ext/importer/warn_delete_unsupported" +/* schemas */ + +#define GTHUMB_IMPORTER_SCHEMA GTHUMB_SCHEMA ".importer" + +/* keys: viewer */ + +#define PREF_IMPORTER_DESTINATION "destination" +#define PREF_IMPORTER_SUBFOLDER_TYPE "subfolder-type" +#define PREF_IMPORTER_SUBFOLDER_FORMAT "subfolder-format" +#define PREF_IMPORTER_SUBFOLDER_SINGLE "subfolder-single" +#define PREF_IMPORTER_SUBFOLDER_CUSTOM_FORMAT "subfolder-custom-format" +#define PREF_IMPORTER_WARN_DELETE_UNSUPPORTED "warn-delete-unsupported" G_END_DECLS diff -Nru gthumb-2.14.3/extensions/importer/utils.c gthumb-3.0.0/extensions/importer/utils.c --- gthumb-2.14.3/extensions/importer/utils.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/importer/utils.c 2012-02-19 15:01:32.000000000 +0000 @@ -28,16 +28,19 @@ GFile * gth_import_preferences_get_destination (void) { - char *last_destination; - GFile *folder; + GSettings *settings; + char *last_destination; + GFile *folder; - last_destination = eel_gconf_get_string (PREF_IMPORT_DESTINATION, NULL); + settings = g_settings_new (GTHUMB_IMPORTER_SCHEMA); + last_destination = g_settings_get_string (settings, PREF_IMPORTER_DESTINATION); if ((last_destination == NULL) || (*last_destination == 0)) folder = g_file_new_for_path (g_get_user_special_dir (G_USER_DIRECTORY_PICTURES)); else folder = g_file_new_for_uri (last_destination); g_free (last_destination); + g_object_unref (settings); return folder; } diff -Nru gthumb-2.14.3/extensions/jpeg_utils/jpegtran.c gthumb-3.0.0/extensions/jpeg_utils/jpegtran.c --- gthumb-2.14.3/extensions/jpeg_utils/jpegtran.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/jpeg_utils/jpegtran.c 2012-02-19 15:01:32.000000000 +0000 @@ -159,6 +159,7 @@ switch (transformation) { case GTH_TRANSFORM_NONE: + default: transform = JXFORM_NONE; break; case GTH_TRANSFORM_FLIP_H: diff -Nru gthumb-2.14.3/extensions/jpeg_utils/jpeg_utils.extension.in.in gthumb-3.0.0/extensions/jpeg_utils/jpeg_utils.extension.in.in --- gthumb-2.14.3/extensions/jpeg_utils/jpeg_utils.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/jpeg_utils/jpeg_utils.extension.in.in 2012-04-21 09:24:29.000000000 +0000 @@ -4,3 +4,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/jpeg_utils/Makefile.am gthumb-3.0.0/extensions/jpeg_utils/Makefile.am --- gthumb-2.14.3/extensions/jpeg_utils/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/jpeg_utils/Makefile.am 2012-04-20 20:52:39.000000000 +0000 @@ -1,7 +1,8 @@ +if ENABLE_JPEG_TOOLS + extensiondir = $(pkglibdir)/extensions extension_LTLIBRARIES = libjpeg_utils.la -if ENABLE_JPEG_TOOLS libjpeg_utils_la_SOURCES = \ jmemorydest.c \ jmemorydest.h \ @@ -24,10 +25,6 @@ transupp-62.c \ transupp-62.h endif - -else -libjpeg_utils_la_SOURCES = -endif libjpeg_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libjpeg_utils_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) @@ -35,14 +32,16 @@ libjpeg_utils_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) -extensionini_in_files = jpeg_utils.extension.in.in extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) +DISTCLEANFILES = $(extensionini_DATA) + +endif + +extensionini_in_files = jpeg_utils.extension.in.in @GTHUMB_EXTENSION_IN_RULE@ @GTHUMB_EXTENSION_RULE@ EXTRA_DIST = $(extensionini_in_files) README.6b README.8a -DISTCLEANFILES = $(extensionini_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/jpeg_utils/Makefile.in gthumb-3.0.0/extensions/jpeg_utils/Makefile.in --- gthumb-2.14.3/extensions/jpeg_utils/Makefile.in 2012-03-25 18:34:12.000000000 +0000 +++ gthumb-3.0.0/extensions/jpeg_utils/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -110,6 +127,8 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libjpeg_utils_la_CFLAGS) $(CFLAGS) \ $(libjpeg_utils_la_LDFLAGS) $(LDFLAGS) -o $@ +@ENABLE_JPEG_TOOLS_TRUE@am_libjpeg_utils_la_rpath = -rpath \ +@ENABLE_JPEG_TOOLS_TRUE@ $(extensiondir) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -138,6 +157,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libjpeg_utils_la_SOURCES) DIST_SOURCES = $(am__libjpeg_utils_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) ETAGS = etags CTAGS = ctags @@ -186,10 +210,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -197,6 +219,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -236,6 +259,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -284,8 +309,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -316,6 +339,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -346,23 +370,22 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -extensiondir = $(pkglibdir)/extensions -extension_LTLIBRARIES = libjpeg_utils.la -@ENABLE_JPEG_TOOLS_FALSE@libjpeg_utils_la_SOURCES = +@ENABLE_JPEG_TOOLS_TRUE@extensiondir = $(pkglibdir)/extensions +@ENABLE_JPEG_TOOLS_TRUE@extension_LTLIBRARIES = libjpeg_utils.la @ENABLE_JPEG_TOOLS_TRUE@libjpeg_utils_la_SOURCES = jmemorydest.c \ @ENABLE_JPEG_TOOLS_TRUE@ jmemorydest.h jmemorysrc.c \ @ENABLE_JPEG_TOOLS_TRUE@ jmemorysrc.h jpeg-info.c jpeg-info.h \ @ENABLE_JPEG_TOOLS_TRUE@ jpegtran.c jpegtran.h transupp.h \ @ENABLE_JPEG_TOOLS_TRUE@ main.c $(am__append_1) $(am__append_2) -libjpeg_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb -libjpeg_utils_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libjpeg_utils_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) -libjpeg_utils_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) -extensioninidir = $(extensiondir) +@ENABLE_JPEG_TOOLS_TRUE@libjpeg_utils_la_CFLAGS = $(GTHUMB_CFLAGS) $(JPEG_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +@ENABLE_JPEG_TOOLS_TRUE@libjpeg_utils_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) +@ENABLE_JPEG_TOOLS_TRUE@libjpeg_utils_la_LIBADD = $(GTHUMB_LIBS) $(JPEG_LIBS) +@ENABLE_JPEG_TOOLS_TRUE@libjpeg_utils_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) +@ENABLE_JPEG_TOOLS_TRUE@extensioninidir = $(extensiondir) +@ENABLE_JPEG_TOOLS_TRUE@extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) +@ENABLE_JPEG_TOOLS_TRUE@DISTCLEANFILES = $(extensionini_DATA) extensionini_in_files = jpeg_utils.extension.in.in -extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) EXTRA_DIST = $(extensionini_in_files) README.6b README.8a -DISTCLEANFILES = $(extensionini_DATA) all: all-am .SUFFIXES: @@ -399,7 +422,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -407,6 +429,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -429,7 +453,7 @@ rm -f "$${dir}/so_locations"; \ done libjpeg_utils.la: $(libjpeg_utils_la_OBJECTS) $(libjpeg_utils_la_DEPENDENCIES) $(EXTRA_libjpeg_utils_la_DEPENDENCIES) - $(AM_V_CCLD)$(libjpeg_utils_la_LINK) -rpath $(extensiondir) $(libjpeg_utils_la_OBJECTS) $(libjpeg_utils_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libjpeg_utils_la_LINK) $(am_libjpeg_utils_la_rpath) $(libjpeg_utils_la_OBJECTS) $(libjpeg_utils_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -522,8 +546,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/jpeg_utils/transupp-62.h gthumb-3.0.0/extensions/jpeg_utils/transupp-62.h --- gthumb-2.14.3/extensions/jpeg_utils/transupp-62.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/jpeg_utils/transupp-62.h 2012-02-19 15:01:32.000000000 +0000 @@ -51,7 +51,7 @@ #include -typedef enum { +typedef enum { /*< skip >*/ JXFORM_NONE, /* no transformation */ JXFORM_FLIP_H, /* horizontal flip */ JXFORM_FLIP_V, /* vertical flip */ @@ -131,7 +131,7 @@ * Support for copying optional markers from source to destination file. */ -typedef enum { +typedef enum { /*< skip >*/ JCOPYOPT_NONE, /* copy no optional markers */ JCOPYOPT_COMMENTS, /* copy only comment (COM) markers */ JCOPYOPT_ALL /* copy all optional markers */ diff -Nru gthumb-2.14.3/extensions/jpeg_utils/transupp-80.h gthumb-3.0.0/extensions/jpeg_utils/transupp-80.h --- gthumb-2.14.3/extensions/jpeg_utils/transupp-80.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/jpeg_utils/transupp-80.h 2012-02-19 15:01:32.000000000 +0000 @@ -96,7 +96,7 @@ * Codes for supported types of image transformations. */ -typedef enum { +typedef enum { /*< skip >*/ JXFORM_NONE, /* no transformation */ JXFORM_FLIP_H, /* horizontal flip */ JXFORM_FLIP_V, /* vertical flip */ @@ -112,7 +112,7 @@ * positive, or negative. (Negative width or height makes no sense, though.) */ -typedef enum { +typedef enum { /*< skip >*/ JCROP_UNSET, JCROP_POS, JCROP_NEG @@ -196,7 +196,7 @@ * Support for copying optional markers from source to destination file. */ -typedef enum { +typedef enum { /*< skip >*/ JCOPYOPT_NONE, /* copy no optional markers */ JCOPYOPT_COMMENTS, /* copy only comment (COM) markers */ JCOPYOPT_ALL /* copy all optional markers */ diff -Nru gthumb-2.14.3/extensions/list_tools/callbacks.c gthumb-3.0.0/extensions/list_tools/callbacks.c --- gthumb-2.14.3/extensions/list_tools/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/callbacks.c 2012-03-22 09:23:48.000000000 +0000 @@ -35,6 +35,16 @@ static const char *fixed_ui_info = "" +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " /* " " " " @@ -49,6 +59,7 @@ */ " " " " +" " " " " " " " @@ -72,17 +83,86 @@ GthBrowser *browser; GtkActionGroup *action_group; gulong scripts_changed_id; + gboolean menu_initialized; } BrowserData; static void browser_data_free (BrowserData *data) { - g_signal_handler_disconnect (gth_script_file_get (), data->scripts_changed_id); + if (data->scripts_changed_id != 0) + g_signal_handler_disconnect (gth_script_file_get (), data->scripts_changed_id); g_free (data); } +static GtkWidget * +get_widget_with_prefix (BrowserData *data, + const char *prefix, + const char *path) +{ + char *full_path; + GtkWidget *widget; + + full_path = g_strconcat (prefix, path, NULL); + widget = gtk_ui_manager_get_widget (gth_browser_get_ui_manager (data->browser), full_path); + + g_free (full_path); + + return widget; +} + + +static void +_update_sensitivity (GthBrowser *browser, + const char *prefix) +{ + BrowserData *data; + int n_selected; + gboolean sensitive; + GtkWidget *separator1; + GtkWidget *separator2; + GtkWidget *menu; + + data = g_object_get_data (G_OBJECT (browser), BROWSER_DATA_KEY); + g_return_if_fail (data != NULL); + + n_selected = gth_file_selection_get_n_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); + sensitive = (n_selected > 0); + + separator1 = get_widget_with_prefix (data, prefix, "/ToolsSeparator"); + separator2 = get_widget_with_prefix (data, prefix, "/Scripts"); + menu = gtk_widget_get_parent (separator1); + { + GList *children; + GList *scan; + + children = gtk_container_get_children (GTK_CONTAINER (menu)); + + if (separator1 != NULL) { + for (scan = children; scan; scan = scan->next) + if (scan->data == separator1) { + scan = scan->next; + break; + } + } + else + scan = children; + + for (/* void */; scan && (scan->data != separator2); scan = scan->next) + gtk_widget_set_sensitive (scan->data, sensitive); + } +} + + +static void +list_tools__gth_browser_update_sensitivity_cb (GthBrowser *browser) +{ + _update_sensitivity (browser, "/ListToolsPopup"); + /*_update_sensitivity (browser, "/FileListPopup/Open_Actions/ExecWith");*/ +} + + static void exec_script (GthBrowser *browser, GthScript *script) @@ -119,23 +199,6 @@ } -static GtkWidget * -get_widget_with_prefix (BrowserData *data, - const char *prefix, - const char *path) -{ - char *full_path; - GtkWidget *widget; - - full_path = g_strconcat (prefix, path, NULL); - widget = gtk_ui_manager_get_widget (gth_browser_get_ui_manager (data->browser), full_path); - - g_free (full_path); - - return widget; -} - - static void _update_scripts_menu (BrowserData *data, const char *prefix) @@ -207,12 +270,36 @@ } +static void +list_tools_show_menu_func (GtkAction *action, + gpointer user_data) +{ + BrowserData *data = user_data; + GtkWidget *menu; + + if (! data->menu_initialized) { + data->menu_initialized = TRUE; + + menu = gtk_ui_manager_get_widget (gth_browser_get_ui_manager (data->browser), "/ListToolsPopup"); + g_object_set (action, "menu", menu, NULL); + update_scripts_menu (data); + + data->scripts_changed_id = g_signal_connect (gth_script_file_get (), + "changed", + G_CALLBACK (scripts_changed_cb), + data); + } + + list_tools__gth_browser_update_sensitivity_cb (data->browser); +} + + void list_tools__gth_browser_construct_cb (GthBrowser *browser) { BrowserData *data; + GtkAction *action; GError *error = NULL; - GtkToolItem *tool_item; g_return_if_fail (GTH_IS_BROWSER (browser)); @@ -224,6 +311,23 @@ action_entries, G_N_ELEMENTS (action_entries), browser); + + /* tools menu action */ + + action = g_object_new (GTH_TYPE_TOGGLE_MENU_ACTION, + "name", "ListTools", + "stock-id", GTK_STOCK_EXECUTE, + "label", _("Tools"), + "tooltip", _("Batch tools for multiple files"), + "is-important", TRUE, + NULL); + gth_toggle_menu_action_set_show_menu_func (GTH_TOGGLE_MENU_ACTION (action), + list_tools_show_menu_func, + data, + NULL); + gtk_action_group_add_action (data->action_group, action); + g_object_unref (action); + gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->action_group, 0); if (! gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), fixed_ui_info, -1, &error)) { @@ -231,87 +335,7 @@ g_clear_error (&error); } - /* tools menu button */ - - tool_item = g_object_new (GTH_TYPE_TOGGLE_MENU_TOOL_BUTTON, - "stock-id", GTK_STOCK_EXECUTE, - "label", _("Tools"), - NULL); - gtk_widget_set_tooltip_text (GTK_WIDGET (tool_item), _("Batch tools for multiple files")); - gth_toggle_menu_tool_button_set_menu (GTH_TOGGLE_MENU_TOOL_BUTTON (tool_item), - gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ListToolsPopup")); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (tool_item), TRUE); - gtk_widget_show (GTK_WIDGET (tool_item)); - gtk_toolbar_insert (GTK_TOOLBAR (gth_browser_get_browser_toolbar (browser)), tool_item, -1); - - tool_item = g_object_new (GTH_TYPE_TOGGLE_MENU_TOOL_BUTTON, - "stock-id", GTK_STOCK_EXECUTE, - "label", _("Tools"), - NULL); - gtk_widget_set_tooltip_text (GTK_WIDGET (tool_item), _("Batch tools for multiple files")); - gth_toggle_menu_tool_button_set_menu (GTH_TOGGLE_MENU_TOOL_BUTTON (tool_item), - gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ListToolsPopup")); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (tool_item), TRUE); - gtk_widget_show (GTK_WIDGET (tool_item)); - gtk_toolbar_insert (GTK_TOOLBAR (gth_browser_get_viewer_toolbar (browser)), tool_item, 9); - g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); - - update_scripts_menu (data); - data->scripts_changed_id = g_signal_connect (gth_script_file_get (), - "changed", - G_CALLBACK (scripts_changed_cb), - data); -} - - -static void -_update_sensitivity (GthBrowser *browser, - const char *prefix) -{ - BrowserData *data; - int n_selected; - gboolean sensitive; - GtkWidget *separator1; - GtkWidget *separator2; - GtkWidget *menu; - - data = g_object_get_data (G_OBJECT (browser), BROWSER_DATA_KEY); - g_return_if_fail (data != NULL); - - n_selected = gth_file_selection_get_n_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); - sensitive = (n_selected > 0); - - separator1 = get_widget_with_prefix (data, prefix, "/ToolsSeparator"); - separator2 = get_widget_with_prefix (data, prefix, "/Scripts"); - menu = gtk_widget_get_parent (separator1); - { - GList *children; - GList *scan; - - children = gtk_container_get_children (GTK_CONTAINER (menu)); - - if (separator1 != NULL) { - for (scan = children; scan; scan = scan->next) - if (scan->data == separator1) { - scan = scan->next; - break; - } - } - else - scan = children; - - for (/* void */; scan && (scan->data != separator2); scan = scan->next) - gtk_widget_set_sensitive (scan->data, sensitive); - } -} - - -void -list_tools__gth_browser_update_sensitivity_cb (GthBrowser *browser) -{ - _update_sensitivity (browser, "/ListToolsPopup"); - /*_update_sensitivity (browser, "/FileListPopup/Open_Actions/ExecWith");*/ } diff -Nru gthumb-2.14.3/extensions/list_tools/callbacks.h gthumb-3.0.0/extensions/list_tools/callbacks.h --- gthumb-2.14.3/extensions/list_tools/callbacks.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/callbacks.h 2012-02-19 15:01:32.000000000 +0000 @@ -25,7 +25,6 @@ #include void list_tools__gth_browser_construct_cb (GthBrowser *browser); -void list_tools__gth_browser_update_sensitivity_cb (GthBrowser *browser); gpointer list_tools__gth_browser_file_list_key_press_cb (GthBrowser *browser, GdkEventKey *event); diff -Nru gthumb-2.14.3/extensions/list_tools/data/Makefile.in gthumb-3.0.0/extensions/list_tools/data/Makefile.in --- gthumb-2.14.3/extensions/list_tools/data/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/data/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/list_tools/data/ui/ask-value.ui gthumb-3.0.0/extensions/list_tools/data/ui/ask-value.ui --- gthumb-2.14.3/extensions/list_tools/data/ui/ask-value.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/data/ui/ask-value.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,35 +1,102 @@ - + - 500 + False 5 dialog - + True + False vertical 2 + + + True + False + end + + + _Skip + False + True + True + True + False + True + + + False + False + 0 + + + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 1 + + + + + gtk-execute + False + True + True + True + True + True + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 5 12 True - vertical + False 6 True + False 0 128 128 True + False gtk-missing-image 6 @@ -37,42 +104,48 @@ False + True 0 - 128 True - 0 + False True char + 15 + False + True 1 False + True 0 True - vertical + False 6 True + False 12 True + False 0 @@ -83,16 +156,19 @@ False + True 0 True + False 0 False + True 1 @@ -100,80 +176,29 @@ True True - + True False + True 2 + True + True 1 - False + True + True 1 - - - True - end - - - _Skip - True - True - True - True - - - False - False - 0 - - - - - gtk-cancel - True - True - True - True - - - False - False - 1 - - - - - gtk-execute - True - True - True - True - True - True - - - False - False - 2 - - - - - False - end - 0 - - diff -Nru gthumb-2.14.3/extensions/list_tools/data/ui/Makefile.in gthumb-3.0.0/extensions/list_tools/data/ui/Makefile.in --- gthumb-2.14.3/extensions/list_tools/data/ui/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/data/ui/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/list_tools/data/ui/personalize-scripts.ui gthumb-3.0.0/extensions/list_tools/data/ui/personalize-scripts.ui --- gthumb-2.14.3/extensions/list_tools/data/ui/personalize-scripts.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/data/ui/personalize-scripts.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,41 +1,91 @@ - + - + False 5 Commands normal - + True + False vertical 2 + + + True + False + end + + + gtk-close + False + True + True + True + False + True + + + False + False + 0 + + + + + gtk-help + False + True + True + True + False + True + + + False + False + 1 + True + + + + + False + True + end + 0 + + True + False 6 - vertical 12 True - vertical + False 6 True + False 0 Co_mmands: False + True 0 True + False 12 @@ -43,29 +93,31 @@ 300 True True - automatic - automatic etched-in + True + True 0 True - vertical + False 6 start gtk-new + False True True True + False True @@ -77,9 +129,11 @@ gtk-edit + False True True True + False True @@ -91,9 +145,11 @@ gtk-remove + False True True True + False True @@ -105,64 +161,31 @@ False + True 1 + True + True 1 + True + True 0 + True + True 1 - - - True - end - - - gtk-close - True - True - True - True - - - False - False - 0 - - - - - gtk-help - True - True - True - True - - - False - False - 1 - True - - - - - False - end - 0 - - diff -Nru gthumb-2.14.3/extensions/list_tools/data/ui/script-editor.ui gthumb-3.0.0/extensions/list_tools/data/ui/script-editor.ui --- gthumb-2.14.3/extensions/list_tools/data/ui/script-editor.ui 2011-10-17 08:57:03.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/data/ui/script-editor.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,15 +1,23 @@ - + - + + + + + + + + True + False 6 - vertical 12 True + False 6 2 12 @@ -17,6 +25,7 @@ True + False 1 _Name: True @@ -24,41 +33,50 @@ GTK_FILL + GTK_FILL True True - + 1 2 + GTK_FILL _Wait for the command to finish + False True True False + False True + 0 True 2 5 6 + GTK_FILL E_xecute command once for every file + False True True False + False True + 0 True @@ -70,10 +88,13 @@ _Terminal command (shell script) + False True True False + False True + 0 True @@ -85,6 +106,7 @@ True + False 1 Sh_ortcut: True @@ -93,15 +115,19 @@ 2 3 + GTK_FILL + GTK_FILL True + False 6 True + False shortcut_liststore @@ -113,6 +139,7 @@ False + True 0 @@ -125,33 +152,36 @@ 2 2 3 + GTK_FILL True - vertical + False 6 400 True True - + gtk-help - True - True Help + True + True 0 + False True + False 10 2 12 @@ -159,6 +189,7 @@ True + False 0 %U @@ -168,11 +199,13 @@ 1 2 + GTK_FILL True + False 0 %F @@ -182,11 +215,13 @@ 2 3 + GTK_FILL True + False 0 %B @@ -196,11 +231,13 @@ 3 4 + GTK_FILL True + False 0 %P @@ -210,11 +247,13 @@ 6 7 + GTK_FILL True + False 0 The file uri @@ -226,11 +265,13 @@ 2 1 2 + GTK_FILL True + False 0 The file path @@ -242,11 +283,13 @@ 2 2 3 + GTK_FILL True + False 0 The file basename @@ -258,11 +301,13 @@ 2 3 4 + GTK_FILL True + False 0 The parent folder path @@ -274,11 +319,13 @@ 2 6 7 + GTK_FILL True + False 0 Special code @@ -286,10 +333,14 @@ + + GTK_FILL + True + False 0 Description @@ -300,11 +351,13 @@ 1 2 + GTK_FILL True + False 0 %ask{ message }{ default value } @@ -314,11 +367,13 @@ 7 8 + GTK_FILL True + False 0 Ask an input value @@ -330,11 +385,13 @@ 2 7 8 + GTK_FILL True + False 0 %attr{ attribute name } @@ -344,11 +401,13 @@ 8 9 + GTK_FILL True + False 0 A file attribute @@ -360,11 +419,13 @@ 2 8 9 + GTK_FILL True + False 0 %N @@ -374,11 +435,13 @@ 4 5 + GTK_FILL True + False 0 The file basename without extension @@ -390,11 +453,13 @@ 2 4 5 + GTK_FILL True + False 0 %E @@ -404,11 +469,13 @@ 5 6 + GTK_FILL True + False 0 The file extension @@ -420,11 +487,13 @@ 2 5 6 + GTK_FILL True + False 0 %quote{ text } @@ -434,11 +503,13 @@ 9 10 + GTK_FILL True + False 0 Quote the text @@ -450,16 +521,20 @@ 2 9 10 + GTK_FILL False + True 0 + False + True 1 @@ -469,15 +544,18 @@ 2 1 2 + GTK_FILL True + False 5 True + False 1 0 _Command: @@ -489,21 +567,16 @@ 1 2 + GTK_FILL + GTK_FILL False + True 0 - - - - - - - - diff -Nru gthumb-2.14.3/extensions/list_tools/gth-script.c gthumb-3.0.0/extensions/list_tools/gth-script.c --- gthumb-2.14.3/extensions/list_tools/gth-script.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/gth-script.c 2012-02-19 15:01:32.000000000 +0000 @@ -25,6 +25,19 @@ #include "gth-script.h" +static void gth_script_dom_domizable_interface_init (DomDomizableInterface *iface); +static void gth_script_gth_duplicable_interface_init (GthDuplicableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthScript, + gth_script, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + gth_script_dom_domizable_interface_init) + G_IMPLEMENT_INTERFACE (GTH_TYPE_DUPLICABLE, + gth_script_gth_duplicable_interface_init)) + + enum { PROP_0, PROP_ID, @@ -50,9 +63,6 @@ }; -static gpointer *parent_class = NULL; - - static DomElement* gth_script_real_create_element (DomDomizable *base, DomDocument *doc) @@ -85,7 +95,7 @@ if (keyval_name != NULL) return gdk_keyval_from_name (keyval_name); else - return GDK_VoidSymbol; + return GDK_KEY_VoidSymbol; } @@ -139,12 +149,11 @@ GthScript *self; self = GTH_SCRIPT (base); - g_free (self->priv->id); g_free (self->priv->display_name); g_free (self->priv->command); - G_OBJECT_CLASS (parent_class)->finalize (base); + G_OBJECT_CLASS (gth_script_parent_class)->finalize (base); } @@ -245,7 +254,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthScriptPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -311,13 +319,13 @@ "The keyboard shortcut to activate the script", 0, G_MAXUINT, - GDK_VoidSymbol, + GDK_KEY_VoidSymbol, G_PARAM_READWRITE)); } static void -gth_script_dom_domizable_interface_init (DomDomizableIface *iface) +gth_script_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = gth_script_real_create_element; iface->load_from_element = gth_script_real_load_from_element; @@ -325,7 +333,7 @@ static void -gth_script_gth_duplicable_interface_init (GthDuplicableIface *iface) +gth_script_gth_duplicable_interface_init (GthDuplicableInterface *iface) { iface->duplicate = gth_script_real_duplicate; } @@ -341,46 +349,6 @@ } -GType -gth_script_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthScriptClass), - NULL, - NULL, - (GClassInitFunc) gth_script_class_init, - NULL, - NULL, - sizeof (GthScript), - 0, - (GInstanceInitFunc) gth_script_init - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) gth_script_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo gth_duplicable_info = { - (GInterfaceInitFunc) gth_script_gth_duplicable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthScript", - &type_info, - 0); - g_type_add_interface_static (type, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - g_type_add_interface_static (type, GTH_TYPE_DUPLICABLE, >h_duplicable_info); - } - - return type; -} - - GthScript* gth_script_new (void) { diff -Nru gthumb-2.14.3/extensions/list_tools/gth-script-editor-dialog.c gthumb-3.0.0/extensions/list_tools/gth-script-editor-dialog.c --- gthumb-2.14.3/extensions/list_tools/gth-script-editor-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/gth-script-editor-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -31,7 +31,8 @@ #define NO_SHORTCUT 0 -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthScriptEditorDialog, gth_script_editor_dialog, GTK_TYPE_DIALOG) + enum { SHORTCUT_NAME_COLUMN = 0, @@ -63,7 +64,7 @@ dialog->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_script_editor_dialog_parent_class)->finalize (object); } @@ -72,9 +73,7 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - object_class->finalize = gth_script_editor_dialog_finalize; } @@ -87,34 +86,6 @@ } -GType -gth_script_editor_dialog_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthScriptEditorDialogClass), - NULL, - NULL, - (GClassInitFunc) gth_script_editor_dialog_class_init, - NULL, - NULL, - sizeof (GthScriptEditorDialog), - 0, - (GInstanceInitFunc) gth_script_editor_dialog_init - }; - - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthScriptEditorDialog", - &type_info, - 0); - } - - return type; -} - - static void update_sensitivity (GthScriptEditorDialog *self) { diff -Nru gthumb-2.14.3/extensions/list_tools/gth-script-file.c gthumb-3.0.0/extensions/list_tools/gth-script-file.c --- gthumb-2.14.3/extensions/list_tools/gth-script-file.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/gth-script-file.c 2012-02-19 15:01:32.000000000 +0000 @@ -42,22 +42,24 @@ }; -static gpointer parent_class = NULL; static guint gth_script_file_signals[LAST_SIGNAL] = { 0 }; + static GType gth_script_file_get_type (void); +G_DEFINE_TYPE (GthScriptFile, gth_script_file, G_TYPE_OBJECT) + + static void gth_script_file_finalize (GObject *object) { GthScriptFile *self; self = GTH_SCRIPT_FILE (object); - _g_object_list_unref (self->priv->items); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_script_file_parent_class)->finalize (object); } @@ -66,7 +68,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthScriptFilePrivate)); object_class = (GObjectClass*) klass; @@ -93,34 +94,6 @@ } -static GType -gth_script_file_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthScriptFileClass), - NULL, - NULL, - (GClassInitFunc) gth_script_file_class_init, - NULL, - NULL, - sizeof (GthScriptFile), - 0, - (GInstanceInitFunc) gth_script_file_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthScriptFile", - &type_info, - 0); - } - - return type; -} - - GthScriptFile * gth_script_file_get (void) { diff -Nru gthumb-2.14.3/extensions/list_tools/gth-script-task.c gthumb-3.0.0/extensions/list_tools/gth-script-task.c --- gthumb-2.14.3/extensions/list_tools/gth-script-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/gth-script-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -23,6 +23,9 @@ #include "gth-script-task.h" +G_DEFINE_TYPE (GthScriptTask, gth_script_task, GTH_TYPE_TASK) + + struct _GthScriptTaskPrivate { GthScript *script; GtkWindow *parent; @@ -35,20 +38,16 @@ }; -static gpointer parent_class = NULL; - - static void gth_script_task_finalize (GObject *object) { GthScriptTask *self; self = GTH_SCRIPT_TASK (object); - g_object_unref (self->priv->script); _g_object_list_unref (self->priv->file_list); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_script_task_parent_class)->finalize (object); } @@ -257,7 +256,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthScriptTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -277,34 +275,6 @@ } -GType -gth_script_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthScriptTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_script_task_class_init, - NULL, - NULL, - sizeof (GthScriptTask), - 0, - (GInstanceInitFunc) gth_script_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthScriptTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_script_task_new (GtkWindow *parent, GthScript *script, diff -Nru gthumb-2.14.3/extensions/list_tools/list_tools.extension.in.in gthumb-3.0.0/extensions/list_tools/list_tools.extension.in.in --- gthumb-2.14.3/extensions/list_tools/list_tools.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/list_tools.extension.in.in 2012-04-21 09:24:24.000000000 +0000 @@ -10,3 +10,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/list_tools/main.c gthumb-3.0.0/extensions/list_tools/main.c --- gthumb-2.14.3/extensions/list_tools/main.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/main.c 2012-02-19 15:01:32.000000000 +0000 @@ -30,7 +30,6 @@ gthumb_extension_activate (void) { gth_hook_add_callback ("gth-browser-construct", 5, G_CALLBACK (list_tools__gth_browser_construct_cb), NULL); - gth_hook_add_callback ("gth-browser-update-sensitivity", 10, G_CALLBACK (list_tools__gth_browser_update_sensitivity_cb), NULL); gth_hook_add_callback ("gth-browser-file-list-key-press", 10, G_CALLBACK (list_tools__gth_browser_file_list_key_press_cb), NULL); } diff -Nru gthumb-2.14.3/extensions/list_tools/Makefile.in gthumb-3.0.0/extensions/list_tools/Makefile.in --- gthumb-2.14.3/extensions/list_tools/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/list_tools/Makefile.in 2012-04-23 18:09:48.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -130,6 +147,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -209,10 +231,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -220,6 +240,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -259,6 +280,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -307,8 +330,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -339,6 +360,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -434,7 +456,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -442,6 +463,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -565,8 +588,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -749,13 +775,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/Makefile.am gthumb-3.0.0/extensions/Makefile.am --- gthumb-2.14.3/extensions/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/extensions/Makefile.am 2012-03-04 15:22:15.000000000 +0000 @@ -56,6 +56,7 @@ rename_series \ resize_images \ search \ + selections \ slideshow \ $(EXPORTERS) \ $(IMPORTERS) \ diff -Nru gthumb-2.14.3/extensions/Makefile.in gthumb-3.0.0/extensions/Makefile.in --- gthumb-2.14.3/extensions/Makefile.in 2012-03-25 18:34:08.000000000 +0000 +++ gthumb-3.0.0/extensions/Makefile.in 2012-04-23 18:09:43.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -358,6 +380,7 @@ rename_series \ resize_images \ search \ + selections \ slideshow \ $(EXPORTERS) \ $(IMPORTERS) \ @@ -572,13 +595,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/map_view/gth-map-view.c gthumb-3.0.0/extensions/map_view/gth-map-view.c --- gthumb-2.14.3/extensions/map_view/gth-map-view.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/map_view/gth-map-view.c 2012-03-20 13:00:45.000000000 +0000 @@ -32,15 +32,24 @@ #define LABEL_MAX_WIDTH 200 -static gpointer parent_class = NULL; +static void gth_map_view_gth_multipage_child_interface_init (GthMultipageChildInterface *iface); +static void gth_map_view_gth_property_view_interface_init (GthPropertyViewInterface *iface); + +G_DEFINE_TYPE_WITH_CODE (GthMapView, + gth_map_view, + GTK_TYPE_BOX, + G_IMPLEMENT_INTERFACE (GTH_TYPE_MULTIPAGE_CHILD, + gth_map_view_gth_multipage_child_interface_init) + G_IMPLEMENT_INTERFACE (GTH_TYPE_PROPERTY_VIEW, + gth_map_view_gth_property_view_interface_init)) struct _GthMapViewPrivate { - GtkWidget *no_gps_label; - GtkWidget *embed; - ChamplainView *map_view; - ChamplainLayer *marker_layer; - ClutterActor *marker; + GtkWidget *no_gps_label; + GtkWidget *embed; + ChamplainView *map_view; + ChamplainMarkerLayer *marker_layer; + ClutterActor *marker; }; @@ -177,10 +186,10 @@ gtk_widget_show (self->priv->embed); position = decimal_coordinates_to_string (latitude, longitude); - champlain_marker_set_text (CHAMPLAIN_MARKER (self->priv->marker), position); + champlain_label_set_text (CHAMPLAIN_LABEL (self->priv->marker), position); g_free (position); - champlain_base_marker_set_position (CHAMPLAIN_BASE_MARKER (self->priv->marker), latitude, longitude); + champlain_location_set_location (CHAMPLAIN_LOCATION (self->priv->marker), latitude, longitude); champlain_view_center_on (CHAMPLAIN_VIEW (self->priv->map_view), latitude, longitude); } else { @@ -207,7 +216,7 @@ static void gth_map_view_finalize (GObject *base) { - G_OBJECT_CLASS (parent_class)->finalize (base); + G_OBJECT_CLASS (gth_map_view_parent_class)->finalize (base); } @@ -218,7 +227,7 @@ self = GTH_MAP_VIEW (widget); - GTK_WIDGET_CLASS (parent_class)->realize (widget); + GTK_WIDGET_CLASS (gth_map_view_parent_class)->realize (widget); if (! gtk_widget_get_visible (self->priv->no_gps_label)) gtk_widget_show (self->priv->embed); } @@ -231,7 +240,7 @@ self = GTH_MAP_VIEW (widget); - GTK_WIDGET_CLASS (parent_class)->unrealize (widget); + GTK_WIDGET_CLASS (gth_map_view_parent_class)->unrealize (widget); gtk_widget_hide (self->priv->embed); } @@ -241,7 +250,6 @@ { GtkWidgetClass *widget_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthMapViewPrivate)); G_OBJECT_CLASS (klass)->finalize = gth_map_view_finalize; @@ -255,10 +263,13 @@ static void gth_map_view_init (GthMapView *self) { + ClutterActor *scale; + self->priv = GTH_MAP_VIEW_GET_PRIVATE (self); gtk_box_set_spacing (GTK_BOX (self), 6); gtk_container_set_border_width (GTK_CONTAINER (self), 2); + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL); /* No GPS label */ @@ -280,18 +291,25 @@ self->priv->map_view = gtk_champlain_embed_get_view (GTK_CHAMPLAIN_EMBED (self->priv->embed)); g_object_set (G_OBJECT (self->priv->map_view), "reactive", TRUE, - "scroll-mode", CHAMPLAIN_SCROLL_MODE_KINETIC, "zoom-level", 5, - "show-scale", TRUE, + "zoom-on-double-click", TRUE, + "kinetic-mode", TRUE, NULL); - self->priv->marker_layer = champlain_layer_new (); - champlain_view_add_layer (self->priv->map_view, self->priv->marker_layer); - champlain_layer_show (self->priv->marker_layer); + scale = champlain_scale_new (); + champlain_scale_connect_view (CHAMPLAIN_SCALE (scale), self->priv->map_view); + champlain_view_bin_layout_add (self->priv->map_view, + scale, + CLUTTER_BIN_ALIGNMENT_START, + CLUTTER_BIN_ALIGNMENT_END); + + self->priv->marker_layer = champlain_marker_layer_new (); + champlain_view_add_layer (self->priv->map_view, CHAMPLAIN_LAYER (self->priv->marker_layer)); + clutter_actor_show (CLUTTER_ACTOR (self->priv->marker_layer)); - self->priv->marker = champlain_marker_new_with_text ("", "Sans 10", NULL, NULL); + self->priv->marker = champlain_label_new_with_text ("", "Sans 10", NULL, NULL); clutter_actor_show (self->priv->marker); - champlain_layer_add_marker (self->priv->marker_layer, CHAMPLAIN_BASE_MARKER (self->priv->marker)); + champlain_marker_layer_add_marker (self->priv->marker_layer, CHAMPLAIN_MARKER (self->priv->marker)); gtk_widget_show_all (self->priv->embed); gtk_widget_hide (self->priv->embed); @@ -301,7 +319,7 @@ static void -gth_map_view_gth_multipage_child_interface_init (GthMultipageChildIface *iface) +gth_map_view_gth_multipage_child_interface_init (GthMultipageChildInterface *iface) { iface->get_name = gth_map_view_real_get_name; iface->get_icon = gth_map_view_real_get_icon; @@ -309,47 +327,7 @@ static void -gth_map_view_gth_property_view_interface_init (GthPropertyViewIface *iface) +gth_map_view_gth_property_view_interface_init (GthPropertyViewInterface *iface) { iface->set_file = gth_map_view_real_set_file; } - - -GType -gth_map_view_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthMapViewClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_map_view_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthMapView), - 0, - (GInstanceInitFunc) gth_map_view_init, - NULL - }; - static const GInterfaceInfo gth_multipage_child_info = { - (GInterfaceInitFunc) gth_map_view_gth_multipage_child_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo gth_property_view_info = { - (GInterfaceInitFunc) gth_map_view_gth_property_view_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - type = g_type_register_static (GTK_TYPE_VBOX, - "GthMapView", - &g_define_type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_MULTIPAGE_CHILD, >h_multipage_child_info); - g_type_add_interface_static (type, GTH_TYPE_PROPERTY_VIEW, >h_property_view_info); - } - - return type; -} diff -Nru gthumb-2.14.3/extensions/map_view/gth-map-view.h gthumb-3.0.0/extensions/map_view/gth-map-view.h --- gthumb-2.14.3/extensions/map_view/gth-map-view.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/map_view/gth-map-view.h 2012-03-06 15:26:06.000000000 +0000 @@ -38,12 +38,12 @@ typedef struct _GthMapViewPrivate GthMapViewPrivate; struct _GthMapView { - GtkVBox parent_instance; + GtkBox parent_instance; GthMapViewPrivate *priv; }; struct _GthMapViewClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; }; GType gth_map_view_get_type (void); diff -Nru gthumb-2.14.3/extensions/map_view/Makefile.in gthumb-3.0.0/extensions/map_view/Makefile.in --- gthumb-2.14.3/extensions/map_view/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/map_view/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -122,6 +139,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libmap_view_la_SOURCES) DIST_SOURCES = $(am__libmap_view_la_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) ETAGS = etags CTAGS = ctags @@ -170,10 +192,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +201,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +241,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +291,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +321,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -382,7 +404,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -390,6 +411,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -465,8 +488,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/map_view/map_view.extension.in.in gthumb-3.0.0/extensions/map_view/map_view.extension.in.in --- gthumb-2.14.3/extensions/map_view/map_view.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/map_view/map_view.extension.in.in 2012-04-21 09:24:20.000000000 +0000 @@ -10,3 +10,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/oauth/data/Makefile.in gthumb-3.0.0/extensions/oauth/data/Makefile.in --- gthumb-2.14.3/extensions/oauth/data/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/data/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/oauth/data/ui/Makefile.in gthumb-3.0.0/extensions/oauth/data/ui/Makefile.in --- gthumb-2.14.3/extensions/oauth/data/ui/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/data/ui/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -339,8 +361,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/oauth/data/ui/oauth-account-chooser.ui gthumb-3.0.0/extensions/oauth/data/ui/oauth-account-chooser.ui --- gthumb-2.14.3/extensions/oauth/data/ui/oauth-account-chooser.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/data/ui/oauth-account-chooser.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,24 +1,39 @@ - + + + + + + + + + + + + True + False 5 6 True + False 6 True + False 0 A_ccount: True False + True 0 @@ -26,28 +41,21 @@ 300 True + False account_liststore + True + True 1 + False + True 0 - - - - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/oauth/data/ui/oauth-account-manager.ui gthumb-3.0.0/extensions/oauth/data/ui/oauth-account-manager.ui --- gthumb-2.14.3/extensions/oauth/data/ui/oauth-account-manager.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/data/ui/oauth-account-manager.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,6 @@ - + - @@ -12,11 +11,12 @@ True + False 5 - vertical True + False 0 A_ccounts: True @@ -24,24 +24,24 @@ False + True 0 True + False 6 + 300 + 150 True True - automatic - automatic in - 300 - 150 True True accounts_liststore @@ -49,6 +49,9 @@ False True 1 + + + @@ -63,39 +66,48 @@ + True + True 0 True - vertical + False 6 + False True True True + False True + False gtk-delete False + True 0 False + True 1 + True + True 1 diff -Nru gthumb-2.14.3/extensions/oauth/data/ui/oauth-ask-authorization.ui gthumb-3.0.0/extensions/oauth/data/ui/oauth-ask-authorization.ui --- gthumb-2.14.3/extensions/oauth/data/ui/oauth-ask-authorization.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/data/ui/oauth-ask-authorization.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,8 +1,13 @@ - + + True + False + gtk-dialog-authentication + + False 5 False True @@ -11,19 +16,24 @@ other icon_image - + True + False + vertical 2 - + True + False end gtk-cancel + False True True True + False True @@ -35,9 +45,11 @@ _Authorize... + False True True True + False button_image True @@ -50,6 +62,7 @@ False + True end 0 @@ -61,12 +74,9 @@ authorize_button - - True - gtk-dialog-authentication - True + False 0 gtk-dialog-authentication 6 diff -Nru gthumb-2.14.3/extensions/oauth/data/ui/oauth-complete-authorization.ui gthumb-3.0.0/extensions/oauth/data/ui/oauth-complete-authorization.ui --- gthumb-2.14.3/extensions/oauth/data/ui/oauth-complete-authorization.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/data/ui/oauth-complete-authorization.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,8 +1,13 @@ - + + True + False + gtk-dialog-authentication + + False 5 False True @@ -11,19 +16,24 @@ other icon_image1 - + True + False + vertical 2 - + True + False end gtk-cancel + False True True True + False True 0.50999999046325684 @@ -36,9 +46,11 @@ C_ontinue + False True True True + False button_image1 True @@ -51,6 +63,7 @@ False + True end 0 @@ -64,12 +77,9 @@ True + False 0 gtk-dialog-authentication 6 - - True - gtk-dialog-authentication - diff -Nru gthumb-2.14.3/extensions/oauth/Makefile.in gthumb-3.0.0/extensions/oauth/Makefile.in --- gthumb-2.14.3/extensions/oauth/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -136,6 +153,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -215,10 +237,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -226,6 +246,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -265,6 +286,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -313,8 +336,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -345,6 +366,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -436,7 +458,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -444,6 +465,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -551,8 +574,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -735,13 +761,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/oauth/oauth-account.c gthumb-3.0.0/extensions/oauth/oauth-account.c --- gthumb-2.14.3/extensions/oauth/oauth-account.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/oauth-account.c 2012-02-19 15:01:32.000000000 +0000 @@ -29,7 +29,14 @@ #include "oauth-account.h" -static gpointer oauth_account_parent_class = NULL; +static void oauth_account_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (OAuthAccount, + oauth_account, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + oauth_account_dom_domizable_interface_init)) static void @@ -50,7 +57,6 @@ static void oauth_account_class_init (OAuthAccountClass *klass) { - oauth_account_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = oauth_account_finalize; } @@ -102,7 +108,7 @@ static void -oauth_account_dom_domizable_interface_init (DomDomizableIface *iface) +oauth_account_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = oauth_account_create_element; iface->load_from_element = oauth_account_load_from_element; @@ -110,43 +116,9 @@ static void -oauth_account_instance_init (OAuthAccount *self) +oauth_account_init (OAuthAccount *self) { -} - - -GType -oauth_account_get_type (void) -{ - static GType oauth_account_type_id = 0; - - if (oauth_account_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (OAuthAccountClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) oauth_account_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (OAuthAccount), - 0, - (GInstanceInitFunc) oauth_account_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) oauth_account_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - oauth_account_type_id = g_type_register_static (G_TYPE_OBJECT, - "OAuthAccount", - &g_define_type_info, - 0); - g_type_add_interface_static (oauth_account_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return oauth_account_type_id; + /* void */ } diff -Nru gthumb-2.14.3/extensions/oauth/oauth-account-chooser-dialog.c gthumb-3.0.0/extensions/oauth/oauth-account-chooser-dialog.c --- gthumb-2.14.3/extensions/oauth/oauth-account-chooser-dialog.c 2011-11-13 19:38:41.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/oauth-account-chooser-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,6 +26,9 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) +G_DEFINE_TYPE (OAuthAccountChooserDialog, oauth_account_chooser_dialog, GTK_TYPE_DIALOG) + + enum { ACCOUNT_DATA_COLUMN, ACCOUNT_NAME_COLUMN, @@ -34,9 +37,6 @@ }; -static gpointer parent_class = NULL; - - struct _OAuthAccountChooserDialogPrivate { GtkBuilder *builder; }; @@ -51,7 +51,7 @@ _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (oauth_account_chooser_dialog_parent_class)->finalize (object); } @@ -60,7 +60,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (OAuthAccountChooserDialogPrivate)); object_class = (GObjectClass*) klass; @@ -163,34 +162,6 @@ } -GType -oauth_account_chooser_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (OAuthAccountChooserDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) oauth_account_chooser_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (OAuthAccountChooserDialog), - 0, - (GInstanceInitFunc) oauth_account_chooser_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "OAuthAccountChooserDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void oauth_account_chooser_dialog_construct (OAuthAccountChooserDialog *self, GList *accounts, diff -Nru gthumb-2.14.3/extensions/oauth/oauth-account-manager-dialog.c gthumb-3.0.0/extensions/oauth/oauth-account-manager-dialog.c --- gthumb-2.14.3/extensions/oauth/oauth-account-manager-dialog.c 2011-11-13 19:38:41.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/oauth-account-manager-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -28,15 +28,15 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) +G_DEFINE_TYPE (OAuthAccountManagerDialog, oauth_account_manager_dialog, GTK_TYPE_DIALOG) + + enum { ACCOUNT_DATA_COLUMN, ACCOUNT_NAME_COLUMN, }; -static gpointer parent_class = NULL; - - struct _OAuthAccountManagerDialogPrivate { GtkBuilder *builder; }; @@ -51,7 +51,7 @@ _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (oauth_account_manager_dialog_parent_class)->finalize (object); } @@ -60,7 +60,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (OAuthAccountManagerDialogPrivate)); object_class = (GObjectClass*) klass; @@ -160,34 +159,6 @@ } -GType -oauth_account_manager_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (OAuthAccountManagerDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) oauth_account_manager_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (OAuthAccountManagerDialog), - 0, - (GInstanceInitFunc) oauth_account_manager_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "OAuthAccountManagerDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void oauth_account_manager_dialog_construct (OAuthAccountManagerDialog *self, GList *accounts) diff -Nru gthumb-2.14.3/extensions/oauth/oauth-authentication.c gthumb-3.0.0/extensions/oauth/oauth-authentication.c --- gthumb-2.14.3/extensions/oauth/oauth-authentication.c 2011-11-13 19:38:41.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/oauth-authentication.c 2012-02-19 15:01:32.000000000 +0000 @@ -34,6 +34,9 @@ #define OAUTH_AUTHENTICATION_RESPONSE_CHOOSE_ACCOUNT 1 +G_DEFINE_TYPE (OAuthAuthentication, oauth_authentication, G_TYPE_OBJECT) + + /* Signals */ enum { READY, @@ -52,7 +55,6 @@ }; -static GObjectClass *parent_class = NULL; static guint oauth_authentication_signals[LAST_SIGNAL] = { 0 }; @@ -67,7 +69,7 @@ _g_object_list_unref (self->priv->accounts); _g_object_unref (self->priv->account); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (oauth_authentication_parent_class)->finalize (object); } @@ -76,7 +78,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (OAuthAuthenticationPrivate)); object_class = (GObjectClass*) class; @@ -115,34 +116,6 @@ } -GType -oauth_authentication_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTaskClass), - NULL, - NULL, - (GClassInitFunc) oauth_authentication_class_init, - NULL, - NULL, - sizeof (GthTask), - 0, - (GInstanceInitFunc) oauth_authentication_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "OAuthAuthentication", - &type_info, - 0); - } - - return type; -} - - OAuthAuthentication * oauth_authentication_new (OAuthConnection *conn, GType account_type, diff -Nru gthumb-2.14.3/extensions/oauth/oauth-connection.c gthumb-3.0.0/extensions/oauth/oauth-connection.c --- gthumb-2.14.3/extensions/oauth/oauth-connection.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/oauth-connection.c 2012-02-19 15:01:32.000000000 +0000 @@ -31,6 +31,9 @@ #define OAUTH_SIGNATURE_METHOD "HMAC-SHA1" +G_DEFINE_TYPE (OAuthConnection, oauth_connection, GTH_TYPE_TASK) + + GQuark oauth_connection_error_quark (void) { @@ -60,9 +63,6 @@ }; -static gpointer parent_class = NULL; - - static void oauth_connection_finalize (GObject *object) { @@ -79,7 +79,7 @@ g_free (self->priv->timestamp); _g_object_unref (self->priv->session); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (oauth_connection_parent_class)->finalize (object); } @@ -108,7 +108,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (OAuthConnectionPrivate)); object_class = (GObjectClass*) klass; @@ -136,34 +135,6 @@ } -GType -oauth_connection_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (OAuthConnectionClass), - NULL, - NULL, - (GClassInitFunc) oauth_connection_class_init, - NULL, - NULL, - sizeof (OAuthConnection), - 0, - (GInstanceInitFunc) oauth_connection_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "OAuthConnection", - &type_info, - 0); - } - - return type; -} - - OAuthConnection * oauth_connection_new (OAuthConsumer *consumer) { diff -Nru gthumb-2.14.3/extensions/oauth/oauth.extension.in.in gthumb-3.0.0/extensions/oauth/oauth.extension.in.in --- gthumb-2.14.3/extensions/oauth/oauth.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/oauth/oauth.extension.in.in 2012-04-21 09:24:16.000000000 +0000 @@ -4,3 +4,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/photobucket/callbacks.c gthumb-3.0.0/extensions/photobucket/callbacks.c --- gthumb-2.14.3/extensions/photobucket/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/callbacks.c 2012-02-19 15:01:32.000000000 +0000 @@ -49,10 +49,11 @@ ""; -static GtkActionEntry action_entries[] = { +static GthActionEntryExt action_entries[] = { { "File_Export_PhotoBucket", "site-photobucket", N_("Photobucket..."), NULL, N_("Upload photos to Photobucket"), + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, G_CALLBACK (gth_browser_activate_action_export_photobucket) }, }; @@ -82,10 +83,10 @@ data->action_group = gtk_action_group_new ("PhotoBucket Actions"); gtk_action_group_set_translation_domain (data->action_group, NULL); - gtk_action_group_add_actions (data->action_group, - action_entries, - G_N_ELEMENTS (action_entries), - browser); + _gtk_action_group_add_actions_with_flags (data->action_group, + action_entries, + G_N_ELEMENTS (action_entries), + browser); gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->action_group, 0); merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), ui_info, -1, &error); @@ -94,8 +95,5 @@ g_clear_error (&error); } - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Export/Web_Services/File_Export_PhotoBucket")), TRUE); - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ExportPopup/Web_Services/File_Export_PhotoBucket")), TRUE); - g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } diff -Nru gthumb-2.14.3/extensions/photobucket/data/Makefile.in gthumb-3.0.0/extensions/photobucket/data/Makefile.in --- gthumb-2.14.3/extensions/photobucket/data/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/data/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/photobucket/data/ui/export-to-photobucket.ui gthumb-3.0.0/extensions/photobucket/data/ui/export-to-photobucket.ui --- gthumb-2.14.3/extensions/photobucket/data/ui/export-to-photobucket.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/data/ui/export-to-photobucket.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,14 @@ - + - + + + + + + + + @@ -14,62 +21,164 @@ - + - - - + + + + + + Tiny ( 100 x 75 ) + 100 + + + Small ( 160 x 120 ) + 160 + + + Medium ( 320 x 240 ) + 320 + + + Large ( 640 x 480 ) + 640 + + + 15ʺ screen ( 800 x 600 ) + 800 + + + 17ʺ screen ( 1024 x 768 ) + 1024 + + + 1 megabyte file size + 0 + + True + False gtk-goto-top + False 5 Export to Flickr dialog - + True + False vertical 6 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 0 + + + + + _Upload + False + True + True + True + False + upload_image + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + True + + + False + False + 2 + True + + + + + False + True + end + 0 + + True + False 5 - vertical 12 460 340 True + False 3 True + False 0 False + True 0 + True + True 0 True - vertical + False 6 True + False 4 2 6 @@ -77,10 +186,12 @@ True + False 6 True + False 0 0 _Account: @@ -91,21 +202,24 @@ GTK_FILL + GTK_FILL True - vertical + False 3 True + False 6 300 True + False account_liststore @@ -115,39 +229,49 @@ + True + True 0 + False True True True Edit accounts + False True + False gtk-edit False + True 1 + False + True 0 True + False 6 True + False Free space: @@ -155,12 +279,14 @@ False + True 0 True + False 0 0.51999998092651367 @@ -168,11 +294,15 @@ + True + True 1 + False + True 1 @@ -180,11 +310,13 @@ 1 2 + GTK_FILL True + False 0 A_lbum: True @@ -193,30 +325,38 @@ 1 2 GTK_FILL + GTK_FILL True + False 6 True + False album_liststore + True + True 0 + False True True True Add a new album + False True + False gtk-add @@ -233,11 +373,13 @@ 2 1 2 + GTK_FILL True + False _Resize to: True resize_combobox @@ -246,11 +388,13 @@ 2 3 GTK_FILL + GTK_FILL True + False resize_liststore 6 @@ -265,95 +409,49 @@ 2 2 3 + GTK_FILL _Scramble filenames + False True True False + False True + 0 True 2 3 4 + GTK_FILL False + True 0 False + True 1 + True + True 1 - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - _Upload - True - True - True - upload_image - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - - - False - False - 2 - True - - - - - False - end - 0 - - @@ -362,42 +460,4 @@ button1 - - - - - - - - - - Tiny ( 100 x 75 ) - 100 - - - Small ( 160 x 120 ) - 160 - - - Medium ( 320 x 240 ) - 320 - - - Large ( 640 x 480 ) - 640 - - - 15ʺ screen ( 800 x 600 ) - 800 - - - 17ʺ screen ( 1024 x 768 ) - 1024 - - - 1 megabyte file size - 0 - - - diff -Nru gthumb-2.14.3/extensions/photobucket/data/ui/Makefile.in gthumb-3.0.0/extensions/photobucket/data/ui/Makefile.in --- gthumb-2.14.3/extensions/photobucket/data/ui/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/data/ui/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -338,8 +360,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/photobucket/data/ui/photobucket-album-properties.ui gthumb-3.0.0/extensions/photobucket/data/ui/photobucket-album-properties.ui --- gthumb-2.14.3/extensions/photobucket/data/ui/photobucket-album-properties.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/data/ui/photobucket-album-properties.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,12 +1,25 @@ - + + + + + + + + + + + + True + False True + False 2 2 6 @@ -14,6 +27,7 @@ True + False 0 _Name: True @@ -21,6 +35,7 @@ GTK_FILL + GTK_FILL @@ -38,6 +53,7 @@ True + False 0 _Container: True @@ -47,11 +63,13 @@ 1 2 GTK_FILL + GTK_FILL True + False album_liststore @@ -59,25 +77,15 @@ 2 1 2 + GTK_FILL False + True 0 - - - - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/photobucket/data/ui/photobucket-export-completed.ui gthumb-3.0.0/extensions/photobucket/data/ui/photobucket-export-completed.ui --- gthumb-2.14.3/extensions/photobucket/data/ui/photobucket-export-completed.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/data/ui/photobucket-export-completed.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,8 +1,14 @@ - + + True + False + 0 + gtk-jump-to + + False 5 False True @@ -10,19 +16,24 @@ True Files successfully uploaded to the server. - + True + False + vertical 2 - + True + False end _Open in the Browser + False True True True + False icon_image True @@ -35,9 +46,11 @@ gtk-close + False True True True + False True @@ -49,6 +62,7 @@ False + True end 0 @@ -60,9 +74,4 @@ button2 - - True - 0 - gtk-jump-to - diff -Nru gthumb-2.14.3/extensions/photobucket/dlg-export-to-photobucket.c gthumb-3.0.0/extensions/photobucket/dlg-export-to-photobucket.c --- gthumb-2.14.3/extensions/photobucket/dlg-export-to-photobucket.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/dlg-export-to-photobucket.c 2012-02-19 15:01:32.000000000 +0000 @@ -280,7 +280,7 @@ } gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("account_combobox")), current_account_idx); - free_space = g_format_size_for_display ((data->account->megabytes_allowed - data->account->megabytes_used) * (1024 * 1024)); + free_space = g_format_size ((data->account->megabytes_allowed - data->account->megabytes_used) * (1024 * 1024)); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("free_space_label")), free_space); g_free (free_space); @@ -619,7 +619,7 @@ return; } - total_size_formatted = g_format_size_for_display (total_size); + total_size_formatted = g_format_size (total_size); text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_total), n_total, total_size_formatted); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("images_info_label")), text); g_free (text); @@ -627,9 +627,8 @@ /* Set the widget data */ - list_view = gth_file_list_new (gth_icon_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); + list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); gth_file_list_set_thumb_size (GTH_FILE_LIST (list_view), 112); - gth_file_view_set_spacing (GTH_FILE_VIEW (gth_file_list_get_view (GTH_FILE_LIST (list_view))), 0); gth_file_list_enable_thumbs (GTH_FILE_LIST (list_view), TRUE); gth_file_list_set_ignore_hidden (GTH_FILE_LIST (list_view), TRUE); gth_file_list_set_caption (GTH_FILE_LIST (list_view), "none"); diff -Nru gthumb-2.14.3/extensions/photobucket/Makefile.in gthumb-3.0.0/extensions/photobucket/Makefile.in --- gthumb-2.14.3/extensions/photobucket/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -144,6 +161,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -223,10 +245,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -234,6 +254,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -273,6 +294,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -321,8 +344,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -353,6 +374,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -452,7 +474,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -460,6 +481,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -599,8 +622,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -783,13 +809,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/photobucket/photobucket-account.c gthumb-3.0.0/extensions/photobucket/photobucket-account.c --- gthumb-2.14.3/extensions/photobucket/photobucket-account.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/photobucket-account.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,14 @@ #include "photobucket-account.h" -static gpointer photobucket_account_parent_class = NULL; +static void photobucket_account_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (PhotobucketAccount, + photobucket_account, + OAUTH_TYPE_ACCOUNT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + photobucket_account_dom_domizable_interface_init)) static void @@ -47,7 +54,6 @@ static void photobucket_account_class_init (PhotobucketAccountClass *klass) { - photobucket_account_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = photobucket_account_finalize; } @@ -105,7 +111,7 @@ static void -photobucket_account_dom_domizable_interface_init (DomDomizableIface *iface) +photobucket_account_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = photobucket_account_create_element; iface->load_from_element = photobucket_account_load_from_element; @@ -113,7 +119,7 @@ static void -photobucket_account_instance_init (PhotobucketAccount *self) +photobucket_account_init (PhotobucketAccount *self) { self->subdomain = NULL; self->home_url = NULL; @@ -123,41 +129,6 @@ } -GType -photobucket_account_get_type (void) -{ - static GType photobucket_account_type_id = 0; - - if (photobucket_account_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (PhotobucketAccountClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) photobucket_account_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PhotobucketAccount), - 0, - (GInstanceInitFunc) photobucket_account_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) photobucket_account_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - photobucket_account_type_id = g_type_register_static (OAUTH_TYPE_ACCOUNT, - "PhotobucketAccount", - &g_define_type_info, - 0); - g_type_add_interface_static (photobucket_account_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return photobucket_account_type_id; -} - - OAuthAccount * photobucket_account_new (void) { diff -Nru gthumb-2.14.3/extensions/photobucket/photobucket-album.c gthumb-3.0.0/extensions/photobucket/photobucket-album.c --- gthumb-2.14.3/extensions/photobucket/photobucket-album.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/photobucket-album.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,14 @@ #include "photobucket-album.h" -static gpointer photobucket_album_parent_class = NULL; +static void photobucket_album_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (PhotobucketAlbum, + photobucket_album, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + photobucket_album_dom_domizable_interface_init)) static void @@ -45,12 +52,11 @@ static void photobucket_album_class_init (PhotobucketAlbumClass *klass) { - photobucket_album_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = photobucket_album_finalize; } -static DomElement* +static DomElement * photobucket_album_create_element (DomDomizable *base, DomDocument *doc) { @@ -82,7 +88,7 @@ static void -photobucket_album_dom_domizable_interface_init (DomDomizableIface *iface) +photobucket_album_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = photobucket_album_create_element; iface->load_from_element = photobucket_album_load_from_element; @@ -90,7 +96,7 @@ static void -photobucket_album_instance_init (PhotobucketAlbum *self) +photobucket_album_init (PhotobucketAlbum *self) { self->name = NULL; self->photo_count = 0; @@ -98,41 +104,6 @@ } -GType -photobucket_album_get_type (void) -{ - static GType photobucket_album_type_id = 0; - - if (photobucket_album_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (PhotobucketAlbumClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) photobucket_album_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PhotobucketAlbum), - 0, - (GInstanceInitFunc) photobucket_album_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) photobucket_album_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - photobucket_album_type_id = g_type_register_static (G_TYPE_OBJECT, - "PhotobucketAlbum", - &g_define_type_info, - 0); - g_type_add_interface_static (photobucket_album_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return photobucket_album_type_id; -} - - PhotobucketAlbum * photobucket_album_new (void) { diff -Nru gthumb-2.14.3/extensions/photobucket/photobucket-album-properties-dialog.c gthumb-3.0.0/extensions/photobucket/photobucket-album-properties-dialog.c --- gthumb-2.14.3/extensions/photobucket/photobucket-album-properties-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/photobucket-album-properties-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -27,6 +27,9 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) +G_DEFINE_TYPE (PhotobucketAlbumPropertiesDialog, photobucket_album_properties_dialog, GTK_TYPE_DIALOG) + + enum { ALBUM_DATA_COLUMN, ALBUM_ICON_COLUMN, @@ -35,9 +38,6 @@ }; -static gpointer parent_class = NULL; - - struct _PhotobucketAlbumPropertiesDialogPrivate { GtkBuilder *builder; }; @@ -51,7 +51,7 @@ self = PHOTOBUCKET_ALBUM_PROPERTIES_DIALOG (object); _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (photobucket_album_properties_dialog_parent_class)->finalize (object); } @@ -60,7 +60,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (PhotobucketAlbumPropertiesDialogPrivate)); object_class = (GObjectClass*) klass; @@ -118,34 +117,6 @@ } -GType -photobucket_album_properties_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (PhotobucketAlbumPropertiesDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) photobucket_album_properties_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PhotobucketAlbumPropertiesDialog), - 0, - (GInstanceInitFunc) photobucket_album_properties_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "PhotobucketAlbumPropertiesDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void photobucket_album_properties_dialog_construct (PhotobucketAlbumPropertiesDialog *self, const char *name, diff -Nru gthumb-2.14.3/extensions/photobucket/photobucket.extension.in.in gthumb-3.0.0/extensions/photobucket/photobucket.extension.in.in --- gthumb-2.14.3/extensions/photobucket/photobucket.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/photobucket.extension.in.in 2012-04-21 09:24:11.000000000 +0000 @@ -10,4 +10,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=oauth;export_tools diff -Nru gthumb-2.14.3/extensions/photobucket/photobucket-photo.c gthumb-3.0.0/extensions/photobucket/photobucket-photo.c --- gthumb-2.14.3/extensions/photobucket/photobucket-photo.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/photobucket-photo.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,14 @@ #include "photobucket-photo.h" -static gpointer photobucket_photo_parent_class = NULL; +static void photobucket_photo_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (PhotobucketPhoto, + photobucket_photo, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + photobucket_photo_dom_domizable_interface_init)) static void @@ -50,14 +57,13 @@ static void photobucket_photo_class_init (PhotobucketPhotoClass *klass) { - photobucket_photo_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = photobucket_photo_finalize; } static DomElement* photobucket_photo_create_element (DomDomizable *base, - DomDocument *doc) + DomDocument *doc) { PhotobucketPhoto *self; DomElement *element; @@ -111,7 +117,7 @@ static void -photobucket_photo_dom_domizable_interface_init (DomDomizableIface *iface) +photobucket_photo_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = photobucket_photo_create_element; iface->load_from_element = photobucket_photo_load_from_element; @@ -119,43 +125,9 @@ static void -photobucket_photo_instance_init (PhotobucketPhoto *self) -{ -} - - -GType -photobucket_photo_get_type (void) +photobucket_photo_init (PhotobucketPhoto *self) { - static GType photobucket_photo_type_id = 0; - - if (photobucket_photo_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (PhotobucketPhotoClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) photobucket_photo_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PhotobucketPhoto), - 0, - (GInstanceInitFunc) photobucket_photo_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) photobucket_photo_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - photobucket_photo_type_id = g_type_register_static (G_TYPE_OBJECT, - "PhotobucketPhoto", - &g_define_type_info, - 0); - g_type_add_interface_static (photobucket_photo_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return photobucket_photo_type_id; + /* void */ } diff -Nru gthumb-2.14.3/extensions/photobucket/photobucket-service.c gthumb-3.0.0/extensions/photobucket/photobucket-service.c --- gthumb-2.14.3/extensions/photobucket/photobucket-service.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/photobucket/photobucket-service.c 2012-02-19 15:01:32.000000000 +0000 @@ -29,6 +29,9 @@ #include "photobucket-service.h" +G_DEFINE_TYPE (PhotobucketService, photobucket_service, G_TYPE_OBJECT) + + typedef struct { PhotobucketAccount *account; PhotobucketAlbum *album; @@ -67,9 +70,6 @@ }; -static gpointer parent_class = NULL; - - static void photobucket_service_finalize (GObject *object) { @@ -80,7 +80,7 @@ _g_object_unref (self->priv->conn); post_photos_data_free (self->priv->post_photos); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (photobucket_service_parent_class)->finalize (object); } @@ -89,7 +89,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (PhotobucketServicePrivate)); object_class = (GObjectClass*) klass; @@ -106,34 +105,6 @@ } -GType -photobucket_service_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (PhotobucketServiceClass), - NULL, - NULL, - (GClassInitFunc) photobucket_service_class_init, - NULL, - NULL, - sizeof (PhotobucketService), - 0, - (GInstanceInitFunc) photobucket_service_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "PhotobucketService", - &type_info, - 0); - } - - return type; -} - - PhotobucketService * photobucket_service_new (OAuthConnection *conn) { diff -Nru gthumb-2.14.3/extensions/photo_importer/callbacks.c gthumb-3.0.0/extensions/photo_importer/callbacks.c --- gthumb-2.14.3/extensions/photo_importer/callbacks.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/callbacks.c 2012-02-19 15:01:32.000000000 +0000 @@ -155,12 +155,14 @@ typedef struct { GtkBuilder *builder; + GSettings *settings; } PreferencesData; static void preferences_data_free (PreferencesData *data) { + g_object_unref (data->settings); g_object_unref (data->builder); g_free (data); } @@ -170,7 +172,7 @@ adjust_orientation_checkbutton_toggled_cb (GtkToggleButton *button, PreferencesData *data) { - eel_gconf_set_boolean (PREF_PHOTO_IMPORT_ADJUST_ORIENTATION, gtk_toggle_button_get_active (button)); + g_settings_set_boolean (data->settings, PREF_PHOTO_IMPORTER_ADJUST_ORIENTATION, gtk_toggle_button_get_active (button)); } @@ -186,6 +188,7 @@ data = g_new0 (PreferencesData, 1); data->builder = _gtk_builder_new_from_file("photo-importer-options.ui", "photo_importer"); + data->settings = g_settings_new (GTHUMB_PHOTO_IMPORTER_SCHEMA); general_vbox = _gtk_builder_get_widget (dialog_builder, "general_vbox"); importer_options = _gtk_builder_get_widget (data->builder, "importer_options"); @@ -200,7 +203,7 @@ _gtk_container_get_n_children (GTK_CONTAINER (general_vbox)) - 2); widget = _gtk_builder_get_widget (data->builder, "adjust_orientation_checkbutton"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), eel_gconf_get_boolean (PREF_PHOTO_IMPORT_ADJUST_ORIENTATION, FALSE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), g_settings_get_boolean (data->settings, PREF_PHOTO_IMPORTER_ADJUST_ORIENTATION)); g_signal_connect (widget, "toggled", G_CALLBACK (adjust_orientation_checkbutton_toggled_cb), diff -Nru gthumb-2.14.3/extensions/photo_importer/data/gthumb_photo_importer.schemas.in gthumb-3.0.0/extensions/photo_importer/data/gthumb_photo_importer.schemas.in --- gthumb-2.14.3/extensions/photo_importer/data/gthumb_photo_importer.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/data/gthumb_photo_importer.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/photo_importer/delete_from_device - /apps/gthumb/ext/photo_importer/delete_from_device - gthumb - bool - FALSE - - - - - - - - - /schemas/apps/gthumb/ext/photo_importer/adjust_orientation - /apps/gthumb/ext/photo_importer/adjust_orientation - gthumb - bool - FALSE - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/photo_importer/data/Makefile.am gthumb-3.0.0/extensions/photo_importer/data/Makefile.am --- gthumb-2.14.3/extensions/photo_importer/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_photo_importer.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/photo_importer/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/photo_importer/data/Makefile.in gthumb-3.0.0/extensions/photo_importer/data/Makefile.in --- gthumb-2.14.3/extensions/photo_importer/data/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/data/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_photo_importer.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/photo_importer/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/photo_importer/data/ui/Makefile.in gthumb-3.0.0/extensions/photo_importer/data/ui/Makefile.in --- gthumb-2.14.3/extensions/photo_importer/data/ui/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/data/ui/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/photo_importer/data/ui/photo-importer-options.ui gthumb-3.0.0/extensions/photo_importer/data/ui/photo-importer-options.ui --- gthumb-2.14.3/extensions/photo_importer/data/ui/photo-importer-options.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/data/ui/photo-importer-options.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,64 +1,41 @@ - + - - - + + True - vertical - 6 + False + 0 + none - + True - 5 + False + 6 + 12 - + + _Rotate the images physically True - After importing from a device: - center - - - + True + False + False + True + 0 + True - - False - False - 0 - - - False - 0 - - - + + True - 12 - - - True - vertical - 6 - - - _Rotate the images physically - True - True - False - True - True - - - 0 - - - - + False + After importing from a device: + True + + + - - 1 - diff -Nru gthumb-2.14.3/extensions/photo_importer/data/ui/photo-importer.ui gthumb-3.0.0/extensions/photo_importer/data/ui/photo-importer.ui --- gthumb-2.14.3/extensions/photo_importer/data/ui/photo-importer.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/data/ui/photo-importer.ui 2012-02-19 15:01:32.000000000 +0000 @@ -24,6 +24,7 @@ gtk-cancel + False True True True @@ -39,6 +40,7 @@ _Import + False True True True @@ -55,6 +57,7 @@ gtk-help + False True True True @@ -129,7 +132,7 @@ True - True + False True 0 @@ -238,6 +241,7 @@ 2 2 3 + GTK_FILL @@ -260,6 +264,7 @@ 2 3 GTK_FILL + GTK_FILL @@ -275,6 +280,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -288,6 +294,7 @@ 2 1 2 + GTK_FILL @@ -300,6 +307,7 @@ GTK_FILL + GTK_FILL @@ -313,6 +321,7 @@ 1 2 + GTK_FILL @@ -325,6 +334,7 @@ _Delete the imported files from the source + False True True False diff -Nru gthumb-2.14.3/extensions/photo_importer/dlg-photo-importer.c gthumb-3.0.0/extensions/photo_importer/dlg-photo-importer.c --- gthumb-2.14.3/extensions/photo_importer/dlg-photo-importer.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/dlg-photo-importer.c 2012-02-19 15:01:32.000000000 +0000 @@ -49,6 +49,7 @@ GtkWidget *dialog; GtkWidget *preferences_dialog; GtkBuilder *builder; + GSettings *settings; GFile *source; GFile *last_source; GtkListStore *device_list_store; @@ -98,9 +99,10 @@ g_signal_handler_disconnect (gth_main_get_default_monitor (), data->entry_points_changed_id); delete_imported = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("delete_checkbutton"))); - eel_gconf_set_boolean (PREF_PHOTO_IMPORT_DELETE, delete_imported); + g_settings_set_boolean (data->settings, PREF_PHOTO_IMPORTER_DELETE_FROM_DEVICE, delete_imported); if (data->import) { + GSettings *importer_settings; GFile *destination; gboolean single_subfolder; GthSubfolderType subfolder_type; @@ -108,11 +110,12 @@ char *custom_format; GList *file_list; + importer_settings = g_settings_new (GTHUMB_IMPORTER_SCHEMA); destination = gth_import_preferences_get_destination (); - single_subfolder = eel_gconf_get_boolean (PREF_IMPORT_SUBFOLDER_SINGLE, FALSE); - subfolder_type = eel_gconf_get_enum (PREF_IMPORT_SUBFOLDER_TYPE, GTH_TYPE_SUBFOLDER_TYPE, GTH_SUBFOLDER_TYPE_FILE_DATE); - subfolder_format = eel_gconf_get_enum (PREF_IMPORT_SUBFOLDER_FORMAT, GTH_TYPE_SUBFOLDER_FORMAT, GTH_SUBFOLDER_FORMAT_YYYYMMDD); - custom_format = eel_gconf_get_string (PREF_IMPORT_SUBFOLDER_CUSTOM_FORMAT, ""); + single_subfolder = g_settings_get_boolean (importer_settings, PREF_IMPORTER_SUBFOLDER_SINGLE); + subfolder_type = g_settings_get_enum (importer_settings, PREF_IMPORTER_SUBFOLDER_TYPE); + subfolder_format = g_settings_get_enum (importer_settings, PREF_IMPORTER_SUBFOLDER_FORMAT); + custom_format = g_settings_get_string (importer_settings, PREF_IMPORTER_SUBFOLDER_CUSTOM_FORMAT); file_list = get_selected_file_list (data); if (file_list != NULL) { @@ -131,7 +134,7 @@ tags, delete_imported, FALSE, - eel_gconf_get_boolean (PREF_PHOTO_IMPORT_ADJUST_ORIENTATION, FALSE)); + g_settings_get_boolean (data->settings, PREF_PHOTO_IMPORTER_ADJUST_ORIENTATION)); gth_browser_exec_task (data->browser, task, FALSE); g_strfreev (tags); @@ -141,12 +144,14 @@ _g_object_list_unref (file_list); g_free (custom_format); _g_object_unref (destination); + g_object_unref (importer_settings); } gtk_widget_destroy (data->dialog); gth_browser_set_dialog (data->browser, "photo_importer", NULL); g_object_unref (data->vfs_source); + g_object_unref (data->settings); g_object_unref (data->builder); _g_object_unref (data->source); _g_object_unref (data->last_source); @@ -289,7 +294,7 @@ size += g_file_info_get_size (file_data->info); n_selected += 1; } - ssize = g_format_size_for_display (size); + ssize = g_format_size (size); /* translators: %d is the number of files, %s the total size */ status = g_strdup_printf (_("Files to import: %d (%s)"), n_selected, ssize); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("status_label")), status); @@ -563,6 +568,7 @@ data = g_new0 (DialogData, 1); data->browser = browser; data->builder = _gtk_builder_new_from_file ("photo-importer.ui", "photo_importer"); + data->settings = g_settings_new (GTHUMB_PHOTO_IMPORTER_SCHEMA); data->selector_type = selector_type; data->source = _g_object_ref (source); data->cancellable = g_cancellable_new (); @@ -619,7 +625,7 @@ gtk_box_pack_start (GTK_BOX (GET_WIDGET ("source_box")), data->folder_chooser, TRUE, TRUE, 0); } - data->file_list = gth_file_list_new (gth_icon_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); + data->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); sort_type = gth_main_get_sort_type ("file::mtime"); gth_file_list_set_sort_func (GTH_FILE_LIST (data->file_list), sort_type->cmp_func, FALSE); gth_file_list_enable_thumbs (GTH_FILE_LIST (data->file_list), TRUE); @@ -670,7 +676,8 @@ gtk_box_pack_start (GTK_BOX (GET_WIDGET ("tags_entry_box")), data->tags_entry, TRUE, TRUE, 0); gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("tags_label")), data->tags_entry); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("delete_checkbutton")), eel_gconf_get_boolean (PREF_PHOTO_IMPORT_DELETE, FALSE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("delete_checkbutton")), + g_settings_get_boolean (data->settings, PREF_PHOTO_IMPORTER_DELETE_FROM_DEVICE)); data->preferences_dialog = gth_import_preferences_dialog_new (); gtk_window_set_transient_for (GTK_WINDOW (data->preferences_dialog), GTK_WINDOW (data->dialog)); diff -Nru gthumb-2.14.3/extensions/photo_importer/Makefile.am gthumb-3.0.0/extensions/photo_importer/Makefile.am --- gthumb-2.14.3/extensions/photo_importer/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/Makefile.am 2012-04-20 21:23:07.000000000 +0000 @@ -15,7 +15,10 @@ libphoto_importer_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libphoto_importer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libphoto_importer_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la ../image_rotation/libimage_rotation.la ../importer/libimporter.la +libphoto_importer_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la ../importer/libimporter.la +if ENABLE_JPEG_TOOLS +libphoto_importer_la_LIBADD += ../image_rotation/libimage_rotation.la +endif libphoto_importer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) diff -Nru gthumb-2.14.3/extensions/photo_importer/Makefile.in gthumb-3.0.0/extensions/photo_importer/Makefile.in --- gthumb-2.14.3/extensions/photo_importer/Makefile.in 2012-03-25 18:34:13.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,6 +52,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_JPEG_TOOLS_TRUE@am__append_1 = ../image_rotation/libimage_rotation.la subdir = extensions/photo_importer DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -127,6 +145,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -206,10 +229,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -217,6 +238,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -256,6 +278,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -304,8 +328,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -336,6 +358,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -381,7 +404,9 @@ libphoto_importer_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb libphoto_importer_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libphoto_importer_la_LIBADD = $(GTHUMB_LIBS) ../catalogs/libcatalogs.la ../image_rotation/libimage_rotation.la ../importer/libimporter.la +libphoto_importer_la_LIBADD = $(GTHUMB_LIBS) \ + ../catalogs/libcatalogs.la ../importer/libimporter.la \ + $(am__append_1) libphoto_importer_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) extensionini_in_files = photo_importer.extension.in.in @@ -424,7 +449,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -432,6 +456,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -523,8 +549,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -707,13 +736,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/photo_importer/photo_importer.extension.in.in gthumb-3.0.0/extensions/photo_importer/photo_importer.extension.in.in --- gthumb-2.14.3/extensions/photo_importer/photo_importer.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/photo_importer.extension.in.in 2012-04-21 09:24:13.000000000 +0000 @@ -10,4 +10,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=importer diff -Nru gthumb-2.14.3/extensions/photo_importer/preferences.h gthumb-3.0.0/extensions/photo_importer/preferences.h --- gthumb-2.14.3/extensions/photo_importer/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/photo_importer/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -26,8 +26,14 @@ G_BEGIN_DECLS -#define PREF_PHOTO_IMPORT_DELETE "/apps/gthumb/ext/photo_importer/delete_from_device" -#define PREF_PHOTO_IMPORT_ADJUST_ORIENTATION "/apps/gthumb/ext/photo_importer/adjust_orientation" +/* schemas */ + +#define GTHUMB_PHOTO_IMPORTER_SCHEMA GTHUMB_SCHEMA ".photo-importer" + +/* keys: viewer */ + +#define PREF_PHOTO_IMPORTER_DELETE_FROM_DEVICE "delete-from-device" +#define PREF_PHOTO_IMPORTER_ADJUST_ORIENTATION "adjust-orientation" G_END_DECLS diff -Nru gthumb-2.14.3/extensions/picasaweb/callbacks.c gthumb-3.0.0/extensions/picasaweb/callbacks.c --- gthumb-2.14.3/extensions/picasaweb/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/callbacks.c 2012-02-19 15:01:32.000000000 +0000 @@ -54,14 +54,16 @@ ""; -static GtkActionEntry action_entries[] = { +static GthActionEntryExt action_entries[] = { { "File_Import_PicasaWeb", "site-picasaweb", N_("_Picasa Web Album..."), NULL, N_("Download photos from Picasa Web Album"), + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, G_CALLBACK (gth_browser_activate_action_import_picasaweb) }, { "File_Export_PicasaWeb", "site-picasaweb", N_("_Picasa Web Album..."), NULL, N_("Upload photos to Picasa Web Album"), + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, G_CALLBACK (gth_browser_activate_action_export_picasaweb) }, }; @@ -91,10 +93,10 @@ data->action_group = gtk_action_group_new ("Picasa Web Actions"); gtk_action_group_set_translation_domain (data->action_group, NULL); - gtk_action_group_add_actions (data->action_group, - action_entries, - G_N_ELEMENTS (action_entries), - browser); + _gtk_action_group_add_actions_with_flags (data->action_group, + action_entries, + G_N_ELEMENTS (action_entries), + browser); gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->action_group, 0); merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), ui_info, -1, &error); @@ -103,9 +105,5 @@ g_clear_error (&error); } - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Import/Web_Services/File_Import_PicasaWeb")), TRUE); - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/MenuBar/File/Export/Web_Services/File_Export_PicasaWeb")), TRUE); - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ExportPopup/Web_Services/File_Export_PicasaWeb")), TRUE); - g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } diff -Nru gthumb-2.14.3/extensions/picasaweb/data/gthumb-picasaweb.schemas.in gthumb-3.0.0/extensions/picasaweb/data/gthumb-picasaweb.schemas.in --- gthumb-2.14.3/extensions/picasaweb/data/gthumb-picasaweb.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/data/gthumb-picasaweb.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/picasaweb/synchronize - /apps/gthumb/ext/picasaweb/synchronize - gthumb - bool - true - - - - - - - - diff -Nru gthumb-2.14.3/extensions/picasaweb/data/Makefile.am gthumb-3.0.0/extensions/picasaweb/data/Makefile.am --- gthumb-2.14.3/extensions/picasaweb/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-picasaweb.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/picasaweb/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/picasaweb/data/Makefile.in gthumb-3.0.0/extensions/picasaweb/data/Makefile.in --- gthumb-2.14.3/extensions/picasaweb/data/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/data/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-picasaweb.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/picasaweb/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/picasaweb/data/ui/export-to-picasaweb.ui gthumb-3.0.0/extensions/picasaweb/data/ui/export-to-picasaweb.ui --- gthumb-2.14.3/extensions/picasaweb/data/ui/export-to-picasaweb.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/data/ui/export-to-picasaweb.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,6 @@ - + - @@ -29,31 +28,97 @@ + False 5 Export to Picasa Web Albums dialog - + True + False vertical + + + True + False + end + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 0 + + + + + _Upload + False + True + True + True + False + upload_image + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + True + + + False + False + 2 + True + + + + + False + True + end + 0 + + True True 6 - vertical True - vertical + False 3 True + False 0 False + True 0 @@ -66,21 +131,24 @@ True - vertical + False 6 True + False 2 6 5 True + False 6 True + False 0 0 A_ccount: @@ -90,21 +158,24 @@ GTK_FILL + GTK_FILL True - vertical + False 3 True + False 6 300 True + False account_liststore @@ -120,38 +191,48 @@ + True + True 0 + False True True True + False True + False gtk-edit False + True 1 + False + True 0 True + False 6 True + False Free space: @@ -159,12 +240,14 @@ False + True 0 True + False 0 0.51999998092651367 @@ -172,11 +255,15 @@ + True + True 1 + False + True 1 @@ -184,42 +271,45 @@ 1 2 + GTK_FILL False + True 0 True - vertical + False 3 True + False 0 _Albums: True False + True 0 True + False 6 120 True True - automatic - automatic in @@ -229,6 +319,9 @@ False True 1 + + + Name @@ -263,44 +356,55 @@ + True + True 0 True - vertical + False 6 + False True True True + False True + False gtk-add False + True 0 False + True 1 + False + True 1 + False + True 1 @@ -312,64 +416,11 @@ + True + True 1 - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - _Upload - True - True - True - upload_image - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - - - False - False - 2 - True - - - - - False - end - 0 - - @@ -380,6 +431,7 @@ True + False gtk-goto-top diff -Nru gthumb-2.14.3/extensions/picasaweb/data/ui/import-from-picasaweb.ui gthumb-3.0.0/extensions/picasaweb/data/ui/import-from-picasaweb.ui --- gthumb-2.14.3/extensions/picasaweb/data/ui/import-from-picasaweb.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/data/ui/import-from-picasaweb.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,6 @@ - + - @@ -12,28 +11,111 @@ + + + + + + + + + + + + + + True + False + gtk-goto-bottom + + False 5 Import from Picasa Web Album dialog - + True + False vertical + + + True + False + end + + + gtk-help + False + True + True + True + False + True + + + False + False + 0 + True + + + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 1 + + + + + _Import + False + True + True + True + False + download_image + True + + + False + False + 2 + + + + + False + True + end + 0 + + True + False 5 - vertical 12 True - vertical + False 6 True + False 2 2 6 @@ -41,16 +123,18 @@ True - vertical + False 3 True + False 6 300 True + False account_liststore @@ -60,29 +144,37 @@ + True + True 0 + False True True True Edit accounts + False True + False gtk-edit False + True 1 + False + True 0 @@ -90,22 +182,26 @@ 1 2 + GTK_FILL True + False 0 A_ccount: True GTK_FILL + GTK_FILL True + False 0 _Album: True @@ -114,11 +210,13 @@ 1 2 GTK_FILL + GTK_FILL True + False album_liststore @@ -126,17 +224,20 @@ 2 1 2 + GTK_FILL False + True 0 False + True 0 @@ -145,116 +246,74 @@ 460 250 True - vertical + False 3 True + False 0 False + True 0 + True + True 1 True + False 6 True + False 0 _Destination: True False + True 0 True + False + True + True 1 False + True 2 + True + True 1 - - - True - end - - - gtk-help - True - True - True - True - - - False - False - 0 - True - - - - - gtk-cancel - True - True - True - True - - - False - False - 1 - - - - - _Import - True - True - True - download_image - True - - - False - False - 2 - - - - - False - end - 0 - - @@ -263,20 +322,4 @@ download_button - - True - gtk-goto-bottom - - - - - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/picasaweb/data/ui/Makefile.in gthumb-3.0.0/extensions/picasaweb/data/ui/Makefile.in --- gthumb-2.14.3/extensions/picasaweb/data/ui/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/data/ui/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -342,8 +364,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/picasaweb/data/ui/picasa-web-account-chooser.ui gthumb-3.0.0/extensions/picasaweb/data/ui/picasa-web-account-chooser.ui --- gthumb-2.14.3/extensions/picasaweb/data/ui/picasa-web-account-chooser.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/data/ui/picasa-web-account-chooser.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,6 @@ - + - @@ -18,22 +17,25 @@ True + False 5 - vertical 6 True + False 6 True + False 0 A_ccount: True False + True 0 @@ -41,6 +43,7 @@ 300 True + False account_liststore @@ -58,11 +61,15 @@ + True + True 1 + False + True 0 diff -Nru gthumb-2.14.3/extensions/picasaweb/data/ui/picasa-web-account-manager.ui gthumb-3.0.0/extensions/picasaweb/data/ui/picasa-web-account-manager.ui --- gthumb-2.14.3/extensions/picasaweb/data/ui/picasa-web-account-manager.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/data/ui/picasa-web-account-manager.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,6 @@ - + - @@ -12,11 +11,12 @@ True + False 5 - vertical True + False 0 A_ccounts: True @@ -24,24 +24,24 @@ False + True 0 True + False 6 + 300 + 150 True True - automatic - automatic in - 300 - 150 True True accounts_liststore @@ -49,6 +49,9 @@ False True 1 + + + @@ -63,56 +66,69 @@ + True + True 0 True - vertical + False 6 + False True True True + False True + False gtk-add False + True 0 + False True True True + False True + False gtk-delete False + True 1 False + True 1 + True + True 1 diff -Nru gthumb-2.14.3/extensions/picasaweb/data/ui/picasa-web-account-properties.ui gthumb-3.0.0/extensions/picasaweb/data/ui/picasa-web-account-properties.ui --- gthumb-2.14.3/extensions/picasaweb/data/ui/picasa-web-account-properties.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/data/ui/picasa-web-account-properties.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,53 +1,53 @@ - + - - - - - - - - - True - vertical + False 6 True + False 12 24 True + False 0 48 dialog-warning False + True 0 True + False 0 + True + True 1 + False + True 0 True + False 5 2 2 @@ -56,6 +56,7 @@ True + False 0 _E-Mail: True @@ -63,6 +64,7 @@ GTK_FILL + GTK_FILL @@ -70,53 +72,62 @@ 300 True True - + True 1 2 + GTK_FILL True - vertical + False 6 True True - + True True + False + True 0 - vertical + False 6 True + False 0 Type the characters you see in the picture below. Letters are not case-sensitive. True + False + True 0 True + False 12 gtk-missing-image + False + True 1 @@ -124,15 +135,19 @@ True True - + True + False + True 2 + False + True 1 @@ -142,15 +157,18 @@ 2 1 2 + GTK_FILL True + False 5 True + False 0 0 _Password: @@ -162,6 +180,7 @@ 1 2 GTK_FILL + GTK_FILL @@ -172,4 +191,12 @@ + + + + + + + + diff -Nru gthumb-2.14.3/extensions/picasaweb/data/ui/picasa-web-album-properties.ui gthumb-3.0.0/extensions/picasaweb/data/ui/picasa-web-album-properties.ui --- gthumb-2.14.3/extensions/picasaweb/data/ui/picasa-web-album-properties.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/data/ui/picasa-web-album-properties.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,13 +1,13 @@ - + - True - vertical + False True + False 3 2 6 @@ -15,6 +15,7 @@ True + False 0 _Name: True @@ -22,6 +23,7 @@ GTK_FILL + GTK_FILL @@ -29,16 +31,18 @@ 300 True True - + 1 2 + GTK_FILL True + False 0 _Visibility: True @@ -47,14 +51,17 @@ 2 3 GTK_FILL + GTK_FILL True + False True + False visibility_liststore 0 @@ -66,6 +73,7 @@ False + True 0 @@ -75,24 +83,27 @@ 2 2 3 + GTK_FILL True True - + 1 2 1 2 + GTK_FILL True + False 0 D_escription: True @@ -101,11 +112,14 @@ 1 2 + GTK_FILL + GTK_FILL False + True 0 diff -Nru gthumb-2.14.3/extensions/picasaweb/data/ui/picasa-web-export-completed.ui gthumb-3.0.0/extensions/picasaweb/data/ui/picasa-web-export-completed.ui --- gthumb-2.14.3/extensions/picasaweb/data/ui/picasa-web-export-completed.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/data/ui/picasa-web-export-completed.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,8 +1,14 @@ - + + True + False + 0 + gtk-jump-to + + False 5 False True @@ -10,19 +16,24 @@ True Files successfully uploaded to the server. - + True + False + vertical 2 - + True + False end _Open in the Browser + False True True True + False icon_image True @@ -35,9 +46,11 @@ gtk-close + False True True True + False True @@ -49,6 +62,7 @@ False + True end 0 @@ -60,9 +74,4 @@ button2 - - True - 0 - gtk-jump-to - diff -Nru gthumb-2.14.3/extensions/picasaweb/dlg-export-to-picasaweb.c gthumb-3.0.0/extensions/picasaweb/dlg-export-to-picasaweb.c --- gthumb-2.14.3/extensions/picasaweb/dlg-export-to-picasaweb.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/dlg-export-to-picasaweb.c 2012-02-19 15:01:32.000000000 +0000 @@ -289,7 +289,7 @@ g_return_if_fail (data->user != NULL); - free_space = g_format_size_for_display (data->user->quota_limit - data->user->quota_current); + free_space = g_format_size (data->user->quota_limit - data->user->quota_current); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("free_space_label")), free_space); g_free (free_space); @@ -300,7 +300,7 @@ char *used_bytes; n_photos_remaining = g_strdup_printf ("%d", album->n_photos_remaining); - used_bytes = g_format_size_for_display (album->used_bytes); + used_bytes = g_format_size (album->used_bytes); gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter); gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter, @@ -1006,7 +1006,7 @@ return; } - total_size_formatted = g_format_size_for_display (total_size); + total_size_formatted = g_format_size (total_size); text = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_total), n_total, total_size_formatted); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("images_info_label")), text); g_free (text); @@ -1014,9 +1014,8 @@ /* Set the widget data */ - data->list_view = gth_file_list_new (gth_icon_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); + data->list_view = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NO_SELECTION, FALSE); gth_file_list_set_thumb_size (GTH_FILE_LIST (data->list_view), 112); - gth_file_view_set_spacing (GTH_FILE_VIEW (gth_file_list_get_view (GTH_FILE_LIST (data->list_view))), 0); gth_file_list_enable_thumbs (GTH_FILE_LIST (data->list_view), TRUE); gth_file_list_set_ignore_hidden (GTH_FILE_LIST (data->list_view), TRUE); gth_file_list_set_caption (GTH_FILE_LIST (data->list_view), "none"); diff -Nru gthumb-2.14.3/extensions/picasaweb/dlg-import-from-picasaweb.c gthumb-3.0.0/extensions/picasaweb/dlg-import-from-picasaweb.c --- gthumb-2.14.3/extensions/picasaweb/dlg-import-from-picasaweb.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/dlg-import-from-picasaweb.c 2012-02-19 15:01:32.000000000 +0000 @@ -158,6 +158,7 @@ if (file_list != NULL) { GFile *destination; GError *error = NULL; + GSettings *settings; gboolean single_subfolder; GthSubfolderType subfolder_type; GthSubfolderFormat subfolder_format; @@ -179,10 +180,11 @@ return; } - subfolder_type = eel_gconf_get_enum (PREF_IMPORT_SUBFOLDER_TYPE, GTH_TYPE_SUBFOLDER_TYPE, GTH_SUBFOLDER_TYPE_FILE_DATE); - subfolder_format = eel_gconf_get_enum (PREF_IMPORT_SUBFOLDER_FORMAT, GTH_TYPE_SUBFOLDER_FORMAT, GTH_SUBFOLDER_FORMAT_YYYYMMDD); - single_subfolder = eel_gconf_get_boolean (PREF_IMPORT_SUBFOLDER_SINGLE, FALSE); - custom_format = eel_gconf_get_string (PREF_IMPORT_SUBFOLDER_CUSTOM_FORMAT, ""); + settings = g_settings_new (GTHUMB_IMPORTER_SCHEMA); + subfolder_type = g_settings_get_enum (settings, PREF_IMPORTER_SUBFOLDER_TYPE); + subfolder_format = g_settings_get_enum (settings, PREF_IMPORTER_SUBFOLDER_FORMAT); + single_subfolder = g_settings_get_boolean (settings, PREF_IMPORTER_SUBFOLDER_SINGLE); + custom_format = g_settings_get_string (settings, PREF_IMPORTER_SUBFOLDER_CUSTOM_FORMAT); tags = g_strsplit ((album->keywords != NULL ? album->keywords : ""), ",", -1); for (i = 0; tags[i] != NULL; i++) @@ -205,6 +207,7 @@ g_object_unref (task); g_strfreev (tags); + g_object_unref (settings); _g_object_unref (destination); } @@ -259,7 +262,7 @@ PicasaWebAlbum *album = scan->data; char *used_bytes; - used_bytes = g_format_size_for_display (album->used_bytes); + used_bytes = g_format_size (album->used_bytes); gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter); gtk_list_store_set (GTK_LIST_STORE (GET_WIDGET ("album_liststore")), &iter, @@ -796,7 +799,7 @@ size_selected += g_file_info_get_size (file_data->info); } - size_selected_formatted = g_format_size_for_display (size_selected); + size_selected_formatted = g_format_size (size_selected); text_selected = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_selected), n_selected, size_selected_formatted); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("images_info_label")), text_selected); @@ -1011,12 +1014,11 @@ /* Set the widget data */ - data->file_list = gth_file_list_new (gth_icon_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); + data->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NORMAL, FALSE); thumb_loader = gth_file_list_get_thumb_loader (GTH_FILE_LIST (data->file_list)); gth_thumb_loader_set_use_cache (thumb_loader, FALSE); gth_thumb_loader_set_loader_func (thumb_loader, picasa_web_thumbnail_loader); gth_file_list_set_thumb_size (GTH_FILE_LIST (data->file_list), PICASA_WEB_THUMB_SIZE_SMALL); - gth_file_view_set_spacing (GTH_FILE_VIEW (gth_file_list_get_view (GTH_FILE_LIST (data->file_list))), 0); gth_file_list_enable_thumbs (GTH_FILE_LIST (data->file_list), TRUE); gth_file_list_set_ignore_hidden (GTH_FILE_LIST (data->file_list), TRUE); gth_file_list_set_caption (GTH_FILE_LIST (data->file_list), "none"); diff -Nru gthumb-2.14.3/extensions/picasaweb/google-connection.c gthumb-3.0.0/extensions/picasaweb/google-connection.c --- gthumb-2.14.3/extensions/picasaweb/google-connection.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/google-connection.c 2012-02-19 15:01:32.000000000 +0000 @@ -30,6 +30,9 @@ #define GTHUMB_SOURCE ("GNOME-" PACKAGE "-" VERSION) +G_DEFINE_TYPE (GoogleConnection, google_connection, GTH_TYPE_TASK) + + GQuark google_connection_error_quark (void) { @@ -57,9 +60,6 @@ }; -static gpointer parent_class = NULL; - - static void google_connection_finalize (GObject *object) { @@ -74,7 +74,7 @@ _g_object_unref (self->priv->session); g_free (self->priv->service); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (google_connection_parent_class)->finalize (object); } @@ -103,7 +103,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GoogleConnectionPrivate)); object_class = (GObjectClass*) klass; @@ -129,34 +128,6 @@ } -GType -google_connection_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GoogleConnectionClass), - NULL, - NULL, - (GClassInitFunc) google_connection_class_init, - NULL, - NULL, - sizeof (GoogleConnection), - 0, - (GInstanceInitFunc) google_connection_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GoogleConnection", - &type_info, - 0); - } - - return type; -} - - GoogleConnection * google_connection_new (const char *service) { diff -Nru gthumb-2.14.3/extensions/picasaweb/Makefile.in gthumb-3.0.0/extensions/picasaweb/Makefile.in --- gthumb-2.14.3/extensions/picasaweb/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/Makefile.in 2012-04-23 18:09:49.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -155,6 +172,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -234,10 +256,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -245,6 +265,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -284,6 +305,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -332,8 +355,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -364,6 +385,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -473,7 +495,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -481,6 +502,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -652,8 +675,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -836,13 +862,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/picasaweb/picasa-account-chooser-dialog.c gthumb-3.0.0/extensions/picasaweb/picasa-account-chooser-dialog.c --- gthumb-2.14.3/extensions/picasaweb/picasa-account-chooser-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/picasa-account-chooser-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,6 +26,9 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) +G_DEFINE_TYPE (PicasaAccountChooserDialog, picasa_account_chooser_dialog, GTK_TYPE_DIALOG) + + typedef enum { ITEM_TYPE_COMMAND, ITEM_TYPE_ENTRY, @@ -42,9 +45,6 @@ }; -static gpointer parent_class = NULL; - - struct _PicasaAccountChooserDialogPrivate { GtkBuilder *builder; }; @@ -59,7 +59,7 @@ _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (picasa_account_chooser_dialog_parent_class)->finalize (object); } @@ -68,7 +68,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (PicasaAccountChooserDialogPrivate)); object_class = (GObjectClass*) klass; @@ -105,34 +104,6 @@ } -GType -picasa_account_chooser_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (PicasaAccountChooserDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) picasa_account_chooser_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PicasaAccountChooserDialog), - 0, - (GInstanceInitFunc) picasa_account_chooser_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "PicasaAccountChooserDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void picasa_account_chooser_dialog_construct (PicasaAccountChooserDialog *self, GList *accounts, diff -Nru gthumb-2.14.3/extensions/picasaweb/picasa-account-manager-dialog.c gthumb-3.0.0/extensions/picasaweb/picasa-account-manager-dialog.c --- gthumb-2.14.3/extensions/picasaweb/picasa-account-manager-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/picasa-account-manager-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -28,15 +28,15 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) +G_DEFINE_TYPE (PicasaAccountManagerDialog, picasa_account_manager_dialog, GTK_TYPE_DIALOG) + + enum { ACCOUNT_DATA_COLUMN, ACCOUNT_NAME_COLUMN, }; -static gpointer parent_class = NULL; - - struct _PicasaAccountManagerDialogPrivate { GtkBuilder *builder; }; @@ -51,7 +51,7 @@ _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (picasa_account_manager_dialog_parent_class)->finalize (object); } @@ -60,7 +60,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (PicasaAccountManagerDialogPrivate)); object_class = (GObjectClass*) klass; @@ -181,34 +180,6 @@ } -GType -picasa_account_manager_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (PicasaAccountManagerDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) picasa_account_manager_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PicasaAccountManagerDialog), - 0, - (GInstanceInitFunc) picasa_account_manager_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "PicasaAccountManagerDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void picasa_account_manager_dialog_construct (PicasaAccountManagerDialog *self, GList *accounts) diff -Nru gthumb-2.14.3/extensions/picasaweb/picasa-account-properties-dialog.c gthumb-3.0.0/extensions/picasaweb/picasa-account-properties-dialog.c --- gthumb-2.14.3/extensions/picasaweb/picasa-account-properties-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/picasa-account-properties-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -27,7 +27,7 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) -static gpointer parent_class = NULL; +G_DEFINE_TYPE (PicasaAccountPropertiesDialog, picasa_account_properties_dialog, GTK_TYPE_DIALOG) struct _PicasaAccountPropertiesDialogPrivate { @@ -45,7 +45,7 @@ _g_object_unref (self->priv->builder); g_object_unref (self->priv->cancellable); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (picasa_account_properties_dialog_parent_class)->finalize (object); } @@ -54,7 +54,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (PicasaAccountPropertiesDialogPrivate)); object_class = (GObjectClass*) klass; @@ -91,34 +90,6 @@ } -GType -picasa_account_properties_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (PicasaAccountPropertiesDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) picasa_account_properties_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PicasaAccountPropertiesDialog), - 0, - (GInstanceInitFunc) picasa_account_properties_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "PicasaAccountPropertiesDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void image_buffer_ready_cb (void **buffer, gsize count, diff -Nru gthumb-2.14.3/extensions/picasaweb/picasa-album-properties-dialog.c gthumb-3.0.0/extensions/picasaweb/picasa-album-properties-dialog.c --- gthumb-2.14.3/extensions/picasaweb/picasa-album-properties-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/picasa-album-properties-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -27,7 +27,7 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) -static gpointer parent_class = NULL; +G_DEFINE_TYPE (PicasaAlbumPropertiesDialog, picasa_album_properties_dialog, GTK_TYPE_DIALOG) struct _PicasaAlbumPropertiesDialogPrivate { @@ -43,7 +43,7 @@ self = PICASA_ALBUM_PROPERTIES_DIALOG (object); _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (picasa_album_properties_dialog_parent_class)->finalize (object); } @@ -52,7 +52,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (PicasaAlbumPropertiesDialogPrivate)); object_class = (GObjectClass*) klass; @@ -84,34 +83,6 @@ } -GType -picasa_album_properties_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (PicasaAlbumPropertiesDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) picasa_album_properties_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PicasaAlbumPropertiesDialog), - 0, - (GInstanceInitFunc) picasa_album_properties_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "PicasaAlbumPropertiesDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void picasa_album_properties_dialog_construct (PicasaAlbumPropertiesDialog *self, const char *name, diff -Nru gthumb-2.14.3/extensions/picasaweb/picasa-web-album.c gthumb-3.0.0/extensions/picasaweb/picasa-web-album.c --- gthumb-2.14.3/extensions/picasaweb/picasa-web-album.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/picasa-web-album.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,14 @@ #include "picasa-web-album.h" -static gpointer picasa_web_album_parent_class = NULL; +static void picasa_web_album_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (PicasaWebAlbum, + picasa_web_album, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + picasa_web_album_dom_domizable_interface_init)) static void @@ -48,7 +55,6 @@ static void picasa_web_album_class_init (PicasaWebAlbumClass *klass) { - picasa_web_album_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = picasa_web_album_finalize; } @@ -170,7 +176,7 @@ static void -picasa_web_album_dom_domizable_interface_init (DomDomizableIface *iface) +picasa_web_album_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = picasa_web_album_create_element; iface->load_from_element = picasa_web_album_load_from_element; @@ -178,43 +184,9 @@ static void -picasa_web_album_instance_init (PicasaWebAlbum *self) -{ -} - - -GType -picasa_web_album_get_type (void) +picasa_web_album_init (PicasaWebAlbum *self) { - static GType picasa_web_album_type_id = 0; - - if (picasa_web_album_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (PicasaWebAlbumClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) picasa_web_album_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PicasaWebAlbum), - 0, - (GInstanceInitFunc) picasa_web_album_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) picasa_web_album_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - picasa_web_album_type_id = g_type_register_static (G_TYPE_OBJECT, - "PicasaWebAlbum", - &g_define_type_info, - 0); - g_type_add_interface_static (picasa_web_album_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return picasa_web_album_type_id; + /* void */ } diff -Nru gthumb-2.14.3/extensions/picasaweb/picasaweb.extension.in.in gthumb-3.0.0/extensions/picasaweb/picasaweb.extension.in.in --- gthumb-2.14.3/extensions/picasaweb/picasaweb.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/picasaweb.extension.in.in 2012-04-21 09:24:08.000000000 +0000 @@ -10,4 +10,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=importer;export_tools diff -Nru gthumb-2.14.3/extensions/picasaweb/picasa-web-photo.c gthumb-3.0.0/extensions/picasaweb/picasa-web-photo.c --- gthumb-2.14.3/extensions/picasaweb/picasa-web-photo.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/picasa-web-photo.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,14 @@ #include "picasa-web-photo.h" -static gpointer picasa_web_photo_parent_class = NULL; +static void picasa_web_photo_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (PicasaWebPhoto, + picasa_web_photo, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + picasa_web_photo_dom_domizable_interface_init)) static void @@ -51,14 +58,13 @@ static void picasa_web_photo_class_init (PicasaWebPhotoClass *klass) { - picasa_web_photo_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = picasa_web_photo_finalize; } -static DomElement* +static DomElement * picasa_web_photo_create_element (DomDomizable *base, - DomDocument *doc) + DomDocument *doc) { PicasaWebPhoto *self; DomElement *element; @@ -124,7 +130,7 @@ static void picasa_web_photo_load_from_element (DomDomizable *base, - DomElement *element) + DomElement *element) { PicasaWebPhoto *self; DomElement *node; @@ -203,7 +209,7 @@ static void -picasa_web_photo_dom_domizable_interface_init (DomDomizableIface *iface) +picasa_web_photo_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = picasa_web_photo_create_element; iface->load_from_element = picasa_web_photo_load_from_element; @@ -211,43 +217,9 @@ static void -picasa_web_photo_instance_init (PicasaWebPhoto *self) -{ -} - - -GType -picasa_web_photo_get_type (void) +picasa_web_photo_init (PicasaWebPhoto *self) { - static GType picasa_web_photo_type_id = 0; - - if (picasa_web_photo_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (PicasaWebPhotoClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) picasa_web_photo_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PicasaWebPhoto), - 0, - (GInstanceInitFunc) picasa_web_photo_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) picasa_web_photo_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - picasa_web_photo_type_id = g_type_register_static (G_TYPE_OBJECT, - "PicasaWebPhoto", - &g_define_type_info, - 0); - g_type_add_interface_static (picasa_web_photo_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return picasa_web_photo_type_id; + /* void */ } diff -Nru gthumb-2.14.3/extensions/picasaweb/picasa-web-service.c gthumb-3.0.0/extensions/picasaweb/picasa-web-service.c --- gthumb-2.14.3/extensions/picasaweb/picasa-web-service.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/picasa-web-service.c 2012-02-19 15:01:32.000000000 +0000 @@ -28,6 +28,9 @@ #include "picasa-web-service.h" +G_DEFINE_TYPE (PicasaWebService, picasa_web_service, G_TYPE_OBJECT) + + typedef struct { PicasaWebAlbum *album; GList *file_list; @@ -63,9 +66,6 @@ }; -static gpointer parent_class = NULL; - - static void picasa_web_service_finalize (GObject *object) { @@ -77,7 +77,7 @@ _g_object_unref (self->priv->user); post_photos_data_free (self->priv->post_photos); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (picasa_web_service_parent_class)->finalize (object); } @@ -86,7 +86,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (PicasaWebServicePrivate)); object_class = (GObjectClass*) klass; @@ -104,34 +103,6 @@ } -GType -picasa_web_service_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (PicasaWebServiceClass), - NULL, - NULL, - (GClassInitFunc) picasa_web_service_class_init, - NULL, - NULL, - sizeof (PicasaWebService), - 0, - (GInstanceInitFunc) picasa_web_service_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "PicasaWebService", - &type_info, - 0); - } - - return type; -} - - PicasaWebService * picasa_web_service_new (GoogleConnection *conn) { diff -Nru gthumb-2.14.3/extensions/picasaweb/picasa-web-user.c gthumb-3.0.0/extensions/picasaweb/picasa-web-user.c --- gthumb-2.14.3/extensions/picasaweb/picasa-web-user.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/picasa-web-user.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,14 @@ #include "picasa-web-user.h" -static gpointer picasa_web_user_parent_class = NULL; +static void picasa_web_user_dom_domizable_interface_init (DomDomizableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (PicasaWebUser, + picasa_web_user, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + picasa_web_user_dom_domizable_interface_init)) static void @@ -47,7 +54,6 @@ static void picasa_web_user_class_init (PicasaWebUserClass *klass) { - picasa_web_user_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = picasa_web_user_finalize; } @@ -123,7 +129,7 @@ static void -picasa_web_user_dom_domizable_interface_init (DomDomizableIface *iface) +picasa_web_user_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = picasa_web_user_create_element; iface->load_from_element = picasa_web_user_load_from_element; @@ -131,43 +137,9 @@ static void -picasa_web_user_instance_init (PicasaWebUser *self) -{ -} - - -GType -picasa_web_user_get_type (void) +picasa_web_user_init (PicasaWebUser *self) { - static GType picasa_web_user_type_id = 0; - - if (picasa_web_user_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (PicasaWebUserClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) picasa_web_user_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PicasaWebUser), - 0, - (GInstanceInitFunc) picasa_web_user_instance_init, - NULL - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) picasa_web_user_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - picasa_web_user_type_id = g_type_register_static (G_TYPE_OBJECT, - "PicasaWebUser", - &g_define_type_info, - 0); - g_type_add_interface_static (picasa_web_user_type_id, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - } - - return picasa_web_user_type_id; + /* void */ } diff -Nru gthumb-2.14.3/extensions/picasaweb/preferences.h gthumb-3.0.0/extensions/picasaweb/preferences.h --- gthumb-2.14.3/extensions/picasaweb/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/picasaweb/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -22,6 +22,12 @@ #ifndef PREFERENCES_H #define PREFERENCES_H -#define PREF_PICASAWEB_SYNCHRONIZE "/apps/gthumb/ext/picasaweb/synchronize" +/* schema */ + +#define GTHUMB_PICASAWEB_SCHEMA GTHUMB_SCHEMA ".picasaweb" + +/* keys */ + +#define PREF_PICASAWEB_SYNCHRONIZE "synchronize" #endif /* PREFERENCES_H */ diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in gthumb-3.0.0/extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in --- gthumb-2.14.3/extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,156 +0,0 @@ - - - - - - - /schemas/apps/gthumb/save_options/jpeg/default_ext - /apps/gthumb/save_options/jpeg/default_ext - gthumb - string - jpeg - - - Possible values are: jpeg, jpg. - - - - - - /schemas/apps/gthumb/save_options/jpeg/quality - /apps/gthumb/save_options/jpeg/quality - gthumb - int - 85 - - - - - - - - - /schemas/apps/gthumb/save_options/jpeg/smoothing - /apps/gthumb/save_options/jpeg/smoothing - gthumb - int - 0 - - - - - - - - - /schemas/apps/gthumb/save_options/jpeg/optimize - /apps/gthumb/save_options/jpeg/optimize - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/save_options/jpeg/progressive - /apps/gthumb/save_options/jpeg/progressive - gthumb - bool - false - - - - - - - - - - - /schemas/apps/gthumb/save_options/png/compression_level - /apps/gthumb/save_options/png/compression_level - gthumb - int - 6 - - - - - - - - - - - /schemas/apps/gthumb/save_options/tga/rle_compression - /apps/gthumb/save_options/tga/rle_compression - gthumb - bool - true - - - - - - - - - - - /schemas/apps/gthumb/save_options/tiff/default_ext - /apps/gthumb/save_options/tiff/default_ext - gthumb - string - tiff - - - Possible values are: tiff, tif. - - - - - - /schemas/apps/gthumb/save_options/tiff/compression - /apps/gthumb/save_options/tiff/compression - gthumb - string - deflate - - - Possible values are: none, deflate, jpeg. - - - - - - /schemas/apps/gthumb/save_options/tiff/horizontal_resolution - /apps/gthumb/save_options/tiff/horizontal_resolution - gthumb - int - 72 - - - - - - - - - /schemas/apps/gthumb/save_options/tiff/vertical_resolution - /apps/gthumb/save_options/tiff/vertical_resolution - gthumb - int - 72 - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/data/Makefile.am gthumb-3.0.0/extensions/pixbuf_savers/data/Makefile.am --- gthumb-2.14.3/extensions/pixbuf_savers/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-pixbuf-savers.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/pixbuf_savers/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/data/Makefile.in gthumb-3.0.0/extensions/pixbuf_savers/data/Makefile.in --- gthumb-2.14.3/extensions/pixbuf_savers/data/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/data/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-pixbuf-savers.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/pixbuf_savers/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/data/ui/jpeg-options.ui gthumb-3.0.0/extensions/pixbuf_savers/data/ui/jpeg-options.ui --- gthumb-2.14.3/extensions/pixbuf_savers/data/ui/jpeg-options.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/data/ui/jpeg-options.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,19 +1,20 @@ - + - + True False 6 + vertical 12 - + True False 6 @@ -21,9 +22,9 @@ True False - 0 _Default extension: True + jpeg_default_extension_combobox False @@ -36,7 +37,6 @@ True False jpeg_default_ext_liststore - 0 @@ -58,13 +58,51 @@ - + True False + 6 + 6 4 2 - 12 - 6 + + + + + + + + + True + False + 0 + _Quality: + True + jpeg_quality_hscale + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + _Smoothing: + True + jpeg_smooth_hscale + + + 0 + 1 + 1 + 1 + + Opti_mize @@ -74,15 +112,13 @@ False True 0 - True True - 2 + 0 2 - 3 - GTK_FILL - + 2 + 1 @@ -97,78 +133,47 @@ True - 2 + 0 3 - 4 - GTK_FILL - - - - - - True - False - 0 - _Quality: - True - jpeg_quality_hscale - - - GTK_FILL - GTK_FILL + 2 + 1 - - 150 + True True + True jpeg_quality_adjustment - 0 + 1 left 1 - 2 - GTK_FILL + 0 + 1 + 1 - - 150 + True True + True jpeg_smooth_adjustment - 0 + 1 left 1 - 2 1 - 2 - GTK_FILL - - - - - True - False - 0 - _Smoothing: - True - jpeg_smooth_hscale - - - 1 - 2 - GTK_FILL - GTK_FILL + 1 + 1 - True + False True 1 diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/data/ui/Makefile.in gthumb-3.0.0/extensions/pixbuf_savers/data/ui/Makefile.in --- gthumb-2.14.3/extensions/pixbuf_savers/data/ui/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/data/ui/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -340,8 +362,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/data/ui/png-options.ui gthumb-3.0.0/extensions/pixbuf_savers/data/ui/png-options.ui --- gthumb-2.14.3/extensions/pixbuf_savers/data/ui/png-options.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/data/ui/png-options.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,53 +1,55 @@ - + - - + - 6 9 + 6 1 1 - + True + False 6 vertical - + True + False 12 - + True - 0 - 0.89999997615814209 + False Compression _level: True png_compression_hscale False - False + True 0 - - 100 + True True png_compression_adjustment + 1 0 left + True + True 1 False - False + True 0 diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/data/ui/save-options-preferences.ui gthumb-3.0.0/extensions/pixbuf_savers/data/ui/save-options-preferences.ui --- gthumb-2.14.3/extensions/pixbuf_savers/data/ui/save-options-preferences.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/data/ui/save-options-preferences.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,153 +1,137 @@ - + - - + - + - + True + False 12 vertical - 12 + 6 - + True - vertical - 6 + False + 0 + Default options: + + + + + + False + True + 0 + + + + + True + False + 12 - + + 120 True - 0 - Default options: - - - + True + in + + + True + True + file_type_liststore + False + False + 0 + + + + + + + + + 2 + + + + + + False - False + True 0 - + True - True - 100 - True + False + vertical - + True - True - automatic - automatic - in - - - True - True - file_type_liststore - False - - - - - - 2 - - - - - - + False + 0 + + + - False - True + False + True + 0 - + True - vertical - - - True - 0 - - - - - - - False - 0 - - - - - True - - - False - 6 - 1 - - - - - True - True - False - False - - - - - - - - - - - - - - - - - - - - - False - 2 - - + False - True - True + False + True + 1 + + + + + True + False + 6 + False + False + + + True + True + 2 + False + True 1 - 0 + True + True + 1 - diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/data/ui/tga-options.ui gthumb-3.0.0/extensions/pixbuf_savers/data/ui/tga-options.ui --- gthumb-2.14.3/extensions/pixbuf_savers/data/ui/tga-options.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/data/ui/tga-options.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,9 +1,9 @@ - + - - - + + True + False 6 vertical @@ -12,13 +12,14 @@ True True False + False True - True + 0 True False - False + True 0 diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/data/ui/tiff-options.ui gthumb-3.0.0/extensions/pixbuf_savers/data/ui/tiff-options.ui --- gthumb-2.14.3/extensions/pixbuf_savers/data/ui/tiff-options.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/data/ui/tiff-options.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,47 +1,49 @@ - + - - + + + + + + + - 72 1 10000 - 1 - 10 - - 72 - 1 - 10000 1 10 - + True + False 6 + vertical 12 - + True + False 6 True - 0 + False _Default extension: True tiff_default_extension_combobox False + True 0 True + False tiff_default_ext_liststore - 0 @@ -51,41 +53,34 @@ False + True 1 False + True 0 - + True - 6 - - - True - 0 - Compression - - - - - - False - False - 0 - - + False + 0 + none True + False + 6 12 - + True + False + vertical 6 @@ -93,13 +88,15 @@ True True False + False True + 0 True True False - False + True 0 @@ -109,13 +106,16 @@ True True False + False True + 0 + True True tiff_comp_none_radiobutton False - False + True 1 @@ -125,176 +125,197 @@ True True False + False True + 0 + True True tiff_comp_none_radiobutton False - False + True 2 - - 1 - + + + + True + False + Compression + True + + + + False + True 1 - + True - 6 - - - True - 0 - Resolution - - - - - - False - False - 0 - - + False + 0 + none True + False + 6 12 - + True + False + 6 + 6 2 2 - 12 - 6 - + True + False 0 _Horizontal: True + tiff_hdpi_spinbutton - GTK_FILL - + 0 + 0 + 1 + 1 - + True + False 0 _Vertical: True + tiff_vdpi_spinbutton + 0 1 - 2 - GTK_FILL - + 1 + 1 - + True + False 6 True True - + tiff_hdpi_adjustment - 1 False + True 0 - + True + False dpi False - False + True 1 1 - 2 - GTK_FILL + 0 + 1 + 1 - + True + False 6 True True - + tiff_vdpi_adjustment - 1 False + True 0 - + True + False dpi False - False + True 1 1 - 2 1 - 2 - GTK_FILL - GTK_FILL + 1 + 1 - - 1 - + + + + True + False + Resolution + True + + + + False + True 2 - - - - - + + 1 + 10000 + 72 + 1 + 10 diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/gth-jpeg-saver.c gthumb-3.0.0/extensions/pixbuf_savers/gth-jpeg-saver.c --- gthumb-2.14.3/extensions/pixbuf_savers/gth-jpeg-saver.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/gth-jpeg-saver.c 2012-02-19 15:01:32.000000000 +0000 @@ -35,33 +35,26 @@ #include "preferences.h" +G_DEFINE_TYPE (GthJpegSaver, gth_jpeg_saver, GTH_TYPE_PIXBUF_SAVER) + + struct _GthJpegSaverPrivate { GtkBuilder *builder; + GSettings *settings; char *default_ext; }; -static gpointer parent_class = NULL; - - -static void -gth_jpeg_saver_init (GthJpegSaver *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_JPEG_SAVER, GthJpegSaverPrivate); - self->priv->builder = NULL; - self->priv->default_ext = NULL; -} - - static void gth_jpeg_saver_finalize (GObject *object) { GthJpegSaver *self = GTH_JPEG_SAVER (object); + _g_object_unref (self->priv->settings); _g_object_unref (self->priv->builder); g_free (self->priv->default_ext); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_jpeg_saver_parent_class)->finalize (object); } @@ -71,7 +64,7 @@ GthJpegSaver *self = GTH_JPEG_SAVER (base); if (self->priv->default_ext == NULL) - self->priv->default_ext = eel_gconf_get_string (PREF_JPEG_DEFAULT_EXT, "jpeg"); + self->priv->default_ext = g_settings_get_string (self->priv->settings, PREF_JPEG_DEFAULT_EXT); return self->priv->default_ext; } @@ -105,13 +98,13 @@ g_strfreev (extensions); gtk_adjustment_set_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_quality_adjustment")), - eel_gconf_get_integer (PREF_JPEG_QUALITY, 85)); + g_settings_get_int (self->priv->settings, PREF_JPEG_QUALITY)); gtk_adjustment_set_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_smooth_adjustment")), - eel_gconf_get_integer (PREF_JPEG_SMOOTHING, 0)); + g_settings_get_int (self->priv->settings, PREF_JPEG_SMOOTHING)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_optimize_checkbutton")), - eel_gconf_get_boolean (PREF_JPEG_OPTIMIZE, TRUE)); + g_settings_get_boolean (self->priv->settings, PREF_JPEG_OPTIMIZE)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_progressive_checkbutton")), - eel_gconf_get_boolean (PREF_JPEG_PROGRESSIVE, FALSE)); + g_settings_get_boolean (self->priv->settings, PREF_JPEG_PROGRESSIVE)); return _gtk_builder_get_widget (self->priv->builder, "jpeg_options"); } @@ -129,12 +122,12 @@ &iter, 0, &self->priv->default_ext, -1); - eel_gconf_set_string (PREF_JPEG_DEFAULT_EXT, self->priv->default_ext); + g_settings_set_string (self->priv->settings, PREF_JPEG_DEFAULT_EXT, self->priv->default_ext); } - eel_gconf_set_integer (PREF_JPEG_QUALITY, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_quality_adjustment")))); - eel_gconf_set_integer (PREF_JPEG_SMOOTHING, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_smooth_adjustment")))); - eel_gconf_set_boolean (PREF_JPEG_OPTIMIZE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_optimize_checkbutton")))); - eel_gconf_set_boolean (PREF_JPEG_PROGRESSIVE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_progressive_checkbutton")))); + g_settings_set_int (self->priv->settings, PREF_JPEG_QUALITY, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_quality_adjustment")))); + g_settings_set_int (self->priv->settings, PREF_JPEG_SMOOTHING, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "jpeg_smooth_adjustment")))); + g_settings_set_boolean (self->priv->settings, PREF_JPEG_OPTIMIZE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_optimize_checkbutton")))); + g_settings_set_boolean (self->priv->settings, PREF_JPEG_PROGRESSIVE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "jpeg_progressive_checkbutton")))); } @@ -436,7 +429,7 @@ static gboolean -gth_jpeg_saver_save_pixbuf (GthPixbufSaver *self, +gth_jpeg_saver_save_pixbuf (GthPixbufSaver *base, GdkPixbuf *pixbuf, char **buffer, gsize *buffer_size, @@ -444,33 +437,33 @@ GError **error) { #ifdef HAVE_LIBJPEG - - char **option_keys; - char **option_values; - int i = -1; - int i_value; - gboolean result; + GthJpegSaver *self = GTH_JPEG_SAVER (base); + char **option_keys; + char **option_values; + int i = -1; + int i_value; + gboolean result; option_keys = g_malloc (sizeof (char *) * 5); option_values = g_malloc (sizeof (char *) * 5); i++; - i_value = eel_gconf_get_integer (PREF_JPEG_QUALITY, 85); + i_value = g_settings_get_int (self->priv->settings, PREF_JPEG_QUALITY); option_keys[i] = g_strdup ("quality"); option_values[i] = g_strdup_printf ("%d", i_value); i++; - i_value = eel_gconf_get_integer (PREF_JPEG_SMOOTHING, 0); + i_value = g_settings_get_int (self->priv->settings, PREF_JPEG_SMOOTHING); option_keys[i] = g_strdup ("smooth"); option_values[i] = g_strdup_printf ("%d", i_value); i++; - i_value = eel_gconf_get_boolean (PREF_JPEG_OPTIMIZE, TRUE); + i_value = g_settings_get_boolean (self->priv->settings, PREF_JPEG_OPTIMIZE); option_keys[i] = g_strdup ("optimize"); option_values[i] = g_strdup (i_value != 0 ? "yes" : "no"); i++; - i_value = eel_gconf_get_boolean (PREF_JPEG_PROGRESSIVE, TRUE); + i_value = g_settings_get_boolean (self->priv->settings, PREF_JPEG_PROGRESSIVE); option_keys[i] = g_strdup ("progressive"); option_values[i] = g_strdup (i_value != 0 ? "yes" : "no"); @@ -516,7 +509,6 @@ GObjectClass *object_class; GthPixbufSaverClass *pixbuf_saver_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthJpegSaverPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -535,29 +527,11 @@ } -GType -gth_jpeg_saver_get_type (void) +static void +gth_jpeg_saver_init (GthJpegSaver *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthJpegSaverClass), - NULL, - NULL, - (GClassInitFunc) gth_jpeg_saver_class_init, - NULL, - NULL, - sizeof (GthJpegSaver), - 0, - (GInstanceInitFunc) gth_jpeg_saver_init - }; - - type = g_type_register_static (GTH_TYPE_PIXBUF_SAVER, - "GthJpegSaver", - &type_info, - 0); - } - - return type; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_JPEG_SAVER, GthJpegSaverPrivate); + self->priv->settings = g_settings_new (GTHUMB_PIXBUF_SAVERS_JPEG_SCHEMA); + self->priv->builder = NULL; + self->priv->default_ext = NULL; } diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/gth-png-saver.c gthumb-3.0.0/extensions/pixbuf_savers/gth-png-saver.c --- gthumb-2.14.3/extensions/pixbuf_savers/gth-png-saver.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/gth-png-saver.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,28 +26,23 @@ #include "preferences.h" +G_DEFINE_TYPE (GthPngSaver, gth_png_saver, GTH_TYPE_PIXBUF_SAVER) + + struct _GthPngSaverPrivate { GtkBuilder *builder; + GSettings *settings; }; -static gpointer parent_class = NULL; - - -static void -gth_png_saver_init (GthPngSaver *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_PNG_SAVER, GthPngSaverPrivate); -} - - static void gth_png_saver_finalize (GObject *object) { GthPngSaver *self = GTH_PNG_SAVER (object); _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + _g_object_unref (self->priv->settings); + G_OBJECT_CLASS (gth_png_saver_parent_class)->finalize (object); } @@ -60,7 +55,7 @@ self->priv->builder = _gtk_builder_new_from_file ("png-options.ui", "pixbuf_savers"); gtk_adjustment_set_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "png_compression_adjustment")), - eel_gconf_get_integer (PREF_PNG_COMPRESSION_LEVEL, 6)); + g_settings_get_int (self->priv->settings, PREF_PNG_COMPRESSION_LEVEL)); return _gtk_builder_get_widget (self->priv->builder, "png_options"); } @@ -71,7 +66,7 @@ { GthPngSaver *self = GTH_PNG_SAVER (base); - eel_gconf_set_integer (PREF_PNG_COMPRESSION_LEVEL, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "png_compression_adjustment")))); + g_settings_set_int (self->priv->settings, PREF_PNG_COMPRESSION_LEVEL, (int) gtk_adjustment_get_value (GTK_ADJUSTMENT (_gtk_builder_get_widget (self->priv->builder, "png_compression_adjustment")))); } @@ -84,19 +79,20 @@ static gboolean -gth_png_saver_save_pixbuf (GthPixbufSaver *self, +gth_png_saver_save_pixbuf (GthPixbufSaver *base, GdkPixbuf *pixbuf, char **buffer, gsize *buffer_size, const char *mime_type, GError **error) { - char *pixbuf_type; - char **option_keys; - char **option_values; - int i = -1; - int i_value; - gboolean result; + GthPngSaver *self = GTH_PNG_SAVER (base); + char *pixbuf_type; + char **option_keys; + char **option_values; + int i = -1; + int i_value; + gboolean result; pixbuf_type = get_pixbuf_type_from_mime_type (mime_type); @@ -104,7 +100,7 @@ option_values = g_malloc (sizeof (char *) * 2); i++; - i_value = eel_gconf_get_integer (PREF_PNG_COMPRESSION_LEVEL, 6); + i_value = g_settings_get_int (self->priv->settings, PREF_PNG_COMPRESSION_LEVEL); option_keys[i] = g_strdup ("compression");; option_values[i] = g_strdup_printf ("%d", i_value); @@ -134,7 +130,6 @@ GObjectClass *object_class; GthPixbufSaverClass *pixbuf_saver_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthPngSaverPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -153,29 +148,9 @@ } -GType -gth_png_saver_get_type (void) +static void +gth_png_saver_init (GthPngSaver *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthPngSaverClass), - NULL, - NULL, - (GClassInitFunc) gth_png_saver_class_init, - NULL, - NULL, - sizeof (GthPngSaver), - 0, - (GInstanceInitFunc) gth_png_saver_init - }; - - type = g_type_register_static (GTH_TYPE_PIXBUF_SAVER, - "GthPngSaver", - &type_info, - 0); - } - - return type; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_PNG_SAVER, GthPngSaverPrivate); + self->priv->settings = g_settings_new (GTHUMB_PIXBUF_SAVERS_PNG_SCHEMA); } diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/gth-tga-saver.c gthumb-3.0.0/extensions/pixbuf_savers/gth-tga-saver.c --- gthumb-2.14.3/extensions/pixbuf_savers/gth-tga-saver.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/gth-tga-saver.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,28 +26,23 @@ #include "preferences.h" +G_DEFINE_TYPE (GthTgaSaver, gth_tga_saver, GTH_TYPE_PIXBUF_SAVER) + + struct _GthTgaSaverPrivate { GtkBuilder *builder; + GSettings *settings; }; -static gpointer parent_class = NULL; - - -static void -gth_tga_saver_init (GthTgaSaver *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TGA_SAVER, GthTgaSaverPrivate); -} - - static void gth_tga_saver_finalize (GObject *object) { GthTgaSaver *self = GTH_TGA_SAVER (object); _g_object_unref (self->priv->builder); - G_OBJECT_CLASS (parent_class)->finalize (object); + _g_object_unref (self->priv->settings); + G_OBJECT_CLASS (gth_tga_saver_parent_class)->finalize (object); } @@ -60,7 +55,7 @@ self->priv->builder = _gtk_builder_new_from_file ("tga-options.ui", "pixbuf_savers"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tga_rle_compression_checkbutton")), - eel_gconf_get_boolean (PREF_TGA_RLE_COMPRESSION, TRUE)); + g_settings_get_boolean (self->priv->settings, PREF_TGA_RLE_COMPRESSION)); return _gtk_builder_get_widget (self->priv->builder, "tga_options"); } @@ -71,7 +66,7 @@ { GthTgaSaver *self = GTH_TGA_SAVER (base); - eel_gconf_set_boolean (PREF_TGA_RLE_COMPRESSION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tga_rle_compression_checkbutton")))); + g_settings_set_boolean (self->priv->settings, PREF_TGA_RLE_COMPRESSION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tga_rle_compression_checkbutton")))); } @@ -320,18 +315,19 @@ static gboolean -gth_tga_saver_save_pixbuf (GthPixbufSaver *self, +gth_tga_saver_save_pixbuf (GthPixbufSaver *base, GdkPixbuf *pixbuf, char **buffer, gsize *buffer_size, const char *mime_type, GError **error) { - char *pixbuf_type; - char **option_keys; - char **option_values; - int i = -1; - gboolean result; + GthTgaSaver *self = GTH_TGA_SAVER (base); + char *pixbuf_type; + char **option_keys; + char **option_values; + int i = -1; + gboolean result; pixbuf_type = get_pixbuf_type_from_mime_type (mime_type); @@ -340,7 +336,7 @@ i++; option_keys[i] = g_strdup ("compression"); - option_values[i] = g_strdup (eel_gconf_get_boolean (PREF_TGA_RLE_COMPRESSION, TRUE) ? "rle" : "none"); + option_values[i] = g_strdup (g_settings_get_boolean (self->priv->settings, PREF_TGA_RLE_COMPRESSION) ? "rle" : "none"); i++; option_keys[i] = NULL; @@ -367,7 +363,6 @@ GObjectClass *object_class; GthPixbufSaverClass *pixbuf_saver_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthTgaSaverPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -386,29 +381,9 @@ } -GType -gth_tga_saver_get_type (void) +static void +gth_tga_saver_init (GthTgaSaver *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTgaSaverClass), - NULL, - NULL, - (GClassInitFunc) gth_tga_saver_class_init, - NULL, - NULL, - sizeof (GthTgaSaver), - 0, - (GInstanceInitFunc) gth_tga_saver_init - }; - - type = g_type_register_static (GTH_TYPE_PIXBUF_SAVER, - "GthTgaSaver", - &type_info, - 0); - } - - return type; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TGA_SAVER, GthTgaSaverPrivate); + self->priv->settings = g_settings_new (GTHUMB_PIXBUF_SAVERS_TGA_SCHEMA); } diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/gth-tiff-saver.c gthumb-3.0.0/extensions/pixbuf_savers/gth-tiff-saver.c --- gthumb-2.14.3/extensions/pixbuf_savers/gth-tiff-saver.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/gth-tiff-saver.c 2012-03-12 17:30:19.000000000 +0000 @@ -30,33 +30,26 @@ #include "preferences.h" +G_DEFINE_TYPE (GthTiffSaver, gth_tiff_saver, GTH_TYPE_PIXBUF_SAVER) + + struct _GthTiffSaverPrivate { + GSettings *settings; GtkBuilder *builder; char *default_ext; }; -static gpointer parent_class = NULL; - - -static void -gth_tiff_saver_init (GthTiffSaver *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TIFF_SAVER, GthTiffSaverPrivate); - self->priv->builder = NULL; - self->priv->default_ext = NULL; -} - - static void gth_tiff_saver_finalize (GObject *object) { GthTiffSaver *self = GTH_TIFF_SAVER (object); + _g_object_unref (self->priv->settings); _g_object_unref (self->priv->builder); g_free (self->priv->default_ext); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_tiff_saver_parent_class)->finalize (object); } @@ -66,11 +59,12 @@ GthTiffSaver *self = GTH_TIFF_SAVER (base); if (self->priv->default_ext == NULL) - self->priv->default_ext = eel_gconf_get_string (PREF_TIFF_DEFAULT_EXT, "tiff"); + self->priv->default_ext = g_settings_get_string (self->priv->settings, PREF_TIFF_DEFAULT_EXT); return self->priv->default_ext; } + static GtkWidget * gth_tiff_saver_get_control (GthPixbufSaver *base) { @@ -101,7 +95,7 @@ gtk_combo_box_set_active (GTK_COMBO_BOX (_gtk_builder_get_widget (self->priv->builder, "tiff_default_extension_combobox")), active_idx); g_strfreev (extensions); - compression_type = eel_gconf_get_enum (PREF_TIFF_COMPRESSION, GTH_TYPE_TIFF_COMPRESSION, GTH_TIFF_COMPRESSION_DEFLATE); + compression_type = g_settings_get_enum (self->priv->settings, PREF_TIFF_COMPRESSION); switch (compression_type) { case GTH_TIFF_COMPRESSION_NONE: gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_none_radiobutton")), TRUE); @@ -114,14 +108,16 @@ break; } - gtk_spin_button_set_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_hdpi_spinbutton")), eel_gconf_get_integer (PREF_TIFF_HORIZONTAL_RES, 72)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_vdpi_spinbutton")), eel_gconf_get_integer (PREF_TIFF_VERTICAL_RES, 72)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_hdpi_spinbutton")), + g_settings_get_int (self->priv->settings, PREF_TIFF_HORIZONTAL_RES)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_vdpi_spinbutton")), + g_settings_get_int (self->priv->settings, PREF_TIFF_VERTICAL_RES)); return _gtk_builder_get_widget (self->priv->builder, "tiff_options"); #else /* ! HAVE_LIBTIFF */ - return GTH_PIXBUF_SAVER_CLASS (parent_class)->get_control (base); + return GTH_PIXBUF_SAVER_CLASS (gth_tiff_saver_parent_class)->get_control (base); #endif /* HAVE_LIBTIFF */ } @@ -142,7 +138,7 @@ &iter, 0, &self->priv->default_ext, -1); - eel_gconf_set_string (PREF_TIFF_DEFAULT_EXT, self->priv->default_ext); + g_settings_set_string (self->priv->settings, PREF_TIFF_DEFAULT_EXT, self->priv->default_ext); } if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_comp_none_radiobutton")))) @@ -151,10 +147,10 @@ compression_type = GTH_TIFF_COMPRESSION_DEFLATE; else compression_type = GTH_TIFF_COMPRESSION_JPEG; - eel_gconf_set_enum (PREF_TIFF_COMPRESSION, GTH_TYPE_TIFF_COMPRESSION, compression_type); + g_settings_set_enum (self->priv->settings, PREF_TIFF_COMPRESSION, compression_type); - eel_gconf_set_integer (PREF_TIFF_HORIZONTAL_RES, (int) gtk_spin_button_get_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_hdpi_spinbutton")))); - eel_gconf_set_integer (PREF_TIFF_VERTICAL_RES, (int) gtk_spin_button_get_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_vdpi_spinbutton")))); + g_settings_set_int (self->priv->settings, PREF_TIFF_HORIZONTAL_RES, (int) gtk_spin_button_get_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_hdpi_spinbutton")))); + g_settings_set_int (self->priv->settings, PREF_TIFF_VERTICAL_RES, (int) gtk_spin_button_get_value (GTK_SPIN_BUTTON (_gtk_builder_get_widget (self->priv->builder, "tiff_vdpi_spinbutton")))); #endif /* HAVE_LIBTIFF */ } @@ -457,7 +453,7 @@ static gboolean -gth_tiff_saver_save_pixbuf (GthPixbufSaver *self, +gth_tiff_saver_save_pixbuf (GthPixbufSaver *base, GdkPixbuf *pixbuf, char **buffer, gsize *buffer_size, @@ -465,27 +461,27 @@ GError **error) { #ifdef HAVE_LIBTIFF - - char **option_keys; - char **option_values; - int i = -1; - int i_value; - gboolean result; + GthTiffSaver *self = GTH_TIFF_SAVER (base); + char **option_keys; + char **option_values; + int i = -1; + int i_value; + gboolean result; option_keys = g_malloc (sizeof (char *) * 4); option_values = g_malloc (sizeof (char *) * 4); i++; option_keys[i] = g_strdup ("compression");; - option_values[i] = eel_gconf_get_string (PREF_TIFF_COMPRESSION, "deflate"); + option_values[i] = g_settings_get_string (self->priv->settings, PREF_TIFF_COMPRESSION); i++; - i_value = eel_gconf_get_integer (PREF_TIFF_VERTICAL_RES, 72); + i_value = g_settings_get_int (self->priv->settings, PREF_TIFF_VERTICAL_RES); option_keys[i] = g_strdup ("vertical dpi");; option_values[i] = g_strdup_printf ("%d", i_value); i++; - i_value = eel_gconf_get_integer (PREF_TIFF_HORIZONTAL_RES, 72); + i_value = g_settings_get_int (self->priv->settings, PREF_TIFF_HORIZONTAL_RES); option_keys[i] = g_strdup ("horizontal dpi");; option_values[i] = g_strdup_printf ("%d", i_value); @@ -531,7 +527,6 @@ GObjectClass *object_class; GthPixbufSaverClass *pixbuf_saver_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthTiffSaverPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -550,29 +545,11 @@ } -GType -gth_tiff_saver_get_type (void) +static void +gth_tiff_saver_init (GthTiffSaver *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTiffSaverClass), - NULL, - NULL, - (GClassInitFunc) gth_tiff_saver_class_init, - NULL, - NULL, - sizeof (GthTiffSaver), - 0, - (GInstanceInitFunc) gth_tiff_saver_init - }; - - type = g_type_register_static (GTH_TYPE_PIXBUF_SAVER, - "GthTiffSaver", - &type_info, - 0); - } - - return type; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TIFF_SAVER, GthTiffSaverPrivate); + self->priv->settings = g_settings_new (GTHUMB_PIXBUF_SAVERS_TIFF_SCHEMA); + self->priv->builder = NULL; + self->priv->default_ext = NULL; } diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/Makefile.am gthumb-3.0.0/extensions/pixbuf_savers/Makefile.am --- gthumb-2.14.3/extensions/pixbuf_savers/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/Makefile.am 2012-04-20 20:53:35.000000000 +0000 @@ -1,3 +1,5 @@ +if ENABLE_JPEG_TOOLS + SUBDIRS = data extensiondir = $(pkglibdir)/extensions @@ -53,11 +55,6 @@ extensioninidir = $(extensiondir) extensionini_in_files = pixbuf_savers.extension.in.in extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) - -@GTHUMB_EXTENSION_IN_RULE@ -@GTHUMB_EXTENSION_RULE@ - -EXTRA_DIST = $(extensionini_in_files) DISTCLEANFILES = $(extensionini_DATA) BUILT_SOURCES = $(ENUM_TYPES) CLEANFILES = $(BUILT_SOURCES) @@ -65,4 +62,11 @@ dist-hook: cd $(distdir); rm -f $(CLEANFILES) +endif + +@GTHUMB_EXTENSION_IN_RULE@ +@GTHUMB_EXTENSION_RULE@ + +EXTRA_DIST = $(extensionini_in_files) + -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/Makefile.in gthumb-3.0.0/extensions/pixbuf_savers/Makefile.in --- gthumb-2.14.3/extensions/pixbuf_savers/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -80,14 +97,22 @@ "$(DESTDIR)$(extensioninidir)" LTLIBRARIES = $(extension_LTLIBRARIES) am__DEPENDENCIES_1 = -am__objects_1 = libpixbuf_savers_la-enum-types.lo +am__libpixbuf_savers_la_SOURCES_DIST = enum-types.h enum-types.c \ + preferences.h gth-jpeg-saver.c gth-jpeg-saver.h \ + gth-png-saver.c gth-png-saver.h gth-tga-saver.c \ + gth-tga-saver.h gth-tiff-saver.c gth-tiff-saver.h main.c \ + preferences.c +@ENABLE_JPEG_TOOLS_TRUE@am__objects_1 = \ +@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-enum-types.lo am__objects_2 = -am_libpixbuf_savers_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ - libpixbuf_savers_la-gth-jpeg-saver.lo \ - libpixbuf_savers_la-gth-png-saver.lo \ - libpixbuf_savers_la-gth-tga-saver.lo \ - libpixbuf_savers_la-gth-tiff-saver.lo \ - libpixbuf_savers_la-main.lo libpixbuf_savers_la-preferences.lo +@ENABLE_JPEG_TOOLS_TRUE@am_libpixbuf_savers_la_OBJECTS = \ +@ENABLE_JPEG_TOOLS_TRUE@ $(am__objects_1) $(am__objects_2) \ +@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-gth-jpeg-saver.lo \ +@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-gth-png-saver.lo \ +@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-gth-tga-saver.lo \ +@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-gth-tiff-saver.lo \ +@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-main.lo \ +@ENABLE_JPEG_TOOLS_TRUE@ libpixbuf_savers_la-preferences.lo libpixbuf_savers_la_OBJECTS = $(am_libpixbuf_savers_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -96,6 +121,8 @@ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libpixbuf_savers_la_CFLAGS) $(CFLAGS) \ $(libpixbuf_savers_la_LDFLAGS) $(LDFLAGS) -o $@ +@ENABLE_JPEG_TOOLS_TRUE@am_libpixbuf_savers_la_rpath = -rpath \ +@ENABLE_JPEG_TOOLS_TRUE@ $(extensiondir) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -123,7 +150,7 @@ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libpixbuf_savers_la_SOURCES) -DIST_SOURCES = $(libpixbuf_savers_la_SOURCES) +DIST_SOURCES = $(am__libpixbuf_savers_la_SOURCES_DIST) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ install-dvi-recursive install-exec-recursive \ @@ -131,6 +158,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -139,7 +171,7 @@ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) +DIST_SUBDIRS = data DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -210,10 +242,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -221,6 +251,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -260,6 +291,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -308,8 +341,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -340,6 +371,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -370,41 +402,41 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = data -extensiondir = $(pkglibdir)/extensions -extension_LTLIBRARIES = libpixbuf_savers.la -ENUM_TYPES = \ - enum-types.h \ - enum-types.c - -HEADER_FILES = \ - preferences.h - -libpixbuf_savers_la_SOURCES = \ - $(ENUM_TYPES) \ - $(HEADER_FILES) \ - gth-jpeg-saver.c \ - gth-jpeg-saver.h \ - gth-png-saver.c \ - gth-png-saver.h \ - gth-tga-saver.c \ - gth-tga-saver.h \ - gth-tiff-saver.c \ - gth-tiff-saver.h \ - main.c \ - preferences.c - -libpixbuf_savers_la_CFLAGS = $(GTHUMB_CFLAGS) $(TIFF_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb -libpixbuf_savers_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libpixbuf_savers_la_LIBADD = $(GTHUMB_LIBS) $(TIFF_LIBS) ../jpeg_utils/libjpeg_utils.la -libpixbuf_savers_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) -extensioninidir = $(extensiondir) -extensionini_in_files = pixbuf_savers.extension.in.in -extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) +@ENABLE_JPEG_TOOLS_TRUE@SUBDIRS = data +@ENABLE_JPEG_TOOLS_TRUE@extensiondir = $(pkglibdir)/extensions +@ENABLE_JPEG_TOOLS_TRUE@extension_LTLIBRARIES = libpixbuf_savers.la +@ENABLE_JPEG_TOOLS_TRUE@ENUM_TYPES = \ +@ENABLE_JPEG_TOOLS_TRUE@ enum-types.h \ +@ENABLE_JPEG_TOOLS_TRUE@ enum-types.c + +@ENABLE_JPEG_TOOLS_TRUE@HEADER_FILES = \ +@ENABLE_JPEG_TOOLS_TRUE@ preferences.h + +@ENABLE_JPEG_TOOLS_TRUE@libpixbuf_savers_la_SOURCES = \ +@ENABLE_JPEG_TOOLS_TRUE@ $(ENUM_TYPES) \ +@ENABLE_JPEG_TOOLS_TRUE@ $(HEADER_FILES) \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-jpeg-saver.c \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-jpeg-saver.h \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-png-saver.c \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-png-saver.h \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-tga-saver.c \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-tga-saver.h \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-tiff-saver.c \ +@ENABLE_JPEG_TOOLS_TRUE@ gth-tiff-saver.h \ +@ENABLE_JPEG_TOOLS_TRUE@ main.c \ +@ENABLE_JPEG_TOOLS_TRUE@ preferences.c + +@ENABLE_JPEG_TOOLS_TRUE@libpixbuf_savers_la_CFLAGS = $(GTHUMB_CFLAGS) $(TIFF_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +@ENABLE_JPEG_TOOLS_TRUE@libpixbuf_savers_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) +@ENABLE_JPEG_TOOLS_TRUE@libpixbuf_savers_la_LIBADD = $(GTHUMB_LIBS) $(TIFF_LIBS) ../jpeg_utils/libjpeg_utils.la +@ENABLE_JPEG_TOOLS_TRUE@libpixbuf_savers_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) +@ENABLE_JPEG_TOOLS_TRUE@extensioninidir = $(extensiondir) +@ENABLE_JPEG_TOOLS_TRUE@extensionini_in_files = pixbuf_savers.extension.in.in +@ENABLE_JPEG_TOOLS_TRUE@extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) +@ENABLE_JPEG_TOOLS_TRUE@DISTCLEANFILES = $(extensionini_DATA) +@ENABLE_JPEG_TOOLS_TRUE@BUILT_SOURCES = $(ENUM_TYPES) +@ENABLE_JPEG_TOOLS_TRUE@CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = $(extensionini_in_files) -DISTCLEANFILES = $(extensionini_DATA) -BUILT_SOURCES = $(ENUM_TYPES) -CLEANFILES = $(BUILT_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -442,7 +474,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -450,6 +481,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -472,7 +505,7 @@ rm -f "$${dir}/so_locations"; \ done libpixbuf_savers.la: $(libpixbuf_savers_la_OBJECTS) $(libpixbuf_savers_la_DEPENDENCIES) $(EXTRA_libpixbuf_savers_la_DEPENDENCIES) - $(AM_V_CCLD)$(libpixbuf_savers_la_LINK) -rpath $(extensiondir) $(libpixbuf_savers_la_OBJECTS) $(libpixbuf_savers_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libpixbuf_savers_la_LINK) $(am_libpixbuf_savers_la_rpath) $(libpixbuf_savers_la_OBJECTS) $(libpixbuf_savers_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -565,8 +598,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -716,6 +752,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +@ENABLE_JPEG_TOOLS_FALSE@dist-hook: distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -749,13 +786,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -915,33 +949,33 @@ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA -enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include \n\nG_BEGIN_DECLS\n" \ - --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ - $^> xgen-$(@F) \ - && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \ - && rm -f xgen-$(@F) ) - -enum-types.c: $(HEADER_FILES) enum-types.h - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#include \n" \ - --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ - --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ - $^> xgen-$(@F) \ - && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \ - && rm -f xgen-$(@F) ) +@ENABLE_JPEG_TOOLS_TRUE@enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) +@ENABLE_JPEG_TOOLS_TRUE@ $(AM_V_GEN)( $(GLIB_MKENUMS) \ +@ENABLE_JPEG_TOOLS_TRUE@ --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include \n\nG_BEGIN_DECLS\n" \ +@ENABLE_JPEG_TOOLS_TRUE@ --fprod "/* enumerations from \"@filename@\" */\n" \ +@ENABLE_JPEG_TOOLS_TRUE@ --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ +@ENABLE_JPEG_TOOLS_TRUE@ --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ +@ENABLE_JPEG_TOOLS_TRUE@ $^> xgen-$(@F) \ +@ENABLE_JPEG_TOOLS_TRUE@ && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \ +@ENABLE_JPEG_TOOLS_TRUE@ && rm -f xgen-$(@F) ) + +@ENABLE_JPEG_TOOLS_TRUE@enum-types.c: $(HEADER_FILES) enum-types.h +@ENABLE_JPEG_TOOLS_TRUE@ $(AM_V_GEN)( $(GLIB_MKENUMS) \ +@ENABLE_JPEG_TOOLS_TRUE@ --fhead "#include \n" \ +@ENABLE_JPEG_TOOLS_TRUE@ --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ +@ENABLE_JPEG_TOOLS_TRUE@ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ +@ENABLE_JPEG_TOOLS_TRUE@ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ +@ENABLE_JPEG_TOOLS_TRUE@ --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ +@ENABLE_JPEG_TOOLS_TRUE@ $^> xgen-$(@F) \ +@ENABLE_JPEG_TOOLS_TRUE@ && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \ +@ENABLE_JPEG_TOOLS_TRUE@ && rm -f xgen-$(@F) ) + +@ENABLE_JPEG_TOOLS_TRUE@dist-hook: +@ENABLE_JPEG_TOOLS_TRUE@ cd $(distdir); rm -f $(CLEANFILES) @GTHUMB_EXTENSION_IN_RULE@ @GTHUMB_EXTENSION_RULE@ -dist-hook: - cd $(distdir); rm -f $(CLEANFILES) - -include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/pixbuf_savers.extension.in.in gthumb-3.0.0/extensions/pixbuf_savers/pixbuf_savers.extension.in.in --- gthumb-2.14.3/extensions/pixbuf_savers/pixbuf_savers.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/pixbuf_savers.extension.in.in 2012-04-21 09:24:04.000000000 +0000 @@ -9,4 +9,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=jpeg_utils diff -Nru gthumb-2.14.3/extensions/pixbuf_savers/preferences.h gthumb-3.0.0/extensions/pixbuf_savers/preferences.h --- gthumb-2.14.3/extensions/pixbuf_savers/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/pixbuf_savers/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -32,17 +32,36 @@ } GthTiffCompression; -#define PREF_JPEG_DEFAULT_EXT "/apps/gthumb/save_options/jpeg/default_ext" -#define PREF_JPEG_QUALITY "/apps/gthumb/save_options/jpeg/quality" -#define PREF_JPEG_SMOOTHING "/apps/gthumb/save_options/jpeg/smoothing" -#define PREF_JPEG_OPTIMIZE "/apps/gthumb/save_options/jpeg/optimize" -#define PREF_JPEG_PROGRESSIVE "/apps/gthumb/save_options/jpeg/progressive" -#define PREF_PNG_COMPRESSION_LEVEL "/apps/gthumb/save_options/png/compression_level" -#define PREF_TGA_RLE_COMPRESSION "/apps/gthumb/save_options/tga/rle_compression" -#define PREF_TIFF_DEFAULT_EXT "/apps/gthumb/save_options/tiff/default_ext" -#define PREF_TIFF_COMPRESSION "/apps/gthumb/save_options/tiff/compression" -#define PREF_TIFF_HORIZONTAL_RES "/apps/gthumb/save_options/tiff/horizontal_resolution" -#define PREF_TIFF_VERTICAL_RES "/apps/gthumb/save_options/tiff/vertical_resolution" +/* schemas */ + +#define GTHUMB_PIXBUF_SAVERS GTHUMB_SCHEMA ".pixbuf-savers" +#define GTHUMB_PIXBUF_SAVERS_JPEG_SCHEMA GTHUMB_PIXBUF_SAVERS ".jpeg" +#define GTHUMB_PIXBUF_SAVERS_PNG_SCHEMA GTHUMB_PIXBUF_SAVERS ".png" +#define GTHUMB_PIXBUF_SAVERS_TGA_SCHEMA GTHUMB_PIXBUF_SAVERS ".tga" +#define GTHUMB_PIXBUF_SAVERS_TIFF_SCHEMA GTHUMB_PIXBUF_SAVERS ".tiff" + +/* keys: jpeg */ + +#define PREF_JPEG_DEFAULT_EXT "default-ext" +#define PREF_JPEG_QUALITY "quality" +#define PREF_JPEG_SMOOTHING "smoothing" +#define PREF_JPEG_OPTIMIZE "optimize" +#define PREF_JPEG_PROGRESSIVE "progressive" + +/* keys: png */ + +#define PREF_PNG_COMPRESSION_LEVEL "compression-level" + +/* keys: tga */ + +#define PREF_TGA_RLE_COMPRESSION "rle-compression" + +/* keys: tiff */ + +#define PREF_TIFF_DEFAULT_EXT "default-ext" +#define PREF_TIFF_COMPRESSION "compression" +#define PREF_TIFF_HORIZONTAL_RES "horizontal-resolution" +#define PREF_TIFF_VERTICAL_RES "vertical-resolution" void so__dlg_preferences_construct_cb (GtkWidget *dialog, diff -Nru gthumb-2.14.3/extensions/raw_files/Makefile.in gthumb-3.0.0/extensions/raw_files/Makefile.in --- gthumb-2.14.3/extensions/raw_files/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/raw_files/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -117,6 +134,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(libraw_files_la_SOURCES) DIST_SOURCES = $(libraw_files_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) ETAGS = etags CTAGS = ctags @@ -165,10 +187,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -176,6 +196,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -215,6 +236,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -263,8 +286,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -295,6 +316,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -375,7 +397,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -383,6 +404,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -450,8 +473,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/raw_files/raw_files.extension.in.in gthumb-3.0.0/extensions/raw_files/raw_files.extension.in.in --- gthumb-2.14.3/extensions/raw_files/raw_files.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/raw_files/raw_files.extension.in.in 2012-04-21 09:24:01.000000000 +0000 @@ -9,3 +9,4 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/red_eye_removal/data/Makefile.in gthumb-3.0.0/extensions/red_eye_removal/data/Makefile.in --- gthumb-2.14.3/extensions/red_eye_removal/data/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/red_eye_removal/data/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/red_eye_removal/data/ui/Makefile.in gthumb-3.0.0/extensions/red_eye_removal/data/ui/Makefile.in --- gthumb-2.14.3/extensions/red_eye_removal/data/ui/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/red_eye_removal/data/ui/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui gthumb-3.0.0/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui --- gthumb-2.14.3/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/red_eye_removal/data/ui/red-eye-removal-options.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,33 +1,47 @@ - + - + + 10000 + 1 + + + 10000 + 1 + True + False 6 True + False True + False 12 True + False 0 none True + False 6 12 True + False True + False 2 2 6 @@ -35,6 +49,7 @@ True + False 0 _X: True @@ -48,6 +63,7 @@ True + False 0 _Y: True @@ -63,16 +79,18 @@ True + False True True - + x_adjustment 1 False + True 0 @@ -87,16 +105,18 @@ True + False True True - + y_adjustment 1 False + True 0 @@ -112,6 +132,8 @@ + False + True 0 @@ -122,6 +144,7 @@ True + False Selection @@ -138,15 +161,18 @@ False + True 0 True + False False + True 6 1 @@ -154,14 +180,17 @@ True + False 12 center gtk-ok + False True True True + False True @@ -173,9 +202,11 @@ gtk-cancel + False True True True + False True @@ -195,12 +226,4 @@ - - 10000 - 1 - - - 10000 - 1 - diff -Nru gthumb-2.14.3/extensions/red_eye_removal/gth-file-tool-red-eye.c gthumb-3.0.0/extensions/red_eye_removal/gth-file-tool-red-eye.c --- gthumb-2.14.3/extensions/red_eye_removal/gth-file-tool-red-eye.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/red_eye_removal/gth-file-tool-red-eye.c 2012-02-19 15:01:32.000000000 +0000 @@ -32,7 +32,6 @@ static const double RED_FACTOR = 0.5133333; static const double GREEN_FACTOR = 1.0; static const double BLUE_FACTOR = 0.1933333; -static gpointer parent_class = NULL; struct _GthFileToolRedEyePrivate { @@ -45,6 +44,9 @@ }; +G_DEFINE_TYPE (GthFileToolRedEye, gth_file_tool_red_eye, GTH_TYPE_FILE_TOOL) + + static void gth_file_tool_red_eye_update_sensitivity (GthFileTool *base) { @@ -461,17 +463,6 @@ static void -gth_file_tool_red_eye_instance_init (GthFileToolRedEye *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_RED_EYE, GthFileToolRedEyePrivate); - self->priv->new_pixbuf = NULL; - self->priv->is_red = NULL; - gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-red-eye", _("Red Eye Removal..."), _("Red Eye Removal"), FALSE); - gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Remove the red eye effect caused by camera flashes")); -} - - -static void gth_file_tool_red_eye_finalize (GObject *object) { GthFileToolRedEye *self; @@ -487,7 +478,7 @@ _g_object_unref (self->priv->builder); /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_tool_red_eye_parent_class)->finalize (object); } @@ -497,7 +488,6 @@ GObjectClass *gobject_class; GthFileToolClass *file_tool_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthFileToolRedEyePrivate)); gobject_class = (GObjectClass*) class; @@ -511,23 +501,12 @@ } -GType -gth_file_tool_red_eye_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolRedEyeClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_red_eye_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileToolRedEye), - 0, - (GInstanceInitFunc) gth_file_tool_red_eye_instance_init, - NULL - }; - type_id = g_type_register_static (GTH_TYPE_FILE_TOOL, "GthFileToolRedEye", &g_define_type_info, 0); - } - return type_id; +static void +gth_file_tool_red_eye_init (GthFileToolRedEye *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL_RED_EYE, GthFileToolRedEyePrivate); + self->priv->new_pixbuf = NULL; + self->priv->is_red = NULL; + gth_file_tool_construct (GTH_FILE_TOOL (self), "tool-red-eye", _("Red Eye Removal..."), _("Red Eye Removal"), FALSE); + gtk_widget_set_tooltip_text (GTK_WIDGET (self), _("Remove the red eye effect caused by camera flashes")); } diff -Nru gthumb-2.14.3/extensions/red_eye_removal/Makefile.in gthumb-3.0.0/extensions/red_eye_removal/Makefile.in --- gthumb-2.14.3/extensions/red_eye_removal/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/red_eye_removal/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -126,6 +143,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -205,10 +227,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -216,6 +236,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -255,6 +276,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -303,8 +326,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -335,6 +356,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -418,7 +440,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -426,6 +447,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -501,8 +524,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -685,13 +711,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/red_eye_removal/red_eye_removal.extension.in.in gthumb-3.0.0/extensions/red_eye_removal/red_eye_removal.extension.in.in --- gthumb-2.14.3/extensions/red_eye_removal/red_eye_removal.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/red_eye_removal/red_eye_removal.extension.in.in 2012-04-21 09:23:53.000000000 +0000 @@ -9,4 +9,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=image_viewer;file_tools diff -Nru gthumb-2.14.3/extensions/rename_series/data/gthumb_rename_series.schemas.in gthumb-3.0.0/extensions/rename_series/data/gthumb_rename_series.schemas.in --- gthumb-2.14.3/extensions/rename_series/data/gthumb_rename_series.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/data/gthumb_rename_series.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/rename_series/template - /apps/gthumb/ext/rename_series/template - gthumb - string - ####%E - - - - - - - - /schemas/apps/gthumb/ext/rename_series/start_at - /apps/gthumb/ext/rename_series/start_at - gthumb - int - 1 - - - - - - - - /schemas/apps/gthumb/ext/rename_series/sort_by - /apps/gthumb/ext/rename_series/sort_by - gthumb - string - general::unsorted - - Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal - - - - - - /schemas/apps/gthumb/ext/rename_series/reverse_order - /apps/gthumb/ext/rename_series/reverse_order - gthumb - bool - false - - - - - - - - /schemas/apps/gthumb/ext/rename_series/change_case - /apps/gthumb/ext/rename_series/change_case - gthumb - int - 0 - - Possible values: 0 (none), 1 (lower), 2 (upper) - - - - - - diff -Nru gthumb-2.14.3/extensions/rename_series/data/Makefile.am gthumb-3.0.0/extensions/rename_series/data/Makefile.am --- gthumb-2.14.3/extensions/rename_series/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_rename_series.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/rename_series/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/rename_series/data/Makefile.in gthumb-3.0.0/extensions/rename_series/data/Makefile.in --- gthumb-2.14.3/extensions/rename_series/data/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/data/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_rename_series.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/rename_series/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/rename_series/data/ui/Makefile.in gthumb-3.0.0/extensions/rename_series/data/ui/Makefile.in --- gthumb-2.14.3/extensions/rename_series/data/ui/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/data/ui/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/rename_series/data/ui/rename-series.ui gthumb-3.0.0/extensions/rename_series/data/ui/rename-series.ui --- gthumb-2.14.3/extensions/rename_series/data/ui/rename-series.ui 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/data/ui/rename-series.ui 2012-02-19 15:01:32.000000000 +0000 @@ -1,23 +1,97 @@ - + - + + True + False + gtk-ok + + False 5 Rename dialog - + True + False + vertical 2 + + + True + False + end + + + gtk-cancel + False + True + True + True + False + True + + + False + False + 0 + + + + + _Rename + False + True + True + True + True + True + False + image1 + True + + + False + False + 1 + + + + + gtk-help + False + True + True + True + False + True + + + False + False + 2 + True + + + + + False + True + end + 0 + + True + False 6 12 True + False 4 2 12 @@ -25,6 +99,7 @@ True + False 0 Start _at: True @@ -40,6 +115,7 @@ True + False 0 _Sort by: True @@ -54,6 +130,7 @@ True + False 0 Cas_e: True @@ -68,15 +145,17 @@ True + False True True - + start_at_adjustment False + True 0 @@ -92,6 +171,7 @@ True + False @@ -107,51 +187,60 @@ True + False 6 True + False 6 True True - + True gtk-help - True - True Help + True + True 0 + False True True True Edit template + False True + False gtk-edit False + True 1 + False + True 0 + False 8 2 12 @@ -159,6 +248,7 @@ True + False 0 # @@ -173,6 +263,7 @@ True + False 0 %F @@ -187,6 +278,7 @@ True + False 0 %E @@ -201,6 +293,7 @@ True + False 0 New enumerator digit @@ -217,6 +310,7 @@ True + False 0 The original filename @@ -233,6 +327,7 @@ True + False 0 The original extension @@ -249,6 +344,7 @@ True + False 0 Special code @@ -260,6 +356,7 @@ True + False 0 Description @@ -275,6 +372,7 @@ True + False 0 %N @@ -289,6 +387,7 @@ True + False 0 The original enumerator @@ -305,6 +404,7 @@ True + False 0 %M{ format } @@ -319,6 +419,7 @@ True + False 0 The modification date True @@ -336,6 +437,7 @@ True + False 0 %D{ format } @@ -350,6 +452,7 @@ True + False 0 The digitalization date @@ -366,6 +469,7 @@ True + False 0 %A{ identifier } @@ -380,6 +484,7 @@ True + False 0 A file attribute @@ -395,6 +500,8 @@ + False + True 1 @@ -402,63 +509,77 @@ 1 2 + GTK_FILL True + False True + False True + False 0 _Template: True + True + True 0 False + True 0 GTK_FILL + GTK_FILL True + False 6 True + False False + True 0 Re_verse Order + False True True False + False True True False + True 1 @@ -468,21 +589,25 @@ 2 2 3 + GTK_FILL False + True 0 True + False 6 True + False 0 _Preview: True @@ -500,93 +625,43 @@ 300 True True - automatic - automatic in + True + True 1 + True + True 1 True + False + True + True 2 - 1 - - - - - True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - - - - _Rename - True - True - True - True - True - image1 - True - - - False - False - 1 - - - - - gtk-help - True - True - True - True - - - False - False - 2 - True - - - - False - end - 0 + True + 1 @@ -597,10 +672,6 @@ help_button - - True - gtk-ok - vertical @@ -609,8 +680,8 @@ - 1 1000000000 + 1 1 10 diff -Nru gthumb-2.14.3/extensions/rename_series/dlg-rename-series.c gthumb-3.0.0/extensions/rename_series/dlg-rename-series.c --- gthumb-2.14.3/extensions/rename_series/dlg-rename-series.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/dlg-rename-series.c 2012-02-19 15:01:32.000000000 +0000 @@ -31,12 +31,6 @@ enum { - GTH_CHANGE_CASE_NONE = 0, - GTH_CHANGE_CASE_LOWER, - GTH_CHANGE_CASE_UPPER, -}; - -enum { SORT_DATA_COLUMN, SORT_NAME_COLUMN, SORT_NUM_COLUMNS @@ -73,6 +67,7 @@ typedef struct { GthBrowser *browser; + GSettings *settings; GList *file_list; GList *file_data_list; GList *new_file_list; @@ -114,6 +109,7 @@ _g_object_list_unref (data->file_list); _g_string_list_free (data->new_names_list); g_list_free (data->new_file_list); + g_object_unref (data->settings); g_free (data); } @@ -560,9 +556,9 @@ /* -- save preferences -- */ if (data->file_list->next != NULL) - eel_gconf_set_string (PREF_RENAME_SERIES_TEMPLATE, gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("template_entry")))); + g_settings_set_string (data->settings, PREF_RENAME_SERIES_TEMPLATE, gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("template_entry")))); - eel_gconf_set_integer (PREF_RENAME_SERIES_START_AT, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("start_at_spinbutton")))); + g_settings_set_int (data->settings, PREF_RENAME_SERIES_START_AT, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("start_at_spinbutton")))); if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (data->sort_combobox), &iter)) { GthFileDataSort *sort_type; @@ -571,11 +567,11 @@ &iter, SORT_DATA_COLUMN, &sort_type, -1); - eel_gconf_set_string (PREF_RENAME_SERIES_SORT_BY, sort_type->name); + g_settings_set_string (data->settings, PREF_RENAME_SERIES_SORT_BY, sort_type->name); } - eel_gconf_set_boolean (PREF_RENAME_SERIES_REVERSE_ORDER, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")))); - eel_gconf_set_integer (PREF_RENAME_SERIES_CHANGE_CASE, gtk_combo_box_get_active (GTK_COMBO_BOX (data->change_case_combobox))); + g_settings_set_boolean (data->settings, PREF_RENAME_SERIES_REVERSE_ORDER, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")))); + g_settings_set_enum (data->settings, PREF_RENAME_SERIES_CHANGE_CASE, gtk_combo_box_get_active (GTK_COMBO_BOX (data->change_case_combobox))); /* -- prepare and exec rename task -- */ @@ -834,6 +830,7 @@ data = g_new0 (DialogData, 1); data->browser = browser; data->builder = _gtk_builder_new_from_file ("rename-series.ui", "rename_series"); + data->settings = g_settings_new (GTHUMB_RENAME_SERIES_SCHEMA); data->file_list = _g_file_list_dup (file_list); data->first_update = TRUE; data->template_changed = TRUE; @@ -882,9 +879,10 @@ gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("preview_label")), data->list_view); if (data->file_list->next != NULL) - gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("template_entry")), eel_gconf_get_string (PREF_RENAME_SERIES_TEMPLATE, DEFAULT_TEMPLATE)); + gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("template_entry")), + g_settings_get_string (data->settings, PREF_RENAME_SERIES_TEMPLATE)); - start_at = eel_gconf_get_integer (PREF_RENAME_SERIES_START_AT, DEFAULT_START_AT); + start_at = g_settings_get_int (data->settings, PREF_RENAME_SERIES_START_AT); if (start_at < 0) start_at = DEFAULT_START_AT; gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("start_at_spinbutton")), start_at * 1.0); @@ -903,7 +901,7 @@ "text", SORT_NAME_COLUMN, NULL); - sort_by = eel_gconf_get_string (PREF_RENAME_SERIES_SORT_BY, DEFAULT_SORT_BY); + sort_by = g_settings_get_string (data->settings, PREF_RENAME_SERIES_SORT_BY); found = FALSE; sort_types = gth_main_get_all_sort_types (); @@ -934,11 +932,12 @@ /* reverse order */ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")), eel_gconf_get_boolean (PREF_RENAME_SERIES_REVERSE_ORDER, DEFAULT_REVERSE_ORDER)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")), + g_settings_get_boolean (data->settings, PREF_RENAME_SERIES_REVERSE_ORDER)); /* change case */ - change_case = eel_gconf_get_integer (PREF_RENAME_SERIES_CHANGE_CASE, DEFAULT_CHANGE_CASE); + change_case = g_settings_get_enum (data->settings, PREF_RENAME_SERIES_CHANGE_CASE); if ((change_case < GTH_CHANGE_CASE_NONE) || (change_case > GTH_CHANGE_CASE_UPPER)) change_case = DEFAULT_CHANGE_CASE; diff -Nru gthumb-2.14.3/extensions/rename_series/gth-rename-task.c gthumb-3.0.0/extensions/rename_series/gth-rename-task.c --- gthumb-2.14.3/extensions/rename_series/gth-rename-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/gth-rename-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -23,6 +23,9 @@ #include "gth-rename-task.h" +G_DEFINE_TYPE (GthRenameTask, gth_rename_task, GTH_TYPE_TASK) + + struct _GthRenameTaskPrivate { GList *old_files; GList *new_files; @@ -36,9 +39,6 @@ }; -static gpointer parent_class = NULL; - - static void gth_rename_task_finalize (GObject *object) { @@ -51,7 +51,7 @@ _g_object_list_unref (self->priv->old_files); _g_object_list_unref (self->priv->new_files); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_rename_task_parent_class)->finalize (object); } @@ -246,7 +246,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthRenameTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -265,34 +264,6 @@ } -GType -gth_rename_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthRenameTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_rename_task_class_init, - NULL, - NULL, - sizeof (GthRenameTask), - 0, - (GInstanceInitFunc) gth_rename_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthRenameTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_rename_task_new (GList *old_files, GList *new_files) diff -Nru gthumb-2.14.3/extensions/rename_series/gth-template-editor-dialog.c gthumb-3.0.0/extensions/rename_series/gth-template-editor-dialog.c --- gthumb-2.14.3/extensions/rename_series/gth-template-editor-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/gth-template-editor-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -30,7 +30,7 @@ #define GET_WIDGET(name) _gtk_builder_get_widget (self->priv->builder, (name)) -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthTemplateEditorDialog, gth_template_editor_dialog, GTK_TYPE_DIALOG) struct _GthTemplateEditorDialogPrivate { @@ -55,7 +55,7 @@ dialog->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_template_editor_dialog_parent_class)->finalize (object); } @@ -64,9 +64,7 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - object_class->finalize = gth_template_editor_dialog_finalize; } @@ -79,34 +77,6 @@ } -GType -gth_template_editor_dialog_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTemplateEditorDialogClass), - NULL, - NULL, - (GClassInitFunc) gth_template_editor_dialog_class_init, - NULL, - NULL, - sizeof (GthTemplateEditorDialog), - 0, - (GInstanceInitFunc) gth_template_editor_dialog_init - }; - - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthTemplateEditorDialog", - &type_info, - 0); - } - - return type; -} - - static void _gth_template_editor_update_sensitivity (GthTemplateEditorDialog *self) { @@ -195,7 +165,7 @@ gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_OK, GTK_RESPONSE_OK); - self->priv->content = gtk_vbox_new (FALSE, 6); + self->priv->content = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_set_border_width (GTK_CONTAINER (self->priv->content), 5); gtk_widget_show (self->priv->content); gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), self->priv->content, TRUE, TRUE, 0); diff -Nru gthumb-2.14.3/extensions/rename_series/gth-template-selector.c gthumb-3.0.0/extensions/rename_series/gth-template-selector.c --- gthumb-2.14.3/extensions/rename_series/gth-template-selector.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/gth-template-selector.c 2012-04-13 08:17:25.000000000 +0000 @@ -28,6 +28,9 @@ #define GET_WIDGET(x) (_gtk_builder_get_widget (self->priv->builder, (x))) +G_DEFINE_TYPE (GthTemplateSelector, gth_template_selector, GTK_TYPE_BOX) + + enum { TYPE_DATA_COLUMN, TYPE_NAME_COLUMN, @@ -59,9 +62,7 @@ }; static char * Date_Formats[] = { "%Y-%m-%d--%H.%M.%S", "%Y-%m-%d", "%x %X", "%x", NULL }; - -static gpointer parent_class = NULL; -static guint gth_template_selector_signals[LAST_SIGNAL] = { 0 }; +static guint gth_template_selector_signals[LAST_SIGNAL] = { 0 }; static void @@ -77,15 +78,13 @@ selector->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_template_selector_parent_class)->finalize (object); } static void gth_template_selector_class_init (GthTemplateSelectorClass *klass) { - parent_class = g_type_class_peek_parent (klass); - G_OBJECT_CLASS (klass)->finalize = gth_template_selector_finalize; /* signals */ @@ -112,37 +111,12 @@ static void -gth_template_selector_instance_init (GthTemplateSelector *self) +gth_template_selector_init (GthTemplateSelector *self) { self->priv = g_new0 (GthTemplateSelectorPrivate, 1); self->priv->builder = NULL; -} - -GType -gth_template_selector_get_type (void) -{ - static GType type_id = 0; - - if (type_id == 0) { - static const GTypeInfo type_info = { - sizeof (GthTemplateSelectorClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_template_selector_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthTemplateSelector), - 0, - (GInstanceInitFunc) gth_template_selector_instance_init, - NULL - }; - type_id = g_type_register_static (GTK_TYPE_HBOX, - "GthTemplateSelector", - &type_info, - 0); - } - return type_id; + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_HORIZONTAL); } @@ -293,7 +267,7 @@ gtk_tree_store_set (tree_store, &iter, ATTRIBUTE_ID_COLUMN, category->id, - ATTRIBUTE_NAME_COLUMN, category->display_name, + ATTRIBUTE_NAME_COLUMN, _(category->display_name), ATTRIBUTE_SORT_ORDER_COLUMN, category->sort_order, -1); diff -Nru gthumb-2.14.3/extensions/rename_series/gth-template-selector.h gthumb-3.0.0/extensions/rename_series/gth-template-selector.h --- gthumb-2.14.3/extensions/rename_series/gth-template-selector.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/gth-template-selector.h 2012-03-06 15:26:06.000000000 +0000 @@ -52,12 +52,12 @@ typedef struct _GthTemplateSelectorPrivate GthTemplateSelectorPrivate; struct _GthTemplateSelector { - GtkHBox parent_instance; + GtkBox parent_instance; GthTemplateSelectorPrivate *priv; }; struct _GthTemplateSelectorClass { - GtkHBoxClass parent_class; + GtkBoxClass parent_class; void (*add_template) (GthTemplateSelector *selector); void (*remove_template) (GthTemplateSelector *selector); diff -Nru gthumb-2.14.3/extensions/rename_series/Makefile.in gthumb-3.0.0/extensions/rename_series/Makefile.in --- gthumb-2.14.3/extensions/rename_series/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -129,6 +146,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -208,10 +230,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -219,6 +239,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -258,6 +279,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -306,8 +329,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -338,6 +359,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -430,7 +452,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -438,6 +459,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -545,8 +568,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -729,13 +755,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/rename_series/preferences.h gthumb-3.0.0/extensions/rename_series/preferences.h --- gthumb-2.14.3/extensions/rename_series/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -24,11 +24,23 @@ G_BEGIN_DECLS -#define PREF_RENAME_SERIES_TEMPLATE "/apps/gthumb/ext/rename_series/template" -#define PREF_RENAME_SERIES_START_AT "/apps/gthumb/ext/rename_series/start_at" -#define PREF_RENAME_SERIES_SORT_BY "/apps/gthumb/ext/rename_series/sort_by" -#define PREF_RENAME_SERIES_REVERSE_ORDER "/apps/gthumb/ext/rename_series/reverse_order" -#define PREF_RENAME_SERIES_CHANGE_CASE "/apps/gthumb/ext/rename_series/change_case" +typedef enum { + GTH_CHANGE_CASE_NONE = 0, + GTH_CHANGE_CASE_LOWER, + GTH_CHANGE_CASE_UPPER, +} GthChangeCase; + +/* schema */ + +#define GTHUMB_RENAME_SERIES_SCHEMA GTHUMB_SCHEMA ".rename-series" + +/* keys */ + +#define PREF_RENAME_SERIES_TEMPLATE "template" +#define PREF_RENAME_SERIES_START_AT "start-at" +#define PREF_RENAME_SERIES_SORT_BY "sort-by" +#define PREF_RENAME_SERIES_REVERSE_ORDER "reverse-order" +#define PREF_RENAME_SERIES_CHANGE_CASE "change-case" G_END_DECLS diff -Nru gthumb-2.14.3/extensions/rename_series/rename_series.extension.in.in gthumb-3.0.0/extensions/rename_series/rename_series.extension.in.in --- gthumb-2.14.3/extensions/rename_series/rename_series.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/rename_series/rename_series.extension.in.in 2012-04-21 09:23:50.000000000 +0000 @@ -9,4 +9,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=file_manager diff -Nru gthumb-2.14.3/extensions/resize_images/data/gthumb_resize_images.schemas.in gthumb-3.0.0/extensions/resize_images/data/gthumb_resize_images.schemas.in --- gthumb-2.14.3/extensions/resize_images/data/gthumb_resize_images.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/resize_images/data/gthumb_resize_images.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/resize_images/width - /apps/gthumb/ext/resize_images/width - gthumb - int - 640 - - - - - - - - /schemas/apps/gthumb/ext/resize_images/height - /apps/gthumb/ext/resize_images/height - gthumb - int - 480 - - - - - - - - /schemas/apps/gthumb/ext/resize_images/unit - /apps/gthumb/ext/resize_images/unit - gthumb - string - % - - Possible values: pixels, percentage - - - - - - /schemas/apps/gthumb/ext/resize_images/keep_aspect_ratio - /apps/gthumb/ext/resize_images/keep_aspect_ratio - gthumb - bool - true - - - - - - - - /schemas/apps/gthumb/ext/resize_images/allow_swap_width_height - /apps/gthumb/ext/resize_images/allow_swap_width_height - gthumb - bool - true - - - - - - - - /schemas/apps/gthumb/ext/resize_images/mime_type - /apps/gthumb/ext/resize_images/mime_type - gthumb - string - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/resize_images/data/Makefile.am gthumb-3.0.0/extensions/resize_images/data/Makefile.am --- gthumb-2.14.3/extensions/resize_images/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/resize_images/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_resize_images.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/resize_images/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/resize_images/data/Makefile.in gthumb-3.0.0/extensions/resize_images/data/Makefile.in --- gthumb-2.14.3/extensions/resize_images/data/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/resize_images/data/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_resize_images.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/resize_images/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/resize_images/data/ui/Makefile.in gthumb-3.0.0/extensions/resize_images/data/ui/Makefile.in --- gthumb-2.14.3/extensions/resize_images/data/ui/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/resize_images/data/ui/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/resize_images/dlg-resize-images.c gthumb-3.0.0/extensions/resize_images/dlg-resize-images.c --- gthumb-2.14.3/extensions/resize_images/dlg-resize-images.c 2011-10-27 08:47:02.000000000 +0000 +++ gthumb-3.0.0/extensions/resize_images/dlg-resize-images.c 2012-02-19 15:01:32.000000000 +0000 @@ -46,6 +46,7 @@ typedef struct { GthBrowser *browser; + GSettings *settings; GList *file_list; GtkBuilder *builder; GtkWidget *dialog; @@ -76,6 +77,7 @@ { gth_browser_set_dialog (data->browser, "resize_images", NULL); + g_object_unref (data->settings); g_object_unref (data->builder); _g_object_list_unref (data->file_list); g_free (data); @@ -157,11 +159,11 @@ MIME_TYPE_COLUMN_TYPE, &mime_type, -1); - eel_gconf_set_integer (PREF_RESIZE_IMAGES_SERIES_WIDTH, resize_data->width); - eel_gconf_set_integer (PREF_RESIZE_IMAGES_SERIES_HEIGHT, resize_data->height); - eel_gconf_set_enum (PREF_RESIZE_IMAGES_UNIT, GTH_TYPE_UNIT, resize_data->unit); - eel_gconf_set_boolean (PREF_RESIZE_IMAGES_KEEP_RATIO, resize_data->keep_aspect_ratio); - eel_gconf_set_string (PREF_RESIZE_IMAGES_MIME_TYPE, mime_type ? mime_type : ""); + g_settings_set_boolean (data->settings, PREF_RESIZE_IMAGES_SERIES_WIDTH, resize_data->width); + g_settings_set_boolean (data->settings, PREF_RESIZE_IMAGES_SERIES_HEIGHT, resize_data->height); + g_settings_set_enum (data->settings, PREF_RESIZE_IMAGES_UNIT, resize_data->unit); + g_settings_set_boolean (data->settings, PREF_RESIZE_IMAGES_KEEP_RATIO, resize_data->keep_aspect_ratio); + g_settings_set_string (data->settings, PREF_RESIZE_IMAGES_MIME_TYPE, mime_type ? mime_type : ""); resize_task = gth_pixbuf_task_new (_("Resizing images"), TRUE, @@ -329,6 +331,7 @@ data = g_new0 (DialogData, 1); data->browser = browser; data->builder = _gtk_builder_new_from_file ("resize-images.ui", "resize_images"); + data->settings = g_settings_new (GTHUMB_RESIZE_IMAGES_SCHEMA); data->file_list = gth_file_data_list_dup (file_list); data->use_destination = TRUE; @@ -345,9 +348,10 @@ first_file_data->file, NULL); - unit = eel_gconf_get_enum (PREF_RESIZE_IMAGES_UNIT, GTH_TYPE_UNIT, GTH_UNIT_PIXELS); + unit = g_settings_get_enum (data->settings, PREF_RESIZE_IMAGES_UNIT); gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("unit_combobox")), unit); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("keep_ratio_checkbutton")), eel_gconf_get_boolean (PREF_RESIZE_IMAGES_KEEP_RATIO, TRUE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("keep_ratio_checkbutton")), + g_settings_get_boolean (data->settings, PREF_RESIZE_IMAGES_KEEP_RATIO)); default_width_in_pixels = DEFAULT_WIDTH_PIXELS; default_height_in_pixels = DEFAULT_HEIGHT_PIXELS; @@ -378,16 +382,16 @@ if (unit == GTH_UNIT_PERCENTAGE) { data->latest_width_in_pixel = default_width_in_pixels; data->latest_height_in_pixel = default_height_in_pixels; - data->latest_width_in_percentage = eel_gconf_get_integer (PREF_RESIZE_IMAGES_SERIES_WIDTH, DEFAULT_WIDTH_PERCENTAGE); - data->latest_height_in_percentage = eel_gconf_get_integer (PREF_RESIZE_IMAGES_SERIES_HEIGHT, DEFAULT_HEIGHT_PERCENTAGE); + data->latest_width_in_percentage = g_settings_get_int (data->settings, PREF_RESIZE_IMAGES_SERIES_WIDTH); + data->latest_height_in_percentage = g_settings_get_int (data->settings, PREF_RESIZE_IMAGES_SERIES_HEIGHT); gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("width_spinbutton")), data->latest_width_in_percentage); gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("height_spinbutton")), data->latest_height_in_percentage); } else if (unit == GTH_UNIT_PIXELS) { data->latest_width_in_percentage = DEFAULT_WIDTH_PERCENTAGE; data->latest_height_in_percentage = DEFAULT_HEIGHT_PERCENTAGE; - data->latest_width_in_pixel = eel_gconf_get_integer (PREF_RESIZE_IMAGES_SERIES_WIDTH, default_width_in_pixels); - data->latest_height_in_pixel = eel_gconf_get_integer (PREF_RESIZE_IMAGES_SERIES_HEIGHT, default_height_in_pixels); + data->latest_width_in_pixel = g_settings_get_int (data->settings, PREF_RESIZE_IMAGES_SERIES_WIDTH); + data->latest_height_in_pixel = g_settings_get_int (data->settings, PREF_RESIZE_IMAGES_SERIES_HEIGHT); gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("width_spinbutton")), data->latest_width_in_pixel); gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("height_spinbutton")), data->latest_height_in_pixel); } @@ -409,7 +413,7 @@ -1); gtk_combo_box_set_active_iter (GTK_COMBO_BOX (GET_WIDGET ("mime_type_combobox")), &iter); - default_mime_type = eel_gconf_get_string (PREF_RESIZE_IMAGES_MIME_TYPE, ""); + default_mime_type = g_settings_get_string (data->settings, PREF_RESIZE_IMAGES_MIME_TYPE); icon_cache = gth_icon_cache_new_for_widget (data->dialog, GTK_ICON_SIZE_MENU); for (i = 0; i < savers->len; i++) { diff -Nru gthumb-2.14.3/extensions/resize_images/Makefile.in gthumb-3.0.0/extensions/resize_images/Makefile.in --- gthumb-2.14.3/extensions/resize_images/Makefile.in 2012-03-25 18:34:14.000000000 +0000 +++ gthumb-3.0.0/extensions/resize_images/Makefile.in 2012-04-23 18:09:50.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -127,6 +144,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -206,10 +228,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -217,6 +237,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -256,6 +277,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -304,8 +327,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -336,6 +357,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -424,7 +446,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -432,6 +453,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -523,8 +546,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -707,13 +733,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/resize_images/preferences.h gthumb-3.0.0/extensions/resize_images/preferences.h --- gthumb-2.14.3/extensions/resize_images/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/resize_images/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -26,11 +26,17 @@ G_BEGIN_DECLS -#define PREF_RESIZE_IMAGES_SERIES_WIDTH "/apps/gthumb/ext/resize_images/width" -#define PREF_RESIZE_IMAGES_SERIES_HEIGHT "/apps/gthumb/ext/resize_images/height" -#define PREF_RESIZE_IMAGES_UNIT "/apps/gthumb/ext/resize_images/unit" -#define PREF_RESIZE_IMAGES_KEEP_RATIO "/apps/gthumb/ext/resize_images/keep_aspect_ratio" -#define PREF_RESIZE_IMAGES_MIME_TYPE "/apps/gthumb/ext/resize_images/mime_type" +/* schema */ + +#define GTHUMB_RESIZE_IMAGES_SCHEMA GTHUMB_SCHEMA ".resize-images" + +/* keys */ + +#define PREF_RESIZE_IMAGES_SERIES_WIDTH "width" +#define PREF_RESIZE_IMAGES_SERIES_HEIGHT "height" +#define PREF_RESIZE_IMAGES_UNIT "unit" +#define PREF_RESIZE_IMAGES_KEEP_RATIO "keep-aspect-ratio" +#define PREF_RESIZE_IMAGES_MIME_TYPE "mime-type" G_END_DECLS diff -Nru gthumb-2.14.3/extensions/resize_images/resize_images.extension.in.in gthumb-3.0.0/extensions/resize_images/resize_images.extension.in.in --- gthumb-2.14.3/extensions/resize_images/resize_images.extension.in.in 2011-10-25 12:21:13.000000000 +0000 +++ gthumb-3.0.0/extensions/resize_images/resize_images.extension.in.in 2012-04-21 09:23:46.000000000 +0000 @@ -7,6 +7,7 @@ Category=List-Tool [Loader] -Requires=image_viewer Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% +Requires=image_viewer diff -Nru gthumb-2.14.3/extensions/search/callbacks.c gthumb-3.0.0/extensions/search/callbacks.c --- gthumb-2.14.3/extensions/search/callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/search/callbacks.c 2012-02-19 15:01:32.000000000 +0000 @@ -99,7 +99,6 @@ g_warning ("building menus failed: %s", error->message); g_error_free (error); } - /*gtk_tool_item_set_is_important (GTK_TOOL_ITEM (gtk_ui_manager_get_widget (gth_browser_get_ui_manager (browser), "/ToolBar/SourceCommands/Edit_Find")), TRUE);*/ g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } @@ -127,7 +126,7 @@ if (data->refresh_button == NULL) { data->refresh_button = gtk_button_new (); - gtk_container_add (GTK_CONTAINER (data->refresh_button), gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON)); + gtk_container_add (GTK_CONTAINER (data->refresh_button), gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_MENU)); g_object_add_weak_pointer (G_OBJECT (data->refresh_button), (gpointer *)&data->refresh_button); gtk_button_set_relief (GTK_BUTTON (data->refresh_button), GTK_RELIEF_NONE); gtk_widget_set_tooltip_text (data->refresh_button, _("Search again")); @@ -167,7 +166,7 @@ if (! _g_content_type_is_a (g_file_info_get_content_type (file_data->info), "gthumb/search")) return; - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (_gtk_builder_get_widget (builder, "general_vbox")), vbox, FALSE, FALSE, 0); diff -Nru gthumb-2.14.3/extensions/search/data/Makefile.in gthumb-3.0.0/extensions/search/data/Makefile.in --- gthumb-2.14.3/extensions/search/data/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/search/data/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -508,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/search/data/ui/Makefile.in gthumb-3.0.0/extensions/search/data/ui/Makefile.in --- gthumb-2.14.3/extensions/search/data/ui/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/search/data/ui/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/search/gth-search.c gthumb-3.0.0/extensions/search/gth-search.c --- gthumb-2.14.3/extensions/search/gth-search.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/search/gth-search.c 2012-02-19 15:01:32.000000000 +0000 @@ -28,6 +28,19 @@ #define SEARCH_FORMAT "1.0" +static void gth_search_dom_domizable_interface_init (DomDomizableInterface *iface); +static void gth_search_gth_duplicable_interface_init (GthDuplicableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthSearch, + gth_search, + GTH_TYPE_CATALOG, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + gth_search_dom_domizable_interface_init) + G_IMPLEMENT_INTERFACE (GTH_TYPE_DUPLICABLE, + gth_search_gth_duplicable_interface_init)) + + struct _GthSearchPrivate { GFile *folder; gboolean recursive; @@ -35,9 +48,8 @@ }; -static gpointer *parent_class = NULL; -static DomDomizableIface *dom_domizable_parent_iface = NULL; -static GthDuplicableIface *gth_duplicable_parent_iface = NULL; +static DomDomizableInterface *dom_domizable_parent_iface = NULL; +static GthDuplicableInterface *gth_duplicable_parent_iface = NULL; static DomElement * @@ -60,7 +72,7 @@ g_return_if_fail (DOM_IS_ELEMENT (root)); self = GTH_SEARCH (base); - GTH_CATALOG_CLASS (parent_class)->read_from_doc (GTH_CATALOG (self), root); + GTH_CATALOG_CLASS (gth_search_parent_class)->read_from_doc (GTH_CATALOG (self), root); gth_search_set_test (self, NULL); for (node = root->first_child; node; node = node->next_sibling) { @@ -108,7 +120,7 @@ DomDocument *doc, DomElement *root) { - GTH_CATALOG_CLASS (parent_class)->write_to_doc (catalog, doc, root); + GTH_CATALOG_CLASS (gth_search_parent_class)->write_to_doc (catalog, doc, root); _gth_search_write_to_doc (GTH_SEARCH (catalog), doc, root); } @@ -184,7 +196,7 @@ search->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_search_parent_class)->finalize (object); } @@ -194,8 +206,6 @@ GObjectClass *object_class; GthCatalogClass *catalog_class; - parent_class = g_type_class_peek_parent (class); - object_class = G_OBJECT_CLASS (class); object_class->finalize = gth_search_finalize; @@ -207,7 +217,7 @@ static void -gth_search_dom_domizable_interface_init (DomDomizableIface *iface) +gth_search_dom_domizable_interface_init (DomDomizableInterface *iface) { dom_domizable_parent_iface = g_type_interface_peek_parent (iface); iface->create_element = gth_search_real_create_element; @@ -216,7 +226,7 @@ static void -gth_search_gth_duplicable_interface_init (GthDuplicableIface *iface) +gth_search_gth_duplicable_interface_init (GthDuplicableInterface *iface) { gth_duplicable_parent_iface = g_type_interface_peek_parent (iface); iface->duplicate = gth_search_real_duplicate; @@ -230,46 +240,6 @@ } -GType -gth_search_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthSearchClass), - NULL, - NULL, - (GClassInitFunc) gth_search_class_init, - NULL, - NULL, - sizeof (GthSearch), - 0, - (GInstanceInitFunc) gth_search_init - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) gth_search_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo gth_duplicable_info = { - (GInterfaceInitFunc) gth_search_gth_duplicable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (GTH_TYPE_CATALOG, - "GthSearch", - &type_info, - 0); - g_type_add_interface_static (type, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - g_type_add_interface_static (type, GTH_TYPE_DUPLICABLE, >h_duplicable_info); - } - - return type; -} - - GthSearch * gth_search_new (void) { diff -Nru gthumb-2.14.3/extensions/search/gth-search-editor.c gthumb-3.0.0/extensions/search/gth-search-editor.c --- gthumb-2.14.3/extensions/search/gth-search-editor.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/search/gth-search-editor.c 2012-03-06 15:26:06.000000000 +0000 @@ -29,7 +29,7 @@ #define GET_WIDGET(name) _gtk_builder_get_widget (self->priv->builder, (name)) -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthSearchEditor, gth_search_editor, GTK_TYPE_BOX) struct _GthSearchEditorPrivate { @@ -52,7 +52,7 @@ dialog->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_search_editor_parent_class)->finalize (object); } static void @@ -60,9 +60,7 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - object_class->finalize = gth_search_editor_finalize; } @@ -71,34 +69,7 @@ gth_search_editor_init (GthSearchEditor *dialog) { dialog->priv = g_new0 (GthSearchEditorPrivate, 1); -} - - -GType -gth_search_editor_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthSearchEditorClass), - NULL, - NULL, - (GClassInitFunc) gth_search_editor_class_init, - NULL, - NULL, - sizeof (GthSearchEditor), - 0, - (GInstanceInitFunc) gth_search_editor_init - }; - - type = g_type_register_static (GTK_TYPE_VBOX, - "GthSearchEditor", - &type_info, - 0); - } - - return type; + gtk_orientable_set_orientation (GTK_ORIENTABLE (dialog), GTK_ORIENTATION_VERTICAL); } @@ -129,7 +100,10 @@ gtk_container_set_border_width (GTK_CONTAINER (content), 0); gtk_box_pack_start (GTK_BOX (self), content, TRUE, TRUE, 0); - self->priv->location_chooser = gth_location_chooser_new (); + self->priv->location_chooser = g_object_new (GTH_TYPE_LOCATION_CHOOSER, + "show-entry-points", TRUE, + "relief", GTK_RELIEF_NORMAL, + NULL); gtk_widget_show (self->priv->location_chooser); gtk_box_pack_start (GTK_BOX (GET_WIDGET ("location_box")), self->priv->location_chooser, TRUE, TRUE, 0); diff -Nru gthumb-2.14.3/extensions/search/gth-search-editor-dialog.c gthumb-3.0.0/extensions/search/gth-search-editor-dialog.c --- gthumb-2.14.3/extensions/search/gth-search-editor-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/search/gth-search-editor-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -27,7 +27,7 @@ #include "gth-search-editor-dialog.h" -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthSearchEditorDialog, gth_search_editor_dialog, GTK_TYPE_DIALOG) struct _GthSearchEditorDialogPrivate { @@ -47,7 +47,7 @@ dialog->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_search_editor_dialog_parent_class)->finalize (object); } static void @@ -55,9 +55,7 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - object_class->finalize = gth_search_editor_dialog_finalize; } @@ -69,34 +67,6 @@ } -GType -gth_search_editor_dialog_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthSearchEditorDialogClass), - NULL, - NULL, - (GClassInitFunc) gth_search_editor_dialog_class_init, - NULL, - NULL, - sizeof (GthSearchEditorDialog), - 0, - (GInstanceInitFunc) gth_search_editor_dialog_init - }; - - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthSearchEditorDialog", - &type_info, - 0); - } - - return type; -} - - static void gth_search_editor_dialog_construct (GthSearchEditorDialog *self, const char *title, diff -Nru gthumb-2.14.3/extensions/search/gth-search-editor.h gthumb-3.0.0/extensions/search/gth-search-editor.h --- gthumb-2.14.3/extensions/search/gth-search-editor.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/search/gth-search-editor.h 2012-03-06 15:26:06.000000000 +0000 @@ -37,12 +37,12 @@ typedef struct _GthSearchEditorPrivate GthSearchEditorPrivate; struct _GthSearchEditor { - GtkVBox parent_instance; + GtkBox parent_instance; GthSearchEditorPrivate *priv; }; struct _GthSearchEditorClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; }; GType gth_search_editor_get_type (void); diff -Nru gthumb-2.14.3/extensions/search/gth-search-task.c gthumb-3.0.0/extensions/search/gth-search-task.c --- gthumb-2.14.3/extensions/search/gth-search-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/search/gth-search-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -27,6 +27,9 @@ #include "gth-search-task.h" +G_DEFINE_TYPE (GthSearchTask, gth_search_task, GTH_TYPE_TASK) + + struct _GthSearchTaskPrivate { GthBrowser *browser; @@ -43,9 +46,6 @@ }; -static gpointer parent_class = NULL; - - static void browser_unref_cb (gpointer data, GObject *browser) @@ -55,7 +55,7 @@ static void -gth_task_finalize (GObject *object) +gth_search_task_finalize (GObject *object) { GthSearchTask *task; @@ -72,7 +72,7 @@ task->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_search_task_parent_class)->finalize (object); } @@ -253,6 +253,7 @@ { GtkWidget *button; EmbeddedDialogData *dialog_data; + GSettings *settings; GString *attributes; const char *test_attributes; @@ -310,13 +311,15 @@ g_object_unref (general_filter); } - task->priv->show_hidden_files = eel_gconf_get_boolean (PREF_SHOW_HIDDEN_FILES, FALSE); + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + + task->priv->show_hidden_files = g_settings_get_boolean (settings, PREF_BROWSER_SHOW_HIDDEN_FILES); task->priv->io_operation = TRUE; task->priv->file_source = gth_main_get_file_source (gth_search_get_folder (task->priv->search)); gth_file_source_set_cancellable (task->priv->file_source, gth_task_get_cancellable (GTH_TASK (task))); - attributes = g_string_new (eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE : GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE); + attributes = g_string_new (g_settings_get_boolean (settings, PREF_BROWSER_FAST_FILE_TYPE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE : GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE); test_attributes = gth_test_get_attributes (GTH_TEST (task->priv->test)); if (test_attributes[0] != '\0') { g_string_append (attributes, ","); @@ -332,6 +335,7 @@ done_func, task); + g_object_unref (settings); g_string_free (attributes, TRUE); } @@ -419,10 +423,8 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass*) class; - object_class->finalize = gth_task_finalize; + object_class->finalize = gth_search_task_finalize; task_class = (GthTaskClass*) class; task_class->exec = gth_search_task_exec; @@ -437,34 +439,6 @@ } -GType -gth_search_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthSearchTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_search_task_class_init, - NULL, - NULL, - sizeof (GthSearchTask), - 0, - (GInstanceInitFunc) gth_search_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthSearchTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_search_task_new (GthBrowser *browser, GthSearch *search, diff -Nru gthumb-2.14.3/extensions/search/Makefile.in gthumb-3.0.0/extensions/search/Makefile.in --- gthumb-2.14.3/extensions/search/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/search/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -127,6 +144,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -206,10 +228,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -217,6 +237,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -256,6 +277,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -304,8 +327,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -336,6 +357,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -429,7 +451,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -437,6 +458,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -552,8 +575,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -736,13 +762,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/search/search.extension.in.in gthumb-3.0.0/extensions/search/search.extension.in.in --- gthumb-2.14.3/extensions/search/search.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/search/search.extension.in.in 2012-04-21 09:20:42.000000000 +0000 @@ -10,4 +10,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=catalogs diff -Nru gthumb-2.14.3/extensions/selections/actions.c gthumb-3.0.0/extensions/selections/actions.c --- gthumb-2.14.3/extensions/selections/actions.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/actions.c 2012-04-12 09:14:04.000000000 +0000 @@ -0,0 +1,163 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include +#include +#include "gth-selections-manager.h" + + +void +gth_browser_activate_action_show_selection (GthBrowser *browser, + int n_selection) +{ + char *uri; + GFile *location; + + uri = g_strdup_printf ("selection:///%d", n_selection); + location = g_file_new_for_uri (uri); + gth_browser_load_location (browser, location); + + g_free (uri); + g_object_unref (location); +} + + +void +gth_browser_activate_action_go_selection_1 (GtkAction *action, + GthBrowser *browser) +{ + gth_browser_activate_action_show_selection (browser, 1); +} + + +void +gth_browser_activate_action_go_selection_2 (GtkAction *action, + GthBrowser *browser) +{ + gth_browser_activate_action_show_selection (browser, 2); +} + + +void +gth_browser_activate_action_go_selection_3 (GtkAction *action, + GthBrowser *browser) +{ + gth_browser_activate_action_show_selection (browser, 3); +} + + +void +gth_browser_activate_action_add_to_selection (GthBrowser *browser, + int n_selection) +{ + char *uri; + GFile *folder; + GList *items; + GList *file_list = NULL; + GList *files; + + uri = g_strdup_printf ("selection:///%d", n_selection); + folder = g_file_new_for_uri (uri); + items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); + file_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); + files = gth_file_data_list_to_file_list (file_list); + gth_selections_manager_add_files (folder, files, -1); + + _g_object_list_unref (files); + _g_object_list_unref (file_list); + _gtk_tree_path_list_free (items); + g_object_unref (folder); + g_free (uri); +} + + +void +gth_browser_activate_action_add_to_selection_1 (GtkAction *action, + GthBrowser *browser) +{ + gth_browser_activate_action_add_to_selection (browser, 1); +} + +void +gth_browser_activate_action_add_to_selection_2 (GtkAction *action, + GthBrowser *browser) +{ + gth_browser_activate_action_add_to_selection (browser, 2); +} + + +void +gth_browser_activate_action_add_to_selection_3 (GtkAction *action, + GthBrowser *browser) +{ + gth_browser_activate_action_add_to_selection (browser, 3); +} + + +void +gth_browser_activate_action_remove_from_selection (GthBrowser *browser, + int n_selection) +{ + char *uri; + GFile *folder; + GList *items; + GList *file_list = NULL; + GList *files; + + uri = g_strdup_printf ("selection:///%d", n_selection); + folder = g_file_new_for_uri (uri); + items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); + file_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); + files = gth_file_data_list_to_file_list (file_list); + gth_selections_manager_remove_files (folder, files); + + _g_object_list_unref (files); + _g_object_list_unref (file_list); + _gtk_tree_path_list_free (items); + g_object_unref (folder); + g_free (uri); +} + + +void +gth_browser_activate_action_selection_go_to_container (GthBrowser *browser, + int n_selection) +{ + GList *items; + GList *file_list = NULL; + + items = gth_file_selection_get_selected (GTH_FILE_SELECTION (gth_browser_get_file_list_view (browser))); + file_list = gth_file_list_get_files (GTH_FILE_LIST (gth_browser_get_file_list (browser)), items); + + if (file_list != NULL) { + GthFileData *first_file = file_list->data; + GFile *parent; + + parent = g_file_get_parent (first_file->file); + gth_browser_go_to (browser, parent, first_file->file); + + g_object_unref (parent); + } + + _g_object_list_unref (file_list); + _gtk_tree_path_list_free (items); +} diff -Nru gthumb-2.14.3/extensions/selections/actions.h gthumb-3.0.0/extensions/selections/actions.h --- gthumb-2.14.3/extensions/selections/actions.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/actions.h 2012-04-12 09:14:04.000000000 +0000 @@ -0,0 +1,44 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2009 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef ACTIONS_H +#define ACTIONS_H + +#include + +#define DEFINE_ACTION(x) void x (GtkAction *action, gpointer data); + +void gth_browser_activate_action_show_selection (GthBrowser *browser, + int n_selection); +void gth_browser_activate_action_add_to_selection (GthBrowser *browser, + int n_selection); +void gth_browser_activate_action_remove_from_selection (GthBrowser *browser, + int n_selection); + +DEFINE_ACTION(gth_browser_activate_action_go_selection_1) +DEFINE_ACTION(gth_browser_activate_action_go_selection_2) +DEFINE_ACTION(gth_browser_activate_action_go_selection_3) +DEFINE_ACTION(gth_browser_activate_action_add_to_selection_1) +DEFINE_ACTION(gth_browser_activate_action_add_to_selection_2) +DEFINE_ACTION(gth_browser_activate_action_add_to_selection_3) +DEFINE_ACTION(gth_browser_activate_action_selection_go_to_container) + +#endif /* ACTIONS_H */ diff -Nru gthumb-2.14.3/extensions/selections/callbacks.c gthumb-3.0.0/extensions/selections/callbacks.c --- gthumb-2.14.3/extensions/selections/callbacks.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/callbacks.c 2012-04-12 09:14:04.000000000 +0000 @@ -0,0 +1,291 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include +#include +#include +#include +#include "actions.h" +#include "gth-file-source-selections.h" +#include "gth-selections-manager.h" + + +#define BROWSER_DATA_KEY "selections-browser-data" + + +static const char *fixed_ui_info = +"" +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +""; + + +static const char *vfs_ui_info = +"" +" " +" " +" " +" " +" " +" " +" " +" " +" " +" " +""; + + +static GthActionEntryExt selections_action_entries[] = { + { "Edit_AddToSelection", GTK_STOCK_ADD, N_("Add to _Selection") }, + + { "Go_FileContainer", GTK_STOCK_JUMP_TO, + N_("Open _Folder"), "End", + N_("Go to the folder that contains the selected file"), + GTH_ACTION_FLAG_NONE, + G_CALLBACK (gth_browser_activate_action_selection_go_to_container) }, + + { "Edit_AddToSelection_1", "selection1", + N_("Selection 1"), NULL, + NULL, + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, + G_CALLBACK (gth_browser_activate_action_add_to_selection_1) }, + { "Edit_AddToSelection_2", "selection2", + N_("Selection 2"), NULL, + NULL, + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, + G_CALLBACK (gth_browser_activate_action_add_to_selection_2) }, + { "Edit_AddToSelection_3", "selection3", + N_("Selection 3"), NULL, + NULL, + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE, + G_CALLBACK (gth_browser_activate_action_add_to_selection_3) }, + { "Go_Selection_1", NULL, + NULL, "1", + NULL, + GTH_ACTION_FLAG_NONE, + G_CALLBACK (gth_browser_activate_action_go_selection_1) }, + { "Go_Selection_2", NULL, + NULL, "2", + NULL, + GTH_ACTION_FLAG_NONE, + G_CALLBACK (gth_browser_activate_action_go_selection_2) }, + { "Go_Selection_3", NULL, + NULL, "3", + NULL, + GTH_ACTION_FLAG_NONE, + G_CALLBACK (gth_browser_activate_action_go_selection_3) } + +}; +static guint selections_action_entries_size = G_N_ELEMENTS (selections_action_entries); + + +typedef struct { + GthBrowser *browser; + GtkActionGroup *actions; + guint vfs_merge_id; +} BrowserData; + + +static void +browser_data_free (BrowserData *data) +{ + g_free (data); +} + + +void +selections__gth_browser_construct_cb (GthBrowser *browser) +{ + BrowserData *data; + GError *error = NULL; + + g_return_if_fail (GTH_IS_BROWSER (browser)); + + data = g_new0 (BrowserData, 1); + g_object_set_data_full (G_OBJECT (browser), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); + + data->browser = browser; + + data->actions = gtk_action_group_new ("Selections Actions"); + gtk_action_group_set_translation_domain (data->actions, NULL); + _gtk_action_group_add_actions_with_flags (data->actions, + selections_action_entries, + selections_action_entries_size, + browser); + gtk_ui_manager_insert_action_group (gth_browser_get_ui_manager (browser), data->actions, 0); + + if (! gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), fixed_ui_info, -1, &error)) { + g_message ("building menus failed: %s", error->message); + g_error_free (error); + } +} + + +static guint +get_numeric_keyval (GthBrowser *browser, + GdkEventKey *event) +{ + guint keyval; + + gdk_keymap_translate_keyboard_state (gdk_keymap_get_for_display (gtk_widget_get_display (GTK_WIDGET (browser))), + event->hardware_keycode, + event->state & ~GDK_SHIFT_MASK, + event->group, + &keyval, + NULL, NULL, NULL); + + /* This fixes the keyboard shortcuts for French keyboards (and + * maybe others as well) where the number keys are shifted. */ + if ((keyval < GDK_KEY_1) || (keyval > GDK_KEY_3)) + gdk_keymap_translate_keyboard_state (gdk_keymap_get_for_display (gtk_widget_get_display (GTK_WIDGET (browser))), + event->hardware_keycode, + event->state | GDK_SHIFT_MASK, + event->group, + &keyval, + NULL, NULL, NULL); + + return keyval; +} + + +gpointer +selections__gth_browser_file_list_key_press_cb (GthBrowser *browser, + GdkEventKey *event) +{ + gpointer result = NULL; + guint modifiers; + + modifiers = gtk_accelerator_get_default_mod_mask (); + if (((event->state & modifiers) == GDK_MOD1_MASK) + || ((event->state & modifiers) == (GDK_SHIFT_MASK|GDK_MOD1_MASK))) + { + guint keyval; + + keyval = get_numeric_keyval (browser, event); + switch (keyval) { + case GDK_KEY_1: + case GDK_KEY_2: + case GDK_KEY_3: + /* Alt+Shift+n => remove from selection n */ + if ((event->state & modifiers) == (GDK_SHIFT_MASK|GDK_MOD1_MASK)) + gth_browser_activate_action_remove_from_selection (browser, keyval - GDK_KEY_1 + 1); + else /* Alt+n => add to selection n */ + gth_browser_activate_action_add_to_selection (browser, keyval - GDK_KEY_1 + 1); + result = GINT_TO_POINTER (1); + break; + } + } + + if ((event->state & modifiers) == GDK_CONTROL_MASK) { + guint keyval; + + keyval = get_numeric_keyval (browser, event); + switch (keyval) { + case GDK_KEY_1: + case GDK_KEY_2: + case GDK_KEY_3: + /* Control+n => go to selection n */ + gth_browser_activate_action_show_selection (browser, keyval - GDK_KEY_1 + 1); + result = GINT_TO_POINTER (1); + break; + } + } + + return result; +} + + +void +selections__gth_browser_load_location_after_cb (GthBrowser *browser, + GthFileData *location_data, + const GError *error) +{ + BrowserData *data; + + if ((location_data == NULL) || (error != NULL)) + return; + + data = g_object_get_data (G_OBJECT (browser), BROWSER_DATA_KEY); + + if (GTH_IS_FILE_SOURCE_SELECTIONS (gth_browser_get_location_source (browser))) { + if (data->vfs_merge_id == 0) { + GError *error = NULL; + + data->vfs_merge_id = gtk_ui_manager_add_ui_from_string (gth_browser_get_ui_manager (browser), vfs_ui_info, -1, &error); + if (data->vfs_merge_id == 0) { + g_message ("building menus failed: %s", error->message); + g_error_free (error); + } + } + } + else { + if (data->vfs_merge_id != 0) { + gtk_ui_manager_remove_ui (gth_browser_get_ui_manager (browser), data->vfs_merge_id); + data->vfs_merge_id = 0; + } + } +} + + +void +selections__gth_browser_update_extra_widget_cb (GthBrowser *browser) +{ + GthFileData *location_data; + GtkWidget *extra_widget; + int n_selection; + char *msg; + + location_data = gth_browser_get_location_data (browser); + if (! _g_content_type_is_a (g_file_info_get_content_type (location_data->info), "gthumb/selection")) + return; + + n_selection = g_file_info_get_attribute_int32 (location_data->info, "gthumb::n-selection"); + extra_widget = gth_browser_get_list_extra_widget (browser); + gth_embedded_dialog_set_gicon (GTH_EMBEDDED_DIALOG (extra_widget), g_file_info_get_icon (location_data->info), GTK_ICON_SIZE_DIALOG); + gth_embedded_dialog_set_primary_text (GTH_EMBEDDED_DIALOG (extra_widget), g_file_info_get_display_name (location_data->info)); + if (n_selection > 0) + msg = g_strdup_printf (_("Use Alt-%d to add files to this selection, Ctrl-%d to view this selection."), n_selection, n_selection); + else + msg = NULL; + gth_embedded_dialog_set_secondary_text (GTH_EMBEDDED_DIALOG (extra_widget), msg); + + g_free (msg); +} diff -Nru gthumb-2.14.3/extensions/selections/callbacks.h gthumb-3.0.0/extensions/selections/callbacks.h --- gthumb-2.14.3/extensions/selections/callbacks.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/callbacks.h 2012-04-09 18:29:50.000000000 +0000 @@ -0,0 +1,35 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef CALLBACKS_H +#define CALLBACKS_H + +#include + +void selections__gth_browser_construct_cb (GthBrowser *browser); +gpointer selections__gth_browser_file_list_key_press_cb (GthBrowser *browser, + GdkEventKey *event); +void selections__gth_browser_load_location_after_cb (GthBrowser *browser, + GthFileData *location_data, + const GError *error); +void selections__gth_browser_update_extra_widget_cb (GthBrowser *browser); + +#endif /* CALLBACKS_H */ diff -Nru gthumb-2.14.3/extensions/selections/gth-file-source-selections.c gthumb-3.0.0/extensions/selections/gth-file-source-selections.c --- gthumb-2.14.3/extensions/selections/gth-file-source-selections.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/gth-file-source-selections.c 2012-03-26 16:58:40.000000000 +0000 @@ -0,0 +1,322 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include "gth-file-source-selections.h" +#include "gth-selections-manager.h" + + +struct _GthFileSourceSelectionsPrivate { + ListReady ready_func; + gpointer ready_data; +}; + + +G_DEFINE_TYPE (GthFileSourceSelections, gth_file_source_selections, GTH_TYPE_FILE_SOURCE) + + +static GList * +get_entry_points (GthFileSource *file_source) +{ + GList *list = NULL; + GFile *file; + GFileInfo *info; + + file = g_file_new_for_uri ("selection:///"); + info = gth_file_source_get_file_info (file_source, file, GFILE_BASIC_ATTRIBUTES); + list = g_list_append (list, gth_file_data_new (file, info)); + + g_object_unref (info); + g_object_unref (file); + + return list; +} + + +static GFile * +gth_file_source_selections_to_gio_file (GthFileSource *file_source, + GFile *file) +{ + return g_file_dup (file); +} + + +static void +update_file_info (GthFileSource *file_source, + GFile *file, + GFileInfo *info) +{ + gth_selections_manager_update_file_info (file, info); +} + + +static GFileInfo * +gth_file_source_selections_get_file_info (GthFileSource *file_source, + GFile *file, + const char *attributes) +{ + GFileInfo *file_info; + + file_info = g_file_info_new (); + update_file_info (file_source, file, file_info); + + return file_info; +} + + +static GthFileData * +gth_file_source_selections_get_file_data (GthFileSource *file_source, + GFile *file, + GFileInfo *info) +{ + GthFileData *file_data = NULL; + + switch (g_file_info_get_file_type (info)) { + case G_FILE_TYPE_REGULAR: + file_data = gth_file_data_new (file, info); + break; + + case G_FILE_TYPE_DIRECTORY: + update_file_info (file_source, file, info); + file_data = gth_file_data_new (file, info); + break; + + default: + break; + } + + return file_data; +} + + +static void +gth_file_source_selections_write_metadata (GthFileSource *file_source, + GthFileData *file_data, + const char *attributes, + ReadyCallback callback, + gpointer user_data) +{ + if (_g_file_attributes_matches_any (attributes, "sort::*")) + gth_selections_manager_set_sort_type (file_data->file, + g_file_info_get_attribute_string (file_data->info, "sort::type"), + g_file_info_get_attribute_boolean (file_data->info, "sort::inverse")); + + object_ready_with_error (file_source, callback, user_data, NULL); +} + + +static void +gth_file_source_selections_read_metadata (GthFileSource *file_source, + GthFileData *file_data, + const char *attributes, + ReadyCallback callback, + gpointer user_data) +{ + int n_selection; + + n_selection = _g_file_get_n_selection (file_data->file); + if (n_selection < 0) { + GError *error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Invalid location." /* FIXME: mark as translatable after string freeze */); + object_ready_with_error (file_source, callback, user_data, error); + return; + } + + update_file_info (file_source, file_data->file, file_data->info); + object_ready_with_error (file_source, callback, user_data, NULL); +} + + +static void +gth_file_source_selections_rename (GthFileSource *file_source, + GFile *file, + const char *edit_name, + ReadyCallback callback, + gpointer user_data) +{ + object_ready_with_error (file_source, callback, user_data, NULL); +} + + +static void +gth_file_source_selections_for_each_child (GthFileSource *file_source, + GFile *parent, + gboolean recursive, + const char *attributes, + StartDirCallback start_dir_func, + ForEachChildCallback for_each_file_func, + ReadyCallback ready_func, + gpointer user_data) +{ + if (start_dir_func != NULL) { + GFileInfo *info; + GError *error = NULL; + + info = gth_file_source_selections_get_file_info (file_source, parent, ""); + + switch (start_dir_func (parent, info, &error, user_data)) { + case DIR_OP_CONTINUE: + break; + case DIR_OP_SKIP: + object_ready_with_error (file_source, ready_func, user_data, NULL); + return; + case DIR_OP_STOP: + object_ready_with_error (file_source, ready_func, user_data, error); + g_object_unref (info); + return; + } + + g_object_unref (info); + } + + + gth_selections_manager_for_each_child (parent, + attributes, + gth_file_source_get_cancellable (file_source), + for_each_file_func, + ready_func, + user_data); +} + + +static void +gth_file_source_selections_copy (GthFileSource *file_source, + GthFileData *destination, + GList *file_list, /* GFile * list */ + gboolean move, + int destination_position, + ProgressCallback progress_callback, + DialogCallback dialog_callback, + ReadyCallback ready_callback, + gpointer user_data) +{ + if (gth_selections_manager_add_files (destination->file, + file_list, + destination_position)) + { + gth_monitor_folder_changed (gth_main_get_default_monitor (), + destination->file, + file_list, + GTH_MONITOR_EVENT_CREATED); + } + + object_ready_with_error (file_source, ready_callback, user_data, NULL); +} + + +static gboolean +gth_file_source_selections_can_cut (GthFileSource *file_source, + GFile *file) +{ + return FALSE; +} + + +static gboolean +gth_file_source_selections_is_reorderable (GthFileSource *file_source) +{ + return TRUE; +} + + +static void +gth_file_source_selections_reorder (GthFileSource *file_source, + GthFileData *destination, + GList *visible_files, /* GFile list */ + GList *files_to_move, /* GFile list */ + int dest_pos, + ReadyCallback callback, + gpointer data) +{ + gth_selections_manager_reorder (destination->file, + visible_files, + files_to_move, + dest_pos); + object_ready_with_error (file_source, callback, data, NULL); +} + + +static void +gth_file_source_selections_remove (GthFileSource *file_source, + GthFileData *location, + GList *file_list /* GthFileData list */, + gboolean permanently, + GtkWindow *parent) +{ + GList *files; + + files = gth_file_data_list_to_file_list (file_list); + gth_selections_manager_remove_files (location->file, files); + + _g_object_list_unref (files); +} + + +static void +gth_file_source_selections_finalize (GObject *object) +{ + GthFileSourceSelections *self = GTH_FILE_SOURCE_SELECTIONS (object); + + if (self->priv != NULL) { + g_free (self->priv); + self->priv = NULL; + } + + G_OBJECT_CLASS (gth_file_source_selections_parent_class)->finalize (object); +} + + +static void +gth_file_source_selections_class_init (GthFileSourceSelectionsClass *class) +{ + GObjectClass *object_class; + GthFileSourceClass *file_source_class; + + object_class = (GObjectClass*) class; + object_class->finalize = gth_file_source_selections_finalize; + + file_source_class = (GthFileSourceClass*) class; + file_source_class->get_entry_points = get_entry_points; + file_source_class->to_gio_file = gth_file_source_selections_to_gio_file; + file_source_class->get_file_info = gth_file_source_selections_get_file_info; + file_source_class->get_file_data = gth_file_source_selections_get_file_data; + file_source_class->write_metadata = gth_file_source_selections_write_metadata; + file_source_class->read_metadata = gth_file_source_selections_read_metadata; + file_source_class->rename = gth_file_source_selections_rename; + file_source_class->for_each_child = gth_file_source_selections_for_each_child; + file_source_class->copy = gth_file_source_selections_copy; + file_source_class->can_cut = gth_file_source_selections_can_cut; + file_source_class->is_reorderable = gth_file_source_selections_is_reorderable; + file_source_class->reorder = gth_file_source_selections_reorder; + file_source_class->remove = gth_file_source_selections_remove; +} + + +static void +gth_file_source_selections_init (GthFileSourceSelections *self) +{ + gth_file_source_add_scheme (GTH_FILE_SOURCE (self), "selection"); + + self->priv = g_new0 (GthFileSourceSelectionsPrivate, 1); +} diff -Nru gthumb-2.14.3/extensions/selections/gth-file-source-selections.h gthumb-3.0.0/extensions/selections/gth-file-source-selections.h --- gthumb-2.14.3/extensions/selections/gth-file-source-selections.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/gth-file-source-selections.h 2012-03-04 15:22:15.000000000 +0000 @@ -0,0 +1,51 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_FILE_SOURCE_SELECTIONS_H +#define GTH_FILE_SOURCE_SELECTIONS_H + +#include + +#define GTH_TYPE_FILE_SOURCE_SELECTIONS (gth_file_source_selections_get_type ()) +#define GTH_FILE_SOURCE_SELECTIONS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_FILE_SOURCE_SELECTIONS, GthFileSourceSelections)) +#define GTH_FILE_SOURCE_SELECTIONS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GTH_TYPE_FILE_SOURCE_SELECTIONS, GthFileSourceSelectionsClass)) +#define GTH_IS_FILE_SOURCE_SELECTIONS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTH_TYPE_FILE_SOURCE_SELECTIONS)) +#define GTH_IS_FILE_SOURCE_SELECTIONS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTH_TYPE_FILE_SOURCE_SELECTIONS)) +#define GTH_FILE_SOURCE_SELECTIONS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GTH_TYPE_FILE_SOURCE_SELECTIONS, GthFileSourceSelectionsClass)) + +typedef struct _GthFileSourceSelections GthFileSourceSelections; +typedef struct _GthFileSourceSelectionsPrivate GthFileSourceSelectionsPrivate; +typedef struct _GthFileSourceSelectionsClass GthFileSourceSelectionsClass; + +struct _GthFileSourceSelections +{ + GthFileSource __parent; + GthFileSourceSelectionsPrivate *priv; +}; + +struct _GthFileSourceSelectionsClass +{ + GthFileSourceClass __parent_class; +}; + +GType gth_file_source_selections_get_type (void) G_GNUC_CONST; + +#endif /* GTH_FILE_SOURCE_SELECTIONS_H */ diff -Nru gthumb-2.14.3/extensions/selections/gth-metadata-provider-selections.c gthumb-3.0.0/extensions/selections/gth-metadata-provider-selections.c --- gthumb-2.14.3/extensions/selections/gth-metadata-provider-selections.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/gth-metadata-provider-selections.c 2012-04-09 10:56:57.000000000 +0000 @@ -0,0 +1,108 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "gth-metadata-provider-selections.h" +#include "gth-selections-manager.h" + + +G_DEFINE_TYPE (GthMetadataProviderSelections, gth_metadata_provider_selections, GTH_TYPE_METADATA_PROVIDER) + + +static gboolean +gth_metadata_provider_selections_can_read (GthMetadataProvider *self, + const char *mime_type, + char **attribute_v) +{ + return _g_file_attributes_matches_any_v (GTH_FILE_ATTRIBUTE_EMBLEMS, + attribute_v); +} + + +static gboolean +gth_metadata_provider_selections_can_write (GthMetadataProvider *self, + const char *mime_type, + char **attribute_v) +{ + return FALSE; +} + + +static void +gth_metadata_provider_selections_read (GthMetadataProvider *self, + GthFileData *file_data, + const char *attributes, + GCancellable *cancellable) +{ + GList *emblem_list; + GthStringList *emblems; + GthStringList *other_emblems; + int i; + + emblem_list = NULL; + for (i = GTH_SELECTIONS_MANAGER_N_SELECTIONS; i >= 0; i--) { + if (gth_selections_manager_file_exists (i, file_data->file)) + emblem_list = g_list_prepend (emblem_list, g_strdup_printf ("selection%d", i)); + } + + emblems = gth_string_list_new (emblem_list); + other_emblems = (GthStringList *) g_file_info_get_attribute_object (file_data->info, GTH_FILE_ATTRIBUTE_EMBLEMS); + if (other_emblems != NULL) + gth_string_list_append (emblems, other_emblems); + + g_file_info_set_attribute_object (file_data->info, GTH_FILE_ATTRIBUTE_EMBLEMS, G_OBJECT (emblems)); + + g_object_unref (emblems); + _g_string_list_free (emblem_list); +} + + +static void +gth_metadata_provider_selections_write (GthMetadataProvider *self, + GthMetadataWriteFlags flags, + GthFileData *file_data, + const char *attributes, + GCancellable *cancellable) +{ + /* void: never called */ +} + + +static void +gth_metadata_provider_selections_class_init (GthMetadataProviderSelectionsClass *klass) +{ + GthMetadataProviderClass *mp_class; + + mp_class = GTH_METADATA_PROVIDER_CLASS (klass); + mp_class->can_read = gth_metadata_provider_selections_can_read; + mp_class->can_write = gth_metadata_provider_selections_can_write; + mp_class->read = gth_metadata_provider_selections_read; + mp_class->write = gth_metadata_provider_selections_write; +} + + +static void +gth_metadata_provider_selections_init (GthMetadataProviderSelections *self) +{ + /* void */ +} diff -Nru gthumb-2.14.3/extensions/selections/gth-metadata-provider-selections.h gthumb-3.0.0/extensions/selections/gth-metadata-provider-selections.h --- gthumb-2.14.3/extensions/selections/gth-metadata-provider-selections.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/gth-metadata-provider-selections.h 2012-04-07 10:53:22.000000000 +0000 @@ -0,0 +1,51 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_METADATA_PROVIDER_SELECTIONS_H +#define GTH_METADATA_PROVIDER_SELECTIONS_H + +#include +#include +#include + +#define GTH_TYPE_METADATA_PROVIDER_SELECTIONS (gth_metadata_provider_selections_get_type ()) +#define GTH_METADATA_PROVIDER_SELECTIONS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_METADATA_PROVIDER_SELECTIONS, GthMetadataProviderSelections)) +#define GTH_METADATA_PROVIDER_SELECTIONS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GTH_TYPE_METADATA_PROVIDER_SELECTIONS, GthMetadataProviderSelectionsClass)) +#define GTH_IS_METADATA_PROVIDER_SELECTIONS(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTH_TYPE_METADATA_PROVIDER_SELECTIONS)) +#define GTH_IS_METADATA_PROVIDER_SELECTIONS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTH_TYPE_METADATA_PROVIDER_SELECTIONS)) +#define GTH_METADATA_PROVIDER_SELECTIONS_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GTH_TYPE_METADATA_PROVIDER_SELECTIONS, GthMetadataProviderSelectionsClass)) + +typedef struct _GthMetadataProviderSelections GthMetadataProviderSelections; +typedef struct _GthMetadataProviderSelectionsClass GthMetadataProviderSelectionsClass; + +struct _GthMetadataProviderSelections +{ + GthMetadataProvider __parent; +}; + +struct _GthMetadataProviderSelectionsClass +{ + GthMetadataProviderClass __parent_class; +}; + +GType gth_metadata_provider_selections_get_type (void) G_GNUC_CONST; + +#endif /* GTH_METADATA_PROVIDER_SELECTIONS_H */ diff -Nru gthumb-2.14.3/extensions/selections/gth-selections-manager.c gthumb-3.0.0/extensions/selections/gth-selections-manager.c --- gthumb-2.14.3/extensions/selections/gth-selections-manager.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/gth-selections-manager.c 2012-04-09 18:29:50.000000000 +0000 @@ -0,0 +1,559 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include "gth-selections-manager.h" + + +struct _GthSelectionsManagerPrivate { + GList *files[GTH_SELECTIONS_MANAGER_N_SELECTIONS]; + GHashTable *files_hash[GTH_SELECTIONS_MANAGER_N_SELECTIONS]; + char *order[GTH_SELECTIONS_MANAGER_N_SELECTIONS]; + gboolean order_inverse[GTH_SELECTIONS_MANAGER_N_SELECTIONS]; + GMutex *mutex; +}; + + +G_DEFINE_TYPE (GthSelectionsManager, + gth_selections_manager, + G_TYPE_OBJECT) + + +static GthSelectionsManager *the_manager = NULL; + + +static GObject * +gth_selections_manager_constructor (GType type, + guint n_construct_params, + GObjectConstructParam *construct_params) +{ + static GObject *object = NULL; + + if (the_manager == NULL) { + object = G_OBJECT_CLASS (gth_selections_manager_parent_class)->constructor (type, n_construct_params, construct_params); + the_manager = GTH_SELECTIONS_MANAGER (object); + } + else + object = G_OBJECT (the_manager); + + return object; +} + + +static void +gth_selections_manager_finalize (GObject *object) +{ + GthSelectionsManager *self; + int i; + + self = GTH_SELECTIONS_MANAGER (object); + + for (i = 0; i < GTH_SELECTIONS_MANAGER_N_SELECTIONS; i++) { + _g_object_list_unref (self->priv->files[i]); + g_hash_table_unref (self->priv->files_hash[i]); + g_free (self->priv->order[i]); + } + g_mutex_free (self->priv->mutex); + + G_OBJECT_CLASS (gth_selections_manager_parent_class)->finalize (object); +} + + +static void +gth_selections_manager_class_init (GthSelectionsManagerClass *klass) +{ + GObjectClass *object_class; + + g_type_class_add_private (klass, sizeof (GthSelectionsManagerPrivate)); + + object_class = (GObjectClass*) klass; + object_class->constructor = gth_selections_manager_constructor; + object_class->finalize = gth_selections_manager_finalize; +} + +static void +gth_selections_manager_init (GthSelectionsManager *self) +{ + int i; + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_SELECTIONS_MANAGER, GthSelectionsManagerPrivate); + self->priv->mutex = g_mutex_new (); + for (i = 0; i < GTH_SELECTIONS_MANAGER_N_SELECTIONS; i++) { + self->priv->files[i] = NULL; + self->priv->files_hash[i] = g_hash_table_new (g_file_hash, (GEqualFunc) g_file_equal); + self->priv->order[i] = NULL; + self->priv->order_inverse[i] = FALSE; + } +} + + +static GthSelectionsManager * +gth_selections_manager_get_default (void) +{ + return (GthSelectionsManager*) g_object_new (GTH_TYPE_SELECTIONS_MANAGER, NULL); +} + + +/* -- gth_selections_manager_for_each_child -- */ + + +typedef struct { + GthSelectionsManager *selections_manager; + GList *files; + GList *current_file; + char *attributes; + GCancellable *cancellable; + ForEachChildCallback for_each_file_func; + ReadyCallback ready_callback; + gpointer user_data; +} ForEachChildData; + + +static void +fec_data_free (ForEachChildData *data) +{ + _g_object_list_unref (data->files); + g_free (data->attributes); + _g_object_unref (data->cancellable); + g_free (data); +} + + +static void +selections_manager_fec_done (ForEachChildData *data, + GError *error) +{ + if (data->ready_callback != NULL) + data->ready_callback (NULL, error, data->user_data); + fec_data_free (data); +} + + +static void +fec__file_info_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + ForEachChildData *data = user_data; + GFile *file; + GFileInfo *info; + + file = (GFile*) source_object; + info = g_file_query_info_finish (file, result, NULL); + if (info != NULL) { + if (data->for_each_file_func != NULL) + data->for_each_file_func (file, info, data->user_data); + g_object_unref (info); + } + + data->current_file = data->current_file->next; + if (data->current_file == NULL) { + selections_manager_fec_done (data, NULL); + return; + } + + g_file_query_info_async ((GFile *) data->current_file->data, + data->attributes, + 0, + G_PRIORITY_DEFAULT, + data->cancellable, + fec__file_info_ready_cb, + data); + +} + + +static void +selections_manager_fec_done_cb (GObject *object, + GError *error, + gpointer user_data) +{ + selections_manager_fec_done (user_data, NULL); +} + + +void +gth_selections_manager_update_file_info (GFile *file, + GFileInfo *info) +{ + int n_selection; + char *name; + + n_selection = _g_file_get_n_selection (file); + + g_file_info_set_file_type (info, G_FILE_TYPE_DIRECTORY); + g_file_info_set_content_type (info, "gthumb/selection"); + + g_file_info_set_sort_order (info, n_selection); + g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ, TRUE); + if (n_selection > 0) + g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE, TRUE); + g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE, FALSE); + g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME, FALSE); + g_file_info_set_attribute_int32 (info, "gthumb::n-selection", n_selection); + + /* icon */ + + if (n_selection > 0) { + GIcon *icon; + + name = g_strdup_printf ("selection%d", n_selection); + icon = g_themed_icon_new (name); + g_file_info_set_icon (info, icon); + + g_object_unref (icon); + g_free (name); + } + else { + GIcon *icon = g_themed_icon_new ("selection"); + g_file_info_set_icon (info, icon); + g_object_unref (icon); + } + + /* display name */ + + if (n_selection > 0) { + g_file_info_set_attribute_boolean (info, "gthumb::no-child", TRUE); + name = g_strdup_printf (_("Selection %d"), n_selection); + } + else if (n_selection == 0) + name = g_strdup (_("Selections")); + else + name = g_strdup ("???"); + g_file_info_set_display_name (info, name); + g_free (name); + + /* name */ + + if (n_selection > 0) + name = g_strdup_printf ("%d", n_selection); + else + name = g_strdup (""); + g_file_info_set_name (info, name); + + g_free (name); + + /* sort order */ + + if (n_selection > 0) { + GthSelectionsManager *self; + + self = gth_selections_manager_get_default (); + + if (self->priv->order[n_selection] != NULL) { + g_file_info_set_attribute_string (info, "sort::type", self->priv->order[n_selection - 1]); + g_file_info_set_attribute_boolean (info, "sort::inverse", self->priv->order_inverse[n_selection - 1]); + } + else { + g_file_info_remove_attribute (info, "sort::type"); + g_file_info_remove_attribute (info, "sort::inverse"); + } + } +} + + +static void +_gth_selections_manager_for_each_selection (gpointer user_data) +{ + ForEachChildData *data = user_data; + int i; + + for (i = 0; i < GTH_SELECTIONS_MANAGER_N_SELECTIONS; i++) { + char *uri; + GFile *file; + GFileInfo *info; + + uri = g_strdup_printf ("selection:///%d", i + 1); + file = g_file_new_for_uri (uri); + info = g_file_info_new (); + gth_selections_manager_update_file_info (file, info); + data->for_each_file_func (file, info, data->user_data); + + g_object_unref (info); + g_object_unref (file); + g_free (uri); + } + + object_ready_with_error (data->selections_manager, + data->ready_callback, + data->user_data, + NULL); + fec_data_free (data); +} + + +void +gth_selections_manager_for_each_child (GFile *folder, + const char *attributes, + GCancellable *cancellable, + ForEachChildCallback for_each_file_func, + ReadyCallback ready_callback, + gpointer user_data) +{ + GthSelectionsManager *self; + int n_selection; + ForEachChildData *data; + + self = gth_selections_manager_get_default (); + n_selection = _g_file_get_n_selection (folder); + + g_mutex_lock (self->priv->mutex); + data = g_new0 (ForEachChildData, 1); + data->selections_manager = self; + if (n_selection > 0) + data->files = _g_object_list_ref (self->priv->files[n_selection - 1]); + data->current_file = data->files; + data->attributes = g_strdup (attributes); + data->cancellable = _g_object_ref(cancellable); + data->for_each_file_func = for_each_file_func; + data->ready_callback = ready_callback; + data->user_data = user_data; + g_mutex_unlock (self->priv->mutex); + + if (n_selection == 0) { + call_when_idle (_gth_selections_manager_for_each_selection, data); + } + else if (data->current_file != NULL) + g_file_query_info_async ((GFile *) data->current_file->data, + data->attributes, + 0, + G_PRIORITY_DEFAULT, + data->cancellable, + fec__file_info_ready_cb, + data); + else + object_ready_with_error (NULL, selections_manager_fec_done_cb, data, NULL); +} + + +gboolean +gth_selections_manager_add_files (GFile *folder, + GList *file_list, /* GFile list */ + int destination_position) +{ + GthSelectionsManager *self; + int n_selection; + GList *new_list; + GList *scan; + GList *link; + + if (! g_file_has_uri_scheme (folder, "selection")) + return FALSE; + + self = gth_selections_manager_get_default (); + n_selection = _g_file_get_n_selection (folder); + if (n_selection <= 0) + return FALSE; + + g_mutex_lock (self->priv->mutex); + + new_list = _g_file_list_dup (file_list); + + for (scan = new_list; scan; scan = scan->next) + g_hash_table_insert (self->priv->files_hash[n_selection - 1], scan->data, GINT_TO_POINTER (1)); + + link = g_list_nth (self->priv->files[n_selection - 1], destination_position); + if (link != NULL) { + GList *last_new; + + /* insert 'new_list' before 'link' */ + + if (link->prev != NULL) + link->prev->next = new_list; + new_list->prev = link->prev; + + last_new = g_list_last (new_list); + last_new->next = link; + link->prev = last_new; + } + else + self->priv->files[n_selection - 1] = g_list_concat (self->priv->files[n_selection - 1], new_list); + + gth_monitor_emblems_changed (gth_main_get_default_monitor (), file_list); + gth_monitor_folder_changed (gth_main_get_default_monitor (), + folder, + file_list, + GTH_MONITOR_EVENT_CREATED); + + g_mutex_unlock (self->priv->mutex); + + return TRUE; +} + + +void +gth_selections_manager_remove_files (GFile *folder, + GList *file_list) +{ + GthSelectionsManager *self; + int n_selection; + GHashTable *files_to_remove; + GList *scan; + GList *new_list; + + self = gth_selections_manager_get_default (); + n_selection = _g_file_get_n_selection (folder); + if (n_selection <= 0) + return; + + g_mutex_lock (self->priv->mutex); + + files_to_remove = g_hash_table_new (g_file_hash, (GEqualFunc) g_file_equal); + for (scan = file_list; scan; scan = scan->next) { + g_hash_table_insert (files_to_remove, scan->data, GINT_TO_POINTER (1)); + g_hash_table_remove (self->priv->files_hash[n_selection - 1], scan->data); + } + + new_list = NULL; + for (scan = self->priv->files[n_selection - 1]; scan; scan = scan->next) { + GFile *file = scan->data; + + if (g_hash_table_lookup (files_to_remove, file)) + continue; + + new_list = g_list_prepend (new_list, g_object_ref (file)); + } + new_list = g_list_reverse (new_list); + + g_hash_table_unref (files_to_remove); + + _g_object_list_unref (self->priv->files[n_selection - 1]); + self->priv->files[n_selection - 1] = new_list; + + gth_monitor_folder_changed (gth_main_get_default_monitor (), + folder, + file_list, + GTH_MONITOR_EVENT_REMOVED); + gth_monitor_emblems_changed (gth_main_get_default_monitor (), file_list); + + g_mutex_unlock (self->priv->mutex); +} + + +void +gth_selections_manager_reorder (GFile *folder, + GList *visible_files, /* GFile list */ + GList *files_to_move, /* GFile list */ + int dest_pos) +{ + GthSelectionsManager *self; + int n_selection; + int *new_order; + GList *new_file_list; + + n_selection = _g_file_get_n_selection (folder); + if (n_selection <= 0) + return; + + self = gth_selections_manager_get_default (); + + /* reorder the file list */ + + g_mutex_lock (self->priv->mutex); + _g_list_reorder (self->priv->files[n_selection - 1], + visible_files, + files_to_move, + dest_pos, + &new_order, + &new_file_list); + _g_object_list_unref (self->priv->files[n_selection - 1]); + self->priv->files[n_selection - 1] = new_file_list; + g_mutex_unlock (self->priv->mutex); + + gth_selections_manager_set_sort_type (folder, "general::unsorted", FALSE); + + gth_monitor_order_changed (gth_main_get_default_monitor (), + folder, + new_order); + + g_free (new_order); +} + + +void +gth_selections_manager_set_sort_type (GFile *folder, + const char *sort_type, + gboolean sort_inverse) +{ + GthSelectionsManager *self; + int n_selection; + + n_selection = _g_file_get_n_selection (folder); + if (n_selection <= 0) + return; + + self = gth_selections_manager_get_default (); + g_mutex_lock (self->priv->mutex); + + g_free (self->priv->order[n_selection - 1]); + self->priv->order[n_selection - 1] = g_strdup (sort_type); + self->priv->order_inverse[n_selection - 1] = sort_inverse; + + g_mutex_unlock (self->priv->mutex); +} + + +gboolean +gth_selections_manager_file_exists (int n_selection, + GFile *file) +{ + GthSelectionsManager *self; + gboolean result; + + if ((n_selection <= 0) || (n_selection > GTH_SELECTIONS_MANAGER_N_SELECTIONS)) + return FALSE; + + self = gth_selections_manager_get_default (); + g_mutex_lock (self->priv->mutex); + + result = (g_hash_table_lookup (self->priv->files_hash[n_selection - 1], file) != NULL); + + g_mutex_unlock (self->priv->mutex); + + return result; +} + + +int +_g_file_get_n_selection (GFile *file) +{ + char *uri; + int n = -1; + + uri = g_file_get_uri (file); + if (! g_str_has_prefix (uri, "selection:///")) + n = -1; + else if (strcmp (uri, "selection:///") == 0) + n = 0; + else + n = atoi (uri + strlen ("selection:///")); + + g_free (uri); + + if (n > GTH_SELECTIONS_MANAGER_N_SELECTIONS) + n = -1; + + return n; +} diff -Nru gthumb-2.14.3/extensions/selections/gth-selections-manager.h gthumb-3.0.0/extensions/selections/gth-selections-manager.h --- gthumb-2.14.3/extensions/selections/gth-selections-manager.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/gth-selections-manager.h 2012-04-09 18:29:50.000000000 +0000 @@ -0,0 +1,85 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2012 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_SELECTIONS_MANAGER_H +#define GTH_SELECTIONS_MANAGER_H + +#include +#include +#include + +G_BEGIN_DECLS + +#define GTH_SELECTIONS_MANAGER_N_SELECTIONS 3 + +#define GTH_TYPE_SELECTIONS_MANAGER (gth_selections_manager_get_type ()) +#define GTH_SELECTIONS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTH_TYPE_SELECTIONS_MANAGER, GthSelectionsManager)) +#define GTH_SELECTIONS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GTH_TYPE_SELECTIONS_MANAGER, GthSelectionsManagerClass)) +#define GTH_IS_SELECTIONS_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTH_TYPE_SELECTIONS_MANAGER)) +#define GTH_IS_SELECTIONS_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTH_TYPE_SELECTIONS_MANAGER)) +#define GTH_SELECTIONS_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), GTH_TYPE_SELECTIONS_MANAGER, GthSelectionsManagerClass)) + +typedef struct _GthSelectionsManager GthSelectionsManager; +typedef struct _GthSelectionsManagerPrivate GthSelectionsManagerPrivate; +typedef struct _GthSelectionsManagerClass GthSelectionsManagerClass; + +struct _GthSelectionsManager { + GObject __parent; + GthSelectionsManagerPrivate *priv; +}; + +struct _GthSelectionsManagerClass { + GObjectClass __parent_class; +}; + +GType gth_selections_manager_get_type (void) G_GNUC_CONST; + +void gth_selections_manager_for_each_child (GFile *folder, + const char *attributes, + GCancellable *cancellable, + ForEachChildCallback for_each_file_func, + ReadyCallback ready_callback, + gpointer user_data); +gboolean gth_selections_manager_add_files (GFile *folder, + GList *file_list, /* GFile list */ + int destination_position); +void gth_selections_manager_remove_files (GFile *folder, + GList *file_list); +void gth_selections_manager_reorder (GFile *folder, + GList *visible_files, /* GFile list */ + GList *files_to_move, /* GFile list */ + int dest_pos); +void gth_selections_manager_set_sort_type (GFile *folder, + const char *sort_type, + gboolean sort_inverse); +void gth_selections_manager_update_file_info (GFile *file, + GFileInfo *info); +gboolean gth_selections_manager_file_exists (int n_selection, + GFile *file); + +/* utilities */ + +int _g_file_get_n_selection (GFile *file); + +G_END_DECLS + +#endif /* GTH_SELECTIONS_MANAGER_H */ + diff -Nru gthumb-2.14.3/extensions/selections/main.c gthumb-3.0.0/extensions/selections/main.c --- gthumb-2.14.3/extensions/selections/main.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/main.c 2012-04-09 18:29:50.000000000 +0000 @@ -0,0 +1,59 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2008 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + +#include +#include +#include +#include "callbacks.h" +#include "gth-file-source-selections.h" +#include "gth-metadata-provider-selections.h" + + +G_MODULE_EXPORT void +gthumb_extension_activate (void) +{ + gth_main_register_file_source (GTH_TYPE_FILE_SOURCE_SELECTIONS); + gth_main_register_metadata_provider (GTH_TYPE_METADATA_PROVIDER_SELECTIONS); + gth_hook_add_callback ("gth-browser-construct", 10, G_CALLBACK (selections__gth_browser_construct_cb), NULL); + gth_hook_add_callback ("gth-browser-file-list-key-press", 10, G_CALLBACK (selections__gth_browser_file_list_key_press_cb), NULL); + gth_hook_add_callback ("gth-browser-load-location-after", 10, G_CALLBACK (selections__gth_browser_load_location_after_cb), NULL); + gth_hook_add_callback ("gth-browser-update-extra-widget", 20, G_CALLBACK (selections__gth_browser_update_extra_widget_cb), NULL); +} + + +G_MODULE_EXPORT void +gthumb_extension_deactivate (void) +{ +} + + +G_MODULE_EXPORT gboolean +gthumb_extension_is_configurable (void) +{ + return FALSE; +} + + +G_MODULE_EXPORT void +gthumb_extension_configure (GtkWindow *parent) +{ +} diff -Nru gthumb-2.14.3/extensions/selections/Makefile.am gthumb-3.0.0/extensions/selections/Makefile.am --- gthumb-2.14.3/extensions/selections/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/Makefile.am 2012-04-09 18:29:50.000000000 +0000 @@ -0,0 +1,33 @@ +extensiondir = $(pkglibdir)/extensions +extension_LTLIBRARIES = libselections.la + +libselections_la_SOURCES = \ + actions.c \ + actions.h \ + callbacks.c \ + callbacks.h \ + gth-file-source-selections.c \ + gth-file-source-selections.h \ + gth-metadata-provider-selections.c \ + gth-metadata-provider-selections.h \ + gth-selections-manager.c \ + gth-selections-manager.h \ + main.c + +libselections_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +libselections_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) +libselections_la_LIBADD = $(GTHUMB_LIBS) +libselections_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) + +extensioninidir = $(extensiondir) +extensionini_in_files = selections.extension.in.in +extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) + +@GTHUMB_EXTENSION_IN_RULE@ +@GTHUMB_EXTENSION_RULE@ + +EXTRA_DIST = $(extensionini_in_files) + +DISTCLEANFILES = $(extensionini_DATA) + +-include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/selections/Makefile.in gthumb-3.0.0/extensions/selections/Makefile.in --- gthumb-2.14.3/extensions/selections/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -0,0 +1,769 @@ +# Makefile.in generated by automake 1.11.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } +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 = extensions/selections +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gthumb.m4 $(top_srcdir)/m4/intltool.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)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(extensiondir)" \ + "$(DESTDIR)$(extensioninidir)" +LTLIBRARIES = $(extension_LTLIBRARIES) +am__DEPENDENCIES_1 = +am_libselections_la_OBJECTS = libselections_la-actions.lo \ + libselections_la-callbacks.lo \ + libselections_la-gth-file-source-selections.lo \ + libselections_la-gth-metadata-provider-selections.lo \ + libselections_la-gth-selections-manager.lo \ + libselections_la-main.lo +libselections_la_OBJECTS = $(am_libselections_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +libselections_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(libselections_la_CFLAGS) $(CFLAGS) \ + $(libselections_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +am__mv = mv -f +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +CCLD = $(CC) +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +SOURCES = $(libselections_la_SOURCES) +DIST_SOURCES = $(libselections_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +DATA = $(extensionini_DATA) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BISON = @BISON@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CLUTTER_CFLAGS = @CLUTTER_CFLAGS@ +CLUTTER_LIBS = @CLUTTER_LIBS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@ +DLLTOOL = @DLLTOOL@ +DOC_USER_FORMATS = @DOC_USER_FORMATS@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +EXIV2_CFLAGS = @EXIV2_CFLAGS@ +EXIV2_LIBS = @EXIV2_LIBS@ +EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ +FGREP = @FGREP@ +FLEX = @FLEX@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ +GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ +GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ +GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ +GSTREAMER_LIBS = @GSTREAMER_LIBS@ +GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ +GTHUMB_CFLAGS = @GTHUMB_CFLAGS@ +GTHUMB_EXTENSION_IN_RULE = @GTHUMB_EXTENSION_IN_RULE@ +GTHUMB_EXTENSION_RULE = @GTHUMB_EXTENSION_RULE@ +GTHUMB_IMPLIB = @GTHUMB_IMPLIB@ +GTHUMB_LIBS = @GTHUMB_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HELP_DIR = @HELP_DIR@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +JPEG_LIBS = @JPEG_LIBS@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBBRASERO_CFLAGS = @LIBBRASERO_CFLAGS@ +LIBBRASERO_LIBS = @LIBBRASERO_LIBS@ +LIBCHAMPLAIN_CFLAGS = @LIBCHAMPLAIN_CFLAGS@ +LIBCHAMPLAIN_LIBS = @LIBCHAMPLAIN_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ +LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ +LIBS = @LIBS@ +LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ +LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ +LIBSOUP_GNOME_LIBS = @LIBSOUP_GNOME_LIBS@ +LIBSOUP_LIBS = @LIBSOUP_LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +M_LIBS = @M_LIBS@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OMF_DIR = @OMF_DIR@ +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@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SMCLIENT_CFLAGS = @SMCLIENT_CFLAGS@ +SMCLIENT_LIBS = @SMCLIENT_LIBS@ +STRIP = @STRIP@ +TIFF_LIBS = @TIFF_LIBS@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +WARN_CFLAGS = @WARN_CFLAGS@ +WARN_CXXFLAGS = @WARN_CXXFLAGS@ +XGETTEXT = @XGETTEXT@ +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_CXX = @ac_ct_CXX@ +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@ +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@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +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@ +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@ +extensiondir = $(pkglibdir)/extensions +extension_LTLIBRARIES = libselections.la +libselections_la_SOURCES = \ + actions.c \ + actions.h \ + callbacks.c \ + callbacks.h \ + gth-file-source-selections.c \ + gth-file-source-selections.h \ + gth-metadata-provider-selections.c \ + gth-metadata-provider-selections.h \ + gth-selections-manager.c \ + gth-selections-manager.h \ + main.c + +libselections_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb +libselections_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) +libselections_la_LIBADD = $(GTHUMB_LIBS) +libselections_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) +extensioninidir = $(extensiondir) +extensionini_in_files = selections.extension.in.in +extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) +EXTRA_DIST = $(extensionini_in_files) +DISTCLEANFILES = $(extensionini_DATA) +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(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 extensions/selections/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign extensions/selections/Makefile +.PRECIOUS: 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): +install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ + } + +uninstall-extensionLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(extensiondir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(extensiondir)/$$f"; \ + done + +clean-extensionLTLIBRARIES: + -test -z "$(extension_LTLIBRARIES)" || rm -f $(extension_LTLIBRARIES) + @list='$(extension_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libselections.la: $(libselections_la_OBJECTS) $(libselections_la_DEPENDENCIES) $(EXTRA_libselections_la_DEPENDENCIES) + $(AM_V_CCLD)$(libselections_la_LINK) -rpath $(extensiondir) $(libselections_la_OBJECTS) $(libselections_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libselections_la-actions.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libselections_la-callbacks.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libselections_la-gth-file-source-selections.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libselections_la-gth-metadata-provider-selections.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libselections_la-gth-selections-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libselections_la-main.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< + +libselections_la-actions.lo: actions.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -MT libselections_la-actions.lo -MD -MP -MF $(DEPDIR)/libselections_la-actions.Tpo -c -o libselections_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libselections_la-actions.Tpo $(DEPDIR)/libselections_la-actions.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='actions.c' object='libselections_la-actions.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -c -o libselections_la-actions.lo `test -f 'actions.c' || echo '$(srcdir)/'`actions.c + +libselections_la-callbacks.lo: callbacks.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -MT libselections_la-callbacks.lo -MD -MP -MF $(DEPDIR)/libselections_la-callbacks.Tpo -c -o libselections_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libselections_la-callbacks.Tpo $(DEPDIR)/libselections_la-callbacks.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='callbacks.c' object='libselections_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -c -o libselections_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c + +libselections_la-gth-file-source-selections.lo: gth-file-source-selections.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -MT libselections_la-gth-file-source-selections.lo -MD -MP -MF $(DEPDIR)/libselections_la-gth-file-source-selections.Tpo -c -o libselections_la-gth-file-source-selections.lo `test -f 'gth-file-source-selections.c' || echo '$(srcdir)/'`gth-file-source-selections.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libselections_la-gth-file-source-selections.Tpo $(DEPDIR)/libselections_la-gth-file-source-selections.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-file-source-selections.c' object='libselections_la-gth-file-source-selections.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -c -o libselections_la-gth-file-source-selections.lo `test -f 'gth-file-source-selections.c' || echo '$(srcdir)/'`gth-file-source-selections.c + +libselections_la-gth-metadata-provider-selections.lo: gth-metadata-provider-selections.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -MT libselections_la-gth-metadata-provider-selections.lo -MD -MP -MF $(DEPDIR)/libselections_la-gth-metadata-provider-selections.Tpo -c -o libselections_la-gth-metadata-provider-selections.lo `test -f 'gth-metadata-provider-selections.c' || echo '$(srcdir)/'`gth-metadata-provider-selections.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libselections_la-gth-metadata-provider-selections.Tpo $(DEPDIR)/libselections_la-gth-metadata-provider-selections.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-metadata-provider-selections.c' object='libselections_la-gth-metadata-provider-selections.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -c -o libselections_la-gth-metadata-provider-selections.lo `test -f 'gth-metadata-provider-selections.c' || echo '$(srcdir)/'`gth-metadata-provider-selections.c + +libselections_la-gth-selections-manager.lo: gth-selections-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -MT libselections_la-gth-selections-manager.lo -MD -MP -MF $(DEPDIR)/libselections_la-gth-selections-manager.Tpo -c -o libselections_la-gth-selections-manager.lo `test -f 'gth-selections-manager.c' || echo '$(srcdir)/'`gth-selections-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libselections_la-gth-selections-manager.Tpo $(DEPDIR)/libselections_la-gth-selections-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-selections-manager.c' object='libselections_la-gth-selections-manager.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -c -o libselections_la-gth-selections-manager.lo `test -f 'gth-selections-manager.c' || echo '$(srcdir)/'`gth-selections-manager.c + +libselections_la-main.lo: main.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -MT libselections_la-main.lo -MD -MP -MF $(DEPDIR)/libselections_la-main.Tpo -c -o libselections_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libselections_la-main.Tpo $(DEPDIR)/libselections_la-main.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='libselections_la-main.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libselections_la_CFLAGS) $(CFLAGS) -c -o libselections_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +install-extensioniniDATA: $(extensionini_DATA) + @$(NORMAL_INSTALL) + @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(extensioninidir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(extensioninidir)" || exit $$?; \ + done + +uninstall-extensioniniDATA: + @$(NORMAL_UNINSTALL) + @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(extensioninidir)'; $(am__uninstall_files_from_dir) + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + set x; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +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 $(LTLIBRARIES) $(DATA) +installdirs: + for dir in "$(DESTDIR)$(extensiondir)" "$(DESTDIR)$(extensioninidir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +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) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +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-extensionLTLIBRARIES clean-generic clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: install-extensionLTLIBRARIES install-extensioniniDATA + +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 -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-extensionLTLIBRARIES \ + uninstall-extensioniniDATA + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-extensionLTLIBRARIES clean-generic clean-libtool ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags 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-extensionLTLIBRARIES \ + install-extensioniniDATA 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-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-extensionLTLIBRARIES \ + uninstall-extensioniniDATA + + +@GTHUMB_EXTENSION_IN_RULE@ +@GTHUMB_EXTENSION_RULE@ + +-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 -Nru gthumb-2.14.3/extensions/selections/selections.extension.in.in gthumb-3.0.0/extensions/selections/selections.extension.in.in --- gthumb-2.14.3/extensions/selections/selections.extension.in.in 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/extensions/selections/selections.extension.in.in 2012-04-21 09:21:04.000000000 +0000 @@ -0,0 +1,14 @@ +[Extension] +_Name=Selections +_Description=Advanced file selection. +_Authors=gthumb development team +Copyright=Copyright © 2008-2012 The Free Software Foundation, Inc. +Version=%VERSION% +Icon=selection +URL=http://live.gnome.org/gthumb +Category=Browser + +[Loader] +Type=module +File=%LIBRARY% +API=%GTHUMB_API_VERSION% diff -Nru gthumb-2.14.3/extensions/slideshow/actions.c gthumb-3.0.0/extensions/slideshow/actions.c --- gthumb-2.14.3/extensions/slideshow/actions.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/actions.c 2012-02-19 15:01:32.000000000 +0000 @@ -32,6 +32,7 @@ gth_browser_activate_action_view_slideshow (GtkAction *action, GthBrowser *browser) { + GSettings *settings; GList *items; GList *file_list; GList *filtered_list; @@ -64,16 +65,18 @@ return; } + settings = g_settings_new (GTHUMB_SLIDESHOW_SCHEMA); + location = gth_browser_get_location_data (browser); if (g_file_info_get_attribute_boolean (location->info, "slideshow::personalize")) transition_id = g_strdup (g_file_info_get_attribute_string (location->info, "slideshow::transition")); else - transition_id = eel_gconf_get_string (PREF_SLIDESHOW_TRANSITION, DEFAULT_TRANSITION); + transition_id = g_settings_get_string (settings, PREF_SLIDESHOW_TRANSITION); projector = NULL; #ifdef HAVE_CLUTTER - if (ClutterInitResult == CLUTTER_INIT_SUCCESS) + if (gtk_clutter_init (NULL, NULL) == CLUTTER_INIT_SUCCESS) projector = &clutter_projector; #endif /* HAVE_CLUTTER */ @@ -89,10 +92,10 @@ gth_slideshow_set_random_order (GTH_SLIDESHOW (slideshow), g_file_info_get_attribute_boolean (location->info, "slideshow::random-order")); } else { - gth_slideshow_set_delay (GTH_SLIDESHOW (slideshow), (guint) (1000.0 * eel_gconf_get_float (PREF_SLIDESHOW_CHANGE_DELAY, 5.0))); - gth_slideshow_set_automatic (GTH_SLIDESHOW (slideshow), eel_gconf_get_boolean (PREF_SLIDESHOW_AUTOMATIC, TRUE)); - gth_slideshow_set_wrap_around (GTH_SLIDESHOW (slideshow), eel_gconf_get_boolean (PREF_SLIDESHOW_WRAP_AROUND, FALSE)); - gth_slideshow_set_random_order (GTH_SLIDESHOW (slideshow), eel_gconf_get_boolean (PREF_SLIDESHOW_RANDOM_ORDER, FALSE)); + gth_slideshow_set_delay (GTH_SLIDESHOW (slideshow), (guint) (1000.0 * g_settings_get_double (settings, PREF_SLIDESHOW_CHANGE_DELAY))); + gth_slideshow_set_automatic (GTH_SLIDESHOW (slideshow), g_settings_get_boolean (settings, PREF_SLIDESHOW_AUTOMATIC)); + gth_slideshow_set_wrap_around (GTH_SLIDESHOW (slideshow), g_settings_get_boolean (settings, PREF_SLIDESHOW_WRAP_AROUND)); + gth_slideshow_set_random_order (GTH_SLIDESHOW (slideshow), g_settings_get_boolean (settings, PREF_SLIDESHOW_RANDOM_ORDER)); } if (g_file_info_get_attribute_status (location->info, "slideshow::playlist") == G_FILE_ATTRIBUTE_STATUS_SET) @@ -129,6 +132,7 @@ gtk_window_present (GTK_WINDOW (slideshow)); _g_object_list_unref (transitions); + g_object_unref (settings); g_free (transition_id); _g_object_list_unref (filtered_list); _g_object_list_unref (file_list); diff -Nru gthumb-2.14.3/extensions/slideshow/callbacks.c gthumb-3.0.0/extensions/slideshow/callbacks.c --- gthumb-2.14.3/extensions/slideshow/callbacks.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/callbacks.c 2012-02-19 15:01:32.000000000 +0000 @@ -368,17 +368,20 @@ if (! g_value_hash_is_set (catalog->attributes, "slideshow::personalize") || ! g_value_hash_get_boolean (catalog->attributes, "slideshow::personalize")) { - char *current_transition; + GSettings *settings; + char *current_transition; - current_transition = eel_gconf_get_string (PREF_SLIDESHOW_TRANSITION, DEFAULT_TRANSITION); + settings = g_settings_new (GTHUMB_SLIDESHOW_SCHEMA); + current_transition = g_settings_get_string (settings, PREF_SLIDESHOW_TRANSITION); slideshow_preferences = gth_slideshow_preferences_new (current_transition, - eel_gconf_get_boolean (PREF_SLIDESHOW_AUTOMATIC, TRUE), - (int) (1000.0 * eel_gconf_get_float (PREF_SLIDESHOW_CHANGE_DELAY, 5.0)), - eel_gconf_get_boolean (PREF_SLIDESHOW_WRAP_AROUND, FALSE), - eel_gconf_get_boolean (PREF_SLIDESHOW_RANDOM_ORDER, FALSE)); + g_settings_get_boolean (settings, PREF_SLIDESHOW_AUTOMATIC), + (int) (1000.0 * g_settings_get_double (settings, PREF_SLIDESHOW_CHANGE_DELAY)), + g_settings_get_boolean (settings, PREF_SLIDESHOW_WRAP_AROUND), + g_settings_get_boolean (settings, PREF_SLIDESHOW_RANDOM_ORDER)); gtk_widget_set_sensitive (gth_slideshow_preferences_get_widget (GTH_SLIDESHOW_PREFERENCES (slideshow_preferences), "personalize_box"), FALSE); g_free (current_transition); + g_object_unref (settings); } else { slideshow_preferences = gth_slideshow_preferences_new (g_value_hash_get_string (catalog->attributes, "slideshow::transition"), @@ -394,6 +397,7 @@ gth_slideshow_preferences_set_audio (GTH_SLIDESHOW_PREFERENCES (slideshow_preferences), g_value_hash_get_stringv (catalog->attributes, "slideshow::playlist")); + gtk_container_set_border_width (GTK_CONTAINER (slideshow_preferences), 12); gtk_widget_show (gth_slideshow_preferences_get_widget (GTH_SLIDESHOW_PREFERENCES (slideshow_preferences), "personalize_checkbutton")); gtk_widget_hide (gth_slideshow_preferences_get_widget (GTH_SLIDESHOW_PREFERENCES (slideshow_preferences), "slideshow_label")); gtk_widget_show (gth_slideshow_preferences_get_widget (GTH_SLIDESHOW_PREFERENCES (slideshow_preferences), "playlist_box")); diff -Nru gthumb-2.14.3/extensions/slideshow/data/gthumb-slideshow.schemas.in gthumb-3.0.0/extensions/slideshow/data/gthumb-slideshow.schemas.in --- gthumb-2.14.3/extensions/slideshow/data/gthumb-slideshow.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/data/gthumb-slideshow.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/slideshow/change_delay - /apps/gthumb/ext/slideshow/change_delay - gthumb - float - 4.0 - - - - - - - - - /schemas/apps/gthumb/ext/slideshow/wrap_around - /apps/gthumb/ext/slideshow/wrap_around - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/ext/slideshow/automatic - /apps/gthumb/ext/slideshow/automatic - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ext/slideshow/transition - /apps/gthumb/ext/slideshow/transition - gthumb - string - fade-in - - - - - - - - - /schemas/apps/gthumb/ext/slideshow/random-order - /apps/gthumb/ext/slideshow/random-order - gthumb - bool - false - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/slideshow/data/Makefile.am gthumb-3.0.0/extensions/slideshow/data/Makefile.am --- gthumb-2.14.3/extensions/slideshow/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-slideshow.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/slideshow/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/slideshow/data/Makefile.in gthumb-3.0.0/extensions/slideshow/data/Makefile.in --- gthumb-2.14.3/extensions/slideshow/data/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/data/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb-slideshow.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/slideshow/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/slideshow/data/ui/Makefile.in gthumb-3.0.0/extensions/slideshow/data/ui/Makefile.in --- gthumb-2.14.3/extensions/slideshow/data/ui/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/data/ui/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/slideshow/data/ui/slideshow-preferences.ui gthumb-3.0.0/extensions/slideshow/data/ui/slideshow-preferences.ui --- gthumb-2.14.3/extensions/slideshow/data/ui/slideshow-preferences.ui 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/data/ui/slideshow-preferences.ui 2012-03-31 09:42:32.000000000 +0000 @@ -1,11 +1,10 @@ - + - - 5 0.10000000000000001 100 + 5 0.10000000000000001 @@ -20,26 +19,30 @@ True - 12 - vertical + False 12 True - vertical + False 6 True - vertical + False + False True False + False + 0 True True + False + 0 _Personalize True @@ -49,12 +52,15 @@ + False + True 0 True + False 0 Slideshow @@ -62,35 +68,43 @@ + False + True 1 + False + True 0 True + False 12 True - vertical + False 6 True + False 6 True + False _Transition effect: True False + True 0 @@ -107,50 +121,60 @@ True + False 6 _Change automatically, every + False True True False + False True True False + True 0 True + False 6 True True - + delay_adjustment 1 False + True 0 True + False seconds False + True 1 + False + True 1 @@ -164,10 +188,13 @@ _Restart when finished + False True True False + False True + 0 True @@ -179,13 +206,18 @@ R_andom order + False True True False + False True + 0 True + False + True 3 @@ -194,22 +226,25 @@ False + True 1 False + True 0 - vertical + False 6 True + False 0 Playlist @@ -218,28 +253,29 @@ False + True 0 True + False 12 True - vertical + False 6 True + False 6 True True - automatic - automatic in @@ -249,6 +285,9 @@ False True 1 + + + @@ -269,58 +308,71 @@ + True + True 0 True - vertical + False 6 + False True True True Add files to the playlist + False True + False gtk-add False + True 0 + False True True True Remove the selected files + False True + False gtk-remove False + True 1 False + True 1 + True + True 0 @@ -328,11 +380,15 @@ + True + True 1 + True + True 1 diff -Nru gthumb-2.14.3/extensions/slideshow/gth-slideshow.c gthumb-3.0.0/extensions/slideshow/gth-slideshow.c --- gthumb-2.14.3/extensions/slideshow/gth-slideshow.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/gth-slideshow.c 2012-02-19 15:01:32.000000000 +0000 @@ -38,6 +38,9 @@ #define DEFAULT_DELAY 2000 +G_DEFINE_TYPE (GthSlideshow, gth_slideshow, GTK_TYPE_WINDOW) + + typedef enum { GTH_SLIDESHOW_DIRECTION_FORWARD, GTH_SLIDESHOW_DIRECTION_BACKWARD @@ -88,9 +91,6 @@ }; -static gpointer parent_class = NULL; - - static void _gth_slideshow_close (GthSlideshow *self) { @@ -269,35 +269,6 @@ static void -gth_slideshow_init (GthSlideshow *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_SLIDESHOW, GthSlideshowPrivate); - self->priv->file_list = NULL; - self->priv->next_event = 0; - self->priv->delay = DEFAULT_DELAY; - self->priv->automatic = FALSE; - self->priv->wrap_around = FALSE; - self->priv->transitions = NULL; - self->priv->n_transitions = 0; - self->priv->rand = g_rand_new (); - self->priv->first_show = TRUE; - self->priv->audio_files = NULL; - self->priv->paused = FALSE; - self->priv->animating = FALSE; - self->priv->direction = GTH_SLIDESHOW_DIRECTION_FORWARD; - self->priv->random_order = FALSE; - self->priv->current_pixbuf = NULL; - self->priv->screensaver = gth_screensaver_new (NULL); - - self->priv->preloader = gth_image_preloader_new (GTH_LOAD_POLICY_ONE_STEP, 3); - g_signal_connect (self->priv->preloader, - "requested_ready", - G_CALLBACK (image_preloader_requested_ready_cb), - self); -} - - -static void gth_slideshow_finalize (GObject *object) { GthSlideshow *self = GTH_SLIDESHOW (object); @@ -329,7 +300,7 @@ g_object_unref (self->priv->screensaver); } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_slideshow_parent_class)->finalize (object); } @@ -338,7 +309,6 @@ { GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthSlideshowPrivate)); gobject_class = G_OBJECT_CLASS (klass); @@ -346,34 +316,6 @@ } -GType -gth_slideshow_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthSlideshowClass), - NULL, - NULL, - (GClassInitFunc) gth_slideshow_class_init, - NULL, - NULL, - sizeof (GthSlideshow), - 0, - (GInstanceInitFunc) gth_slideshow_init - }; - - type = g_type_register_static (GTK_TYPE_WINDOW, - "GthSlideshow", - &type_info, - 0); - } - - return type; -} - - static gboolean hide_cursor_cb (gpointer data) { @@ -467,6 +409,35 @@ static void +gth_slideshow_init (GthSlideshow *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_SLIDESHOW, GthSlideshowPrivate); + self->priv->file_list = NULL; + self->priv->next_event = 0; + self->priv->delay = DEFAULT_DELAY; + self->priv->automatic = FALSE; + self->priv->wrap_around = FALSE; + self->priv->transitions = NULL; + self->priv->n_transitions = 0; + self->priv->rand = g_rand_new (); + self->priv->first_show = TRUE; + self->priv->audio_files = NULL; + self->priv->paused = FALSE; + self->priv->animating = FALSE; + self->priv->direction = GTH_SLIDESHOW_DIRECTION_FORWARD; + self->priv->random_order = FALSE; + self->priv->current_pixbuf = NULL; + self->priv->screensaver = gth_screensaver_new (NULL); + + self->priv->preloader = gth_image_preloader_new (GTH_LOAD_POLICY_ONE_STEP, 3); + g_signal_connect (self->priv->preloader, + "requested_ready", + G_CALLBACK (image_preloader_requested_ready_cb), + self); +} + + +static void _gth_slideshow_construct (GthSlideshow *self, GthProjector *projector, GthBrowser *browser, @@ -641,35 +612,35 @@ } else if (event->type == GDK_KEY_PRESS) { switch (((GdkEventKey *) event)->keyval) { - case GDK_F5: + case GDK_KEY_F5: _gth_slideshow_close (self); break; } } else if (event->type == GDK_KEY_RELEASE) { switch (((GdkEventKey *) event)->keyval) { - case GDK_Escape: - case GDK_q: + case GDK_KEY_Escape: + case GDK_KEY_q: _gth_slideshow_close (self); break; - case GDK_p: + case GDK_KEY_p: _gth_slideshow_toggle_pause (self); break; - case GDK_space: - case GDK_Down: - case GDK_Right: - case GDK_Page_Down: + case GDK_KEY_space: + case GDK_KEY_Down: + case GDK_KEY_Right: + case GDK_KEY_Page_Down: if (self->priv->paused) _gth_slideshow_toggle_pause (self); else _gth_slideshow_load_next_image (self); break; - case GDK_BackSpace: - case GDK_Up: - case GDK_Left: - case GDK_Page_Up: + case GDK_KEY_BackSpace: + case GDK_KEY_Up: + case GDK_KEY_Left: + case GDK_KEY_Page_Up: _gth_slideshow_load_prev_image (self); break; } @@ -694,7 +665,6 @@ static void default_projector_pause_painter (GthImageViewer *image_viewer, - GdkEventExpose *event, cairo_t *cr, gpointer user_data) { @@ -964,7 +934,7 @@ texture = self->priv->image1; else texture = self->priv->image2; - gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), image, NULL); + gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE (texture), image, NULL); self->next_geometry.x = 0; self->next_geometry.y = 0; @@ -1147,7 +1117,7 @@ texture = self->priv->image1; else texture = self->priv->image2; - gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), image, NULL); + gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE (texture), image, NULL); self->current_geometry.x = 0; self->current_geometry.y = 0; @@ -1185,11 +1155,11 @@ g_signal_connect (self->stage, "key-press-event", G_CALLBACK (stage_input_cb), self); g_signal_connect (self->stage, "key-release-event", G_CALLBACK (stage_input_cb), self); - self->priv->image1 = clutter_texture_new (); + self->priv->image1 = gtk_clutter_texture_new (); clutter_actor_hide (self->priv->image1); clutter_container_add_actor (CLUTTER_CONTAINER (self->stage), self->priv->image1); - self->priv->image2 = clutter_texture_new (); + self->priv->image2 = gtk_clutter_texture_new (); clutter_actor_hide (self->priv->image2); clutter_container_add_actor (CLUTTER_CONTAINER (self->stage), self->priv->image2); @@ -1203,12 +1173,17 @@ self->priv->alpha = clutter_alpha_new_full (self->priv->timeline, CLUTTER_EASE_IN_OUT_SINE); + self->priv->paused_actor = gtk_clutter_texture_new (); if (self->priv->pause_pixbuf != NULL) - self->priv->paused_actor = gtk_clutter_texture_new_from_pixbuf (self->priv->pause_pixbuf); + gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE (self->priv->paused_actor), + self->priv->pause_pixbuf, + NULL); else - self->priv->paused_actor = gtk_clutter_texture_new_from_stock (GTK_WIDGET (self), - GTK_STOCK_MEDIA_PAUSE, - GTK_ICON_SIZE_DIALOG); + gtk_clutter_texture_set_from_stock (GTK_CLUTTER_TEXTURE (self->priv->paused_actor), + GTK_WIDGET (self), + GTK_STOCK_MEDIA_PAUSE, + GTK_ICON_SIZE_DIALOG, + NULL); clutter_actor_hide (self->priv->paused_actor); clutter_container_add_actor (CLUTTER_CONTAINER (self->stage), self->priv->paused_actor); diff -Nru gthumb-2.14.3/extensions/slideshow/gth-slideshow-preferences.c gthumb-3.0.0/extensions/slideshow/gth-slideshow-preferences.c --- gthumb-2.14.3/extensions/slideshow/gth-slideshow-preferences.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/gth-slideshow-preferences.c 2012-03-06 15:26:06.000000000 +0000 @@ -25,6 +25,9 @@ #include "gth-transition.h" +G_DEFINE_TYPE (GthSlideshowPreferences, gth_slideshow_preferences, GTK_TYPE_BOX) + + enum { TRANSITION_COLUMN_ID, TRANSITION_COLUMN_DISPLAY_NAME @@ -44,25 +47,13 @@ }; -static gpointer parent_class = NULL; - - -static void -gth_slideshow_preferences_init (GthSlideshowPreferences *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_SLIDESHOW_PREFERENCES, GthSlideshowPreferencesPrivate); - self->priv->builder = NULL; -} - - static void gth_slideshow_preferences_finalize (GObject *object) { GthSlideshowPreferences *self = GTH_SLIDESHOW_PREFERENCES (object); g_object_unref (self->priv->builder); - - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_slideshow_preferences_parent_class)->finalize (object); } @@ -71,7 +62,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthSlideshowPreferencesPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -79,35 +69,15 @@ } -GType -gth_slideshow_preferences_get_type (void) +static void +gth_slideshow_preferences_init (GthSlideshowPreferences *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthSlideshowPreferencesClass), - NULL, - NULL, - (GClassInitFunc) gth_slideshow_preferences_class_init, - NULL, - NULL, - sizeof (GthSlideshowPreferences), - 0, - (GInstanceInitFunc) gth_slideshow_preferences_init - }; - - type = g_type_register_static (GTK_TYPE_VBOX, - "GthSlideshowPreferences", - &type_info, - 0); - } - - return type; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_SLIDESHOW_PREFERENCES, GthSlideshowPreferencesPrivate); + self->priv->builder = NULL; + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL); } - static void personalize_checkbutton_toggled_cb (GtkToggleButton *button, gpointer user_data) diff -Nru gthumb-2.14.3/extensions/slideshow/gth-slideshow-preferences.h gthumb-3.0.0/extensions/slideshow/gth-slideshow-preferences.h --- gthumb-2.14.3/extensions/slideshow/gth-slideshow-preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/gth-slideshow-preferences.h 2012-03-06 15:26:06.000000000 +0000 @@ -39,13 +39,13 @@ struct _GthSlideshowPreferences { - GtkVBox __parent; + GtkBox __parent; GthSlideshowPreferencesPrivate *priv; }; struct _GthSlideshowPreferencesClass { - GtkVBoxClass __parent_class; + GtkBoxClass __parent_class; }; GType gth_slideshow_preferences_get_type (void); diff -Nru gthumb-2.14.3/extensions/slideshow/gth-transition.c gthumb-3.0.0/extensions/slideshow/gth-transition.c --- gthumb-2.14.3/extensions/slideshow/gth-transition.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/gth-transition.c 2012-02-19 15:01:32.000000000 +0000 @@ -23,6 +23,9 @@ #include "gth-transition.h" +G_DEFINE_TYPE (GthTransition, gth_transition, G_TYPE_OBJECT) + + /* Properties */ enum { PROP_0, @@ -39,19 +42,6 @@ }; -static gpointer parent_class = NULL; - - -static void -gth_transition_init (GthTransition *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TRANSITION, GthTransitionPrivate); - self->priv->id = g_strdup (""); - self->priv->display_name = g_strdup (""); - self->priv->frame_func = NULL; -} - - static void gth_transition_finalize (GObject *object) { @@ -60,7 +50,7 @@ g_free (self->priv->id); g_free (self->priv->display_name); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_transition_parent_class)->finalize (object); } @@ -129,7 +119,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthTransitionPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -160,31 +149,13 @@ } -GType -gth_transition_get_type (void) +static void +gth_transition_init (GthTransition *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTransitionClass), - NULL, - NULL, - (GClassInitFunc) gth_transition_class_init, - NULL, - NULL, - sizeof (GthTransition), - 0, - (GInstanceInitFunc) gth_transition_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthTransition", - &type_info, - 0); - } - - return type; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TRANSITION, GthTransitionPrivate); + self->priv->id = g_strdup (""); + self->priv->display_name = g_strdup (""); + self->priv->frame_func = NULL; } diff -Nru gthumb-2.14.3/extensions/slideshow/Makefile.in gthumb-3.0.0/extensions/slideshow/Makefile.in --- gthumb-2.14.3/extensions/slideshow/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -129,6 +146,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -208,10 +230,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -219,6 +239,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -258,6 +279,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -306,8 +329,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -338,6 +359,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -432,7 +454,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -440,6 +461,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -555,8 +578,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -739,13 +765,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/slideshow/preferences.c gthumb-3.0.0/extensions/slideshow/preferences.c --- gthumb-2.14.3/extensions/slideshow/preferences.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/preferences.c 2012-02-19 15:01:32.000000000 +0000 @@ -31,6 +31,7 @@ typedef struct { + GSettings *settings; GtkWidget *preferences_page; } BrowserData; @@ -38,6 +39,7 @@ static void browser_data_free (BrowserData *data) { + g_object_unref (data->settings); g_free (data); } @@ -50,7 +52,7 @@ transition_id = gth_slideshow_preferences_get_transition_id (GTH_SLIDESHOW_PREFERENCES (data->preferences_page)); if (transition_id != NULL) - eel_gconf_set_string (PREF_SLIDESHOW_TRANSITION, transition_id); + g_settings_set_string (data->settings, PREF_SLIDESHOW_TRANSITION, transition_id); g_free (transition_id); } @@ -60,7 +62,7 @@ automatic_checkbutton_toggled_cb (GtkToggleButton *button, BrowserData *data) { - eel_gconf_set_boolean (PREF_SLIDESHOW_AUTOMATIC, gtk_toggle_button_get_active (button)); + g_settings_set_boolean (data->settings, PREF_SLIDESHOW_AUTOMATIC, gtk_toggle_button_get_active (button)); } @@ -68,7 +70,7 @@ wrap_around_checkbutton_toggled_cb (GtkToggleButton *button, BrowserData *data) { - eel_gconf_set_boolean (PREF_SLIDESHOW_WRAP_AROUND, gtk_toggle_button_get_active (button)); + g_settings_set_boolean (data->settings, PREF_SLIDESHOW_WRAP_AROUND, gtk_toggle_button_get_active (button)); } @@ -76,7 +78,7 @@ random_order_checkbutton_toggled_cb (GtkToggleButton *button, BrowserData *data) { - eel_gconf_set_boolean (PREF_SLIDESHOW_RANDOM_ORDER, gtk_toggle_button_get_active (button)); + g_settings_set_boolean (data->settings, PREF_SLIDESHOW_RANDOM_ORDER, gtk_toggle_button_get_active (button)); } @@ -84,7 +86,7 @@ change_delay_spinbutton_value_changed_cb (GtkSpinButton *spinbutton, BrowserData *data) { - eel_gconf_set_float (PREF_SLIDESHOW_CHANGE_DELAY, gtk_spin_button_get_value (spinbutton)); + g_settings_set_double (data->settings, PREF_SLIDESHOW_CHANGE_DELAY, gtk_spin_button_get_value (spinbutton)); } @@ -96,17 +98,19 @@ BrowserData *data; GtkWidget *notebook; char *current_transition; - GtkWidget *label; + gboolean image_viewer_page_found; notebook = _gtk_builder_get_widget (dialog_builder, "notebook"); data = g_new0 (BrowserData, 1); - current_transition = eel_gconf_get_string (PREF_SLIDESHOW_TRANSITION, DEFAULT_TRANSITION); + data->settings = g_settings_new (GTHUMB_SLIDESHOW_SCHEMA); + + current_transition = g_settings_get_string (data->settings, PREF_SLIDESHOW_TRANSITION); data->preferences_page = gth_slideshow_preferences_new (current_transition, - eel_gconf_get_boolean (PREF_SLIDESHOW_AUTOMATIC, TRUE), - (int) (1000.0 * eel_gconf_get_float (PREF_SLIDESHOW_CHANGE_DELAY, 5.0)), - eel_gconf_get_boolean (PREF_SLIDESHOW_WRAP_AROUND, FALSE), - eel_gconf_get_boolean (PREF_SLIDESHOW_RANDOM_ORDER, FALSE)); + g_settings_get_boolean (data->settings, PREF_SLIDESHOW_AUTOMATIC), + (int) (1000.0 * g_settings_get_double (data->settings, PREF_SLIDESHOW_CHANGE_DELAY)), + g_settings_get_boolean (data->settings, PREF_SLIDESHOW_WRAP_AROUND), + g_settings_get_boolean (data->settings, PREF_SLIDESHOW_RANDOM_ORDER)); gtk_widget_show (data->preferences_page); g_free (current_transition); @@ -135,10 +139,30 @@ G_CALLBACK (change_delay_spinbutton_value_changed_cb), data); - label = gtk_label_new (_("Slideshow")); - gtk_widget_show (label); - - gtk_notebook_append_page (GTK_NOTEBOOK (notebook), data->preferences_page, label); + image_viewer_page_found = FALSE; + if (gth_main_extension_is_active ("image_viewer")) { + GList *children; + GList *scan; + + children = gtk_container_get_children (GTK_CONTAINER (gtk_builder_get_object (dialog_builder, "notebook"))); + for (scan = children; scan; scan = scan->next) { + GtkWidget *page = scan->data; + + if (g_strcmp0 (g_object_get_data (G_OBJECT (page), "extension-name"), "image_viewer") == 0) { + image_viewer_page_found = TRUE; + gtk_widget_set_vexpand (data->preferences_page, FALSE); + gtk_box_pack_start (GTK_BOX (page), data->preferences_page, FALSE, FALSE, 0); + } + } + } + + if (! image_viewer_page_found) { /* add the preferences in an ad-hoc page */ + GtkWidget *label; + + label = gtk_label_new (_("Slideshow")); + gtk_widget_show (label); + gtk_notebook_append_page (GTK_NOTEBOOK (notebook), data->preferences_page, label); + } g_object_set_data_full (G_OBJECT (dialog), BROWSER_DATA_KEY, data, (GDestroyNotify) browser_data_free); } diff -Nru gthumb-2.14.3/extensions/slideshow/preferences.h gthumb-3.0.0/extensions/slideshow/preferences.h --- gthumb-2.14.3/extensions/slideshow/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -24,11 +24,17 @@ #include -#define PREF_SLIDESHOW_CHANGE_DELAY "/apps/gthumb/ext/slideshow/change_delay" -#define PREF_SLIDESHOW_WRAP_AROUND "/apps/gthumb/ext/slideshow/wrap_around" -#define PREF_SLIDESHOW_AUTOMATIC "/apps/gthumb/ext/slideshow/automatic" -#define PREF_SLIDESHOW_TRANSITION "/apps/gthumb/ext/slideshow/transition" -#define PREF_SLIDESHOW_RANDOM_ORDER "/apps/gthumb/ext/slideshow/random-order" +/* schema */ + +#define GTHUMB_SLIDESHOW_SCHEMA GTHUMB_SCHEMA ".slideshow" + +/* keys */ + +#define PREF_SLIDESHOW_CHANGE_DELAY "change-delay" +#define PREF_SLIDESHOW_WRAP_AROUND "wrap-around" +#define PREF_SLIDESHOW_AUTOMATIC "automatic" +#define PREF_SLIDESHOW_TRANSITION "transition" +#define PREF_SLIDESHOW_RANDOM_ORDER "random-order" #define DEFAULT_TRANSITION "random" diff -Nru gthumb-2.14.3/extensions/slideshow/slideshow.extension.in.in gthumb-3.0.0/extensions/slideshow/slideshow.extension.in.in --- gthumb-2.14.3/extensions/slideshow/slideshow.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/slideshow/slideshow.extension.in.in 2012-04-21 09:21:16.000000000 +0000 @@ -10,4 +10,5 @@ [Loader] Type=module File=%LIBRARY% -After=catalogs \ No newline at end of file +API=%GTHUMB_API_VERSION% +After=catalogs;image_viewer diff -Nru gthumb-2.14.3/extensions/webalbums/albumtheme.c gthumb-3.0.0/extensions/webalbums/albumtheme.c --- gthumb-2.14.3/extensions/webalbums/albumtheme.c 2011-11-04 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/albumtheme.c 2012-04-23 17:55:31.000000000 +0000 @@ -74,7 +74,7 @@ /* Copy the first part of user declarations. */ /* Line 268 of yacc.c */ -#line 1 "albumtheme.y" +#line 1 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" /* * GThumb @@ -103,7 +103,7 @@ #include "albumtheme-private.h" int gth_albumtheme_yylex (); -void gth_albumtheme_yyerror (char *fmt, ...); +void gth_albumtheme_yyerror (const char *fmt, ...); int gth_albumtheme_yywrap (void); #define YY_NO_UNPUT @@ -168,7 +168,7 @@ { /* Line 293 of yacc.c */ -#line 37 "albumtheme.y" +#line 37 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" char *text; int ivalue; @@ -1526,7 +1526,7 @@ case 2: /* Line 1806 of yacc.c */ -#line 77 "albumtheme.y" +#line 77 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { yy_parsed_doc = (yyvsp[(1) - (1)].list); if (yy_parsed_doc == NULL) @@ -1539,7 +1539,7 @@ case 3: /* Line 1806 of yacc.c */ -#line 86 "albumtheme.y" +#line 86 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend ((yyvsp[(2) - (2)].list), gth_tag_new_html ((yyvsp[(1) - (2)].text))); g_free ((yyvsp[(1) - (2)].text)); @@ -1549,7 +1549,7 @@ case 4: /* Line 1806 of yacc.c */ -#line 91 "albumtheme.y" +#line 91 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend ((yyvsp[(2) - (2)].list), (yyvsp[(1) - (2)].tag)); } @@ -1558,7 +1558,7 @@ case 5: /* Line 1806 of yacc.c */ -#line 95 "albumtheme.y" +#line 95 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend ((yyvsp[(2) - (2)].list), (yyvsp[(1) - (2)].tag)); } @@ -1567,7 +1567,7 @@ case 6: /* Line 1806 of yacc.c */ -#line 99 "albumtheme.y" +#line 99 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthTag *tag; @@ -1580,7 +1580,7 @@ case 7: /* Line 1806 of yacc.c */ -#line 107 "albumtheme.y" +#line 107 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GList *cond_list; GthTag *tag; @@ -1598,7 +1598,7 @@ case 8: /* Line 1806 of yacc.c */ -#line 120 "albumtheme.y" +#line 120 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.list) = NULL; } @@ -1607,7 +1607,7 @@ case 9: /* Line 1806 of yacc.c */ -#line 124 "albumtheme.y" +#line 124 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { /*if ($2 != NULL) gth_parsed_doc_free ($2);*/ @@ -1618,7 +1618,7 @@ case 10: /* Line 1806 of yacc.c */ -#line 131 "albumtheme.y" +#line 131 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { if (g_str_equal ((yyvsp[(2) - (3)].text), "thumbnail_caption")) { (yyval.loop) = gth_loop_new (GTH_TAG_FOR_EACH_THUMBNAIL_CAPTION); @@ -1636,7 +1636,7 @@ case 11: /* Line 1806 of yacc.c */ -#line 144 "albumtheme.y" +#line 144 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.loop) = gth_range_loop_new (); gth_range_loop_set_range (GTH_RANGE_LOOP ((yyval.loop)), (yyvsp[(2) - (7)].text), (yyvsp[(4) - (7)].expr), (yyvsp[(6) - (7)].expr)); @@ -1650,7 +1650,7 @@ case 12: /* Line 1806 of yacc.c */ -#line 154 "albumtheme.y" +#line 154 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.cond) = gth_condition_new ((yyvsp[(2) - (3)].expr)); } @@ -1659,7 +1659,7 @@ case 13: /* Line 1806 of yacc.c */ -#line 158 "albumtheme.y" +#line 158 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.cond) = gth_condition_new ((yyvsp[(3) - (5)].expr)); } @@ -1668,7 +1668,7 @@ case 14: /* Line 1806 of yacc.c */ -#line 163 "albumtheme.y" +#line 163 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { gth_condition_add_document ((yyvsp[(1) - (3)].cond), (yyvsp[(2) - (3)].list)); (yyval.list) = g_list_prepend ((yyvsp[(3) - (3)].list), (yyvsp[(1) - (3)].cond)); @@ -1678,7 +1678,7 @@ case 15: /* Line 1806 of yacc.c */ -#line 168 "albumtheme.y" +#line 168 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.list) = NULL; } @@ -1687,7 +1687,7 @@ case 16: /* Line 1806 of yacc.c */ -#line 173 "albumtheme.y" +#line 173 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.cond) = gth_condition_new ((yyvsp[(2) - (3)].expr)); } @@ -1696,7 +1696,7 @@ case 17: /* Line 1806 of yacc.c */ -#line 177 "albumtheme.y" +#line 177 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.cond) = gth_condition_new ((yyvsp[(3) - (5)].expr)); } @@ -1705,7 +1705,7 @@ case 18: /* Line 1806 of yacc.c */ -#line 182 "albumtheme.y" +#line 182 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthExpr *else_expr; GthCondition *cond; @@ -1722,7 +1722,7 @@ case 19: /* Line 1806 of yacc.c */ -#line 194 "albumtheme.y" +#line 194 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.cond) = NULL; } @@ -1731,7 +1731,7 @@ case 22: /* Line 1806 of yacc.c */ -#line 205 "albumtheme.y" +#line 205 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.tag) = gth_tag_new (GTH_TAG_SET_VAR, (yyvsp[(2) - (3)].list)); } @@ -1740,7 +1740,7 @@ case 23: /* Line 1806 of yacc.c */ -#line 210 "albumtheme.y" +#line 210 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { if (gth_tag_get_type_from_name ((yyvsp[(2) - (4)].text)) == GTH_TAG_EVAL) { GthExpr *e; @@ -1793,7 +1793,7 @@ case 24: /* Line 1806 of yacc.c */ -#line 258 "albumtheme.y" +#line 258 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthTagType tag_type = gth_tag_get_type_from_name ((yyvsp[(2) - (4)].text)); if (tag_type == GTH_TAG_INVALID) { @@ -1807,7 +1807,7 @@ case 25: /* Line 1806 of yacc.c */ -#line 268 "albumtheme.y" +#line 268 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend ((yyvsp[(2) - (2)].list), (yyvsp[(1) - (2)].attribute)); } @@ -1816,7 +1816,7 @@ case 26: /* Line 1806 of yacc.c */ -#line 272 "albumtheme.y" +#line 272 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.list) = NULL; } @@ -1825,7 +1825,7 @@ case 27: /* Line 1806 of yacc.c */ -#line 277 "albumtheme.y" +#line 277 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.attribute) = gth_attribute_new_expression ((yyvsp[(1) - (5)].text), (yyvsp[(4) - (5)].expr)); g_free ((yyvsp[(1) - (5)].text)); @@ -1835,7 +1835,7 @@ case 28: /* Line 1806 of yacc.c */ -#line 282 "albumtheme.y" +#line 282 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.attribute) = gth_attribute_new_string ((yyvsp[(1) - (5)].text), (yyvsp[(4) - (5)].text)); g_free ((yyvsp[(1) - (5)].text)); @@ -1846,7 +1846,7 @@ case 29: /* Line 1806 of yacc.c */ -#line 288 "albumtheme.y" +#line 288 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); gth_expr_push_integer (e, 1); @@ -1858,7 +1858,7 @@ case 30: /* Line 1806 of yacc.c */ -#line 296 "albumtheme.y" +#line 296 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend ((yyvsp[(3) - (3)].list), (yyvsp[(1) - (3)].expr)); } @@ -1867,7 +1867,7 @@ case 31: /* Line 1806 of yacc.c */ -#line 300 "albumtheme.y" +#line 300 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.list) = g_list_prepend (NULL, (yyvsp[(1) - (1)].expr)); } @@ -1876,7 +1876,7 @@ case 32: /* Line 1806 of yacc.c */ -#line 304 "albumtheme.y" +#line 304 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.list) = NULL; } @@ -1885,7 +1885,7 @@ case 33: /* Line 1806 of yacc.c */ -#line 309 "albumtheme.y" +#line 309 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.expr) = (yyvsp[(2) - (3)].expr); } @@ -1894,7 +1894,7 @@ case 34: /* Line 1806 of yacc.c */ -#line 313 "albumtheme.y" +#line 313 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -1912,7 +1912,7 @@ case 35: /* Line 1806 of yacc.c */ -#line 326 "albumtheme.y" +#line 326 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -1930,7 +1930,7 @@ case 36: /* Line 1806 of yacc.c */ -#line 339 "albumtheme.y" +#line 339 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -1948,7 +1948,7 @@ case 37: /* Line 1806 of yacc.c */ -#line 352 "albumtheme.y" +#line 352 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -1966,7 +1966,7 @@ case 38: /* Line 1806 of yacc.c */ -#line 365 "albumtheme.y" +#line 365 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -1984,7 +1984,7 @@ case 39: /* Line 1806 of yacc.c */ -#line 378 "albumtheme.y" +#line 378 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); @@ -2002,7 +2002,7 @@ case 40: /* Line 1806 of yacc.c */ -#line 391 "albumtheme.y" +#line 391 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { (yyval.expr) = (yyvsp[(2) - (2)].expr); } @@ -2011,7 +2011,7 @@ case 41: /* Line 1806 of yacc.c */ -#line 395 "albumtheme.y" +#line 395 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { gth_expr_push_op ((yyvsp[(2) - (2)].expr), GTH_OP_NEG); (yyval.expr) = (yyvsp[(2) - (2)].expr); @@ -2021,7 +2021,7 @@ case 42: /* Line 1806 of yacc.c */ -#line 400 "albumtheme.y" +#line 400 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { gth_expr_push_op ((yyvsp[(2) - (2)].expr), GTH_OP_NOT); (yyval.expr) = (yyvsp[(2) - (2)].expr); @@ -2031,7 +2031,7 @@ case 43: /* Line 1806 of yacc.c */ -#line 405 "albumtheme.y" +#line 405 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { /* function call */ GthExpr *e = gth_expr_new (); gth_expr_push_var (e, (yyvsp[(1) - (4)].text)); @@ -2053,7 +2053,7 @@ case 44: /* Line 1806 of yacc.c */ -#line 422 "albumtheme.y" +#line 422 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); gth_expr_push_var (e, (yyvsp[(1) - (1)].text)); @@ -2065,7 +2065,7 @@ case 45: /* Line 1806 of yacc.c */ -#line 429 "albumtheme.y" +#line 429 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); gth_expr_push_string (e, (yyvsp[(2) - (3)].text)); @@ -2077,7 +2077,7 @@ case 46: /* Line 1806 of yacc.c */ -#line 436 "albumtheme.y" +#line 436 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" { GthExpr *e = gth_expr_new (); gth_expr_push_integer (e, (yyvsp[(1) - (1)].ivalue)); @@ -2319,7 +2319,7 @@ /* Line 2067 of yacc.c */ -#line 443 "albumtheme.y" +#line 443 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.y" @@ -2331,7 +2331,7 @@ void -gth_albumtheme_yyerror (char *fmt, ...) +gth_albumtheme_yyerror (const char *fmt, ...) { va_list ap; diff -Nru gthumb-2.14.3/extensions/webalbums/albumtheme-lex.c gthumb-3.0.0/extensions/webalbums/albumtheme-lex.c --- gthumb-2.14.3/extensions/webalbums/albumtheme-lex.c 2011-10-25 10:26:20.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/albumtheme-lex.c 2012-04-23 17:55:31.000000000 +0000 @@ -680,8 +680,8 @@ #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *gth_albumtheme_yytext; -#line 1 "albumtheme.l" -#line 2 "albumtheme.l" +#line 1 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" +#line 2 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" /* * GThumb * @@ -903,7 +903,7 @@ register char *yy_cp, *yy_bp; register int yy_act; -#line 47 "albumtheme.l" +#line 47 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" #line 910 "albumtheme-lex.c" @@ -991,7 +991,7 @@ case 1: YY_RULE_SETUP -#line 49 "albumtheme.l" +#line 49 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { BEGIN (CONDITION); return IF; @@ -999,7 +999,7 @@ YY_BREAK case 2: YY_RULE_SETUP -#line 53 "albumtheme.l" +#line 53 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { BEGIN (CONDITION); return ELSE_IF; @@ -1007,7 +1007,7 @@ YY_BREAK case 3: YY_RULE_SETUP -#line 57 "albumtheme.l" +#line 57 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { BEGIN (ATTRIBUTES); return ELSE; @@ -1015,7 +1015,7 @@ YY_BREAK case 4: YY_RULE_SETUP -#line 61 "albumtheme.l" +#line 61 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { BEGIN (ATTRIBUTES); return END; @@ -1023,7 +1023,7 @@ YY_BREAK case 5: YY_RULE_SETUP -#line 65 "albumtheme.l" +#line 65 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { BEGIN (ATTRIBUTES); return SET_VAR; @@ -1031,7 +1031,7 @@ YY_BREAK case 6: YY_RULE_SETUP -#line 69 "albumtheme.l" +#line 69 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { BEGIN (CONDITION); yylval.ivalue = GTH_TAG_FOR_EACH_IN_RANGE; @@ -1040,7 +1040,7 @@ YY_BREAK case 7: YY_RULE_SETUP -#line 74 "albumtheme.l" +#line 74 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { BEGIN (FUNCTION); return PRINT; @@ -1048,7 +1048,7 @@ YY_BREAK case 8: YY_RULE_SETUP -#line 78 "albumtheme.l" +#line 78 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { if (g_str_equal (gth_albumtheme_yytext, "eval") || g_str_equal (gth_albumtheme_yytext, "translate")) BEGIN (CONDITION); @@ -1060,7 +1060,7 @@ YY_BREAK case 9: YY_RULE_SETUP -#line 86 "albumtheme.l" +#line 86 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { before_string = YY_START; BEGIN (STRING); @@ -1069,7 +1069,7 @@ YY_BREAK case 10: YY_RULE_SETUP -#line 91 "albumtheme.l" +#line 91 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { BEGIN (before_string); return '\''; @@ -1078,7 +1078,7 @@ case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 95 "albumtheme.l" +#line 95 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.text = g_strdup (gth_albumtheme_yytext); return QUOTED_STRING; @@ -1086,7 +1086,7 @@ YY_BREAK case 12: YY_RULE_SETUP -#line 99 "albumtheme.l" +#line 99 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { BEGIN (QUOTE); return '"'; @@ -1094,7 +1094,7 @@ YY_BREAK case 13: YY_RULE_SETUP -#line 103 "albumtheme.l" +#line 103 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { BEGIN (ATTRIBUTES); return '"'; @@ -1102,7 +1102,7 @@ YY_BREAK case 14: YY_RULE_SETUP -#line 107 "albumtheme.l" +#line 107 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { BEGIN (INITIAL); return END_TAG; @@ -1110,7 +1110,7 @@ YY_BREAK case 15: YY_RULE_SETUP -#line 111 "albumtheme.l" +#line 111 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.text = g_strdup (gth_albumtheme_yytext); return ATTRIBUTE_NAME; @@ -1118,21 +1118,21 @@ YY_BREAK case 16: YY_RULE_SETUP -#line 115 "albumtheme.l" +#line 115 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return '='; } YY_BREAK case 17: YY_RULE_SETUP -#line 118 "albumtheme.l" +#line 118 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return '='; } YY_BREAK case 18: YY_RULE_SETUP -#line 121 "albumtheme.l" +#line 121 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_LT; return COMPARE; @@ -1140,7 +1140,7 @@ YY_BREAK case 19: YY_RULE_SETUP -#line 125 "albumtheme.l" +#line 125 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_GT; return COMPARE; @@ -1148,63 +1148,63 @@ YY_BREAK case 20: YY_RULE_SETUP -#line 129 "albumtheme.l" +#line 129 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return '+'; } YY_BREAK case 21: YY_RULE_SETUP -#line 132 "albumtheme.l" +#line 132 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return '-'; } YY_BREAK case 22: YY_RULE_SETUP -#line 135 "albumtheme.l" +#line 135 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return '*'; } YY_BREAK case 23: YY_RULE_SETUP -#line 138 "albumtheme.l" +#line 138 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return '/'; } YY_BREAK case 24: YY_RULE_SETUP -#line 141 "albumtheme.l" +#line 141 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return '!'; } YY_BREAK case 25: YY_RULE_SETUP -#line 144 "albumtheme.l" +#line 144 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return '('; } YY_BREAK case 26: YY_RULE_SETUP -#line 147 "albumtheme.l" +#line 147 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return ')'; } YY_BREAK case 27: YY_RULE_SETUP -#line 150 "albumtheme.l" +#line 150 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return ','; } YY_BREAK case 28: YY_RULE_SETUP -#line 153 "albumtheme.l" +#line 153 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_AND; return BOOL_OP; @@ -1212,7 +1212,7 @@ YY_BREAK case 29: YY_RULE_SETUP -#line 157 "albumtheme.l" +#line 157 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_OR; return BOOL_OP; @@ -1220,7 +1220,7 @@ YY_BREAK case 30: YY_RULE_SETUP -#line 161 "albumtheme.l" +#line 161 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_EQ; return COMPARE; @@ -1228,7 +1228,7 @@ YY_BREAK case 31: YY_RULE_SETUP -#line 165 "albumtheme.l" +#line 165 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_NE; return COMPARE; @@ -1236,7 +1236,7 @@ YY_BREAK case 32: YY_RULE_SETUP -#line 169 "albumtheme.l" +#line 169 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_LE; return COMPARE; @@ -1244,7 +1244,7 @@ YY_BREAK case 33: YY_RULE_SETUP -#line 173 "albumtheme.l" +#line 173 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.ivalue = GTH_OP_CMP_GE; return COMPARE; @@ -1252,21 +1252,21 @@ YY_BREAK case 34: YY_RULE_SETUP -#line 177 "albumtheme.l" +#line 177 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return RANGE; } YY_BREAK case 35: YY_RULE_SETUP -#line 180 "albumtheme.l" +#line 180 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { return IN; } YY_BREAK case 36: YY_RULE_SETUP -#line 183 "albumtheme.l" +#line 183 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.ivalue = atoi (gth_albumtheme_yytext); return NUMBER; @@ -1274,7 +1274,7 @@ YY_BREAK case 37: YY_RULE_SETUP -#line 187 "albumtheme.l" +#line 187 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.text = g_strdup (gth_albumtheme_yytext); return VARIABLE; @@ -1283,14 +1283,14 @@ case 38: /* rule 38 can match eol */ YY_RULE_SETUP -#line 191 "albumtheme.l" +#line 191 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { /* Eat spaces inside tag. */ } YY_BREAK case 39: YY_RULE_SETUP -#line 194 "albumtheme.l" +#line 194 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.text = g_strdup (gth_albumtheme_yytext); return HTML; @@ -1299,7 +1299,7 @@ case 40: /* rule 40 can match eol */ YY_RULE_SETUP -#line 198 "albumtheme.l" +#line 198 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { yylval.text = g_strdup (gth_albumtheme_yytext); return HTML; @@ -1311,7 +1311,7 @@ case YY_STATE_EOF(CONDITION): case YY_STATE_EOF(QUOTE): case YY_STATE_EOF(STRING): -#line 202 "albumtheme.l" +#line 202 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" { YY_FLUSH_BUFFER; BEGIN(INITIAL); @@ -1320,7 +1320,7 @@ YY_BREAK case 41: YY_RULE_SETUP -#line 208 "albumtheme.l" +#line 208 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" ECHO; YY_BREAK #line 1327 "albumtheme-lex.c" @@ -2282,7 +2282,7 @@ #define YYTABLES_NAME "yytables" -#line 208 "albumtheme.l" +#line 208 "/home/paolo/workspace/gthumb/extensions/webalbums/albumtheme.l" diff -Nru gthumb-2.14.3/extensions/webalbums/albumtheme.y gthumb-3.0.0/extensions/webalbums/albumtheme.y --- gthumb-2.14.3/extensions/webalbums/albumtheme.y 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/albumtheme.y 2012-02-19 15:01:32.000000000 +0000 @@ -26,7 +26,7 @@ #include "albumtheme-private.h" int gth_albumtheme_yylex (); -void gth_albumtheme_yyerror (char *fmt, ...); +void gth_albumtheme_yyerror (const char *fmt, ...); int gth_albumtheme_yywrap (void); #define YY_NO_UNPUT @@ -451,7 +451,7 @@ void -gth_albumtheme_yyerror (char *fmt, ...) +gth_albumtheme_yyerror (const char *fmt, ...) { va_list ap; diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/Classic/image.gthtml gthumb-3.0.0/extensions/webalbums/data/albumthemes/Classic/image.gthtml --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/Classic/image.gthtml 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/Classic/image.gthtml 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,7 @@ - - - + + <% if images > 1 %> <%= header %> (<%= image_idx %>/<%= images %>) diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/Classic/index.gthtml gthumb-3.0.0/extensions/webalbums/data/albumthemes/Classic/index.gthtml --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/Classic/index.gthtml 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/Classic/index.gthtml 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,7 @@ - - - + + <% if pages > 1 %> <%= header %> (<%= page_idx %>/<%= pages %>) diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/Classic/Makefile.in gthumb-3.0.0/extensions/webalbums/data/albumthemes/Classic/Makefile.in --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/Classic/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/Classic/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -352,8 +374,11 @@ -rm -rf .libs _libs install-themeDATA: $(theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/ClassicClips/image.gthtml gthumb-3.0.0/extensions/webalbums/data/albumthemes/ClassicClips/image.gthtml --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/ClassicClips/image.gthtml 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/ClassicClips/image.gthtml 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,7 @@ - - - + + <% if images > 1 %> <%= header %> (<%= image_idx %>/<%= images %>) diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/ClassicClips/index.gthtml gthumb-3.0.0/extensions/webalbums/data/albumthemes/ClassicClips/index.gthtml --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/ClassicClips/index.gthtml 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/ClassicClips/index.gthtml 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,7 @@ - - - + + <% if pages > 1 %> <%= header %> (<%= page_idx %>/<%= pages %>) diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/ClassicClips/Makefile.in gthumb-3.0.0/extensions/webalbums/data/albumthemes/ClassicClips/Makefile.in --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/ClassicClips/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/ClassicClips/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -352,8 +374,11 @@ -rm -rf .libs _libs install-themeDATA: $(theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/Makefile.in gthumb-3.0.0/extensions/webalbums/data/albumthemes/Makefile.in --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,6 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -140,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -151,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -190,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -238,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -270,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -509,13 +531,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/NeatRound/image.gthtml gthumb-3.0.0/extensions/webalbums/data/albumthemes/NeatRound/image.gthtml --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/NeatRound/image.gthtml 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/NeatRound/image.gthtml 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,7 @@ - - - + + <% if images > 1 %> <%= header %> (<%= image_idx %>/<%= images %>) diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/NeatRound/index.gthtml gthumb-3.0.0/extensions/webalbums/data/albumthemes/NeatRound/index.gthtml --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/NeatRound/index.gthtml 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/NeatRound/index.gthtml 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,7 @@ - - - + + <% if pages > 1 %> <%= header %> (<%= page_idx %>/<%= pages %>) diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/NeatRound/Makefile.in gthumb-3.0.0/extensions/webalbums/data/albumthemes/NeatRound/Makefile.in --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/NeatRound/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/NeatRound/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -352,8 +374,11 @@ -rm -rf .libs _libs install-themeDATA: $(theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/Wiki/image.gthtml gthumb-3.0.0/extensions/webalbums/data/albumthemes/Wiki/image.gthtml --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/Wiki/image.gthtml 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/Wiki/image.gthtml 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,7 @@ - - - + + <% if images > 1 %> <%= header %> (<%= image_idx %>/<%= images %>) diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/Wiki/index.gthtml gthumb-3.0.0/extensions/webalbums/data/albumthemes/Wiki/index.gthtml --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/Wiki/index.gthtml 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/Wiki/index.gthtml 2012-02-19 15:01:32.000000000 +0000 @@ -1,7 +1,7 @@ - - - + + <% if pages > 1 %> <%= header %> (<%= page_idx %>/<%= pages %>) diff -Nru gthumb-2.14.3/extensions/webalbums/data/albumthemes/Wiki/Makefile.in gthumb-3.0.0/extensions/webalbums/data/albumthemes/Wiki/Makefile.in --- gthumb-2.14.3/extensions/webalbums/data/albumthemes/Wiki/Makefile.in 2012-03-25 18:34:16.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/albumthemes/Wiki/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -341,8 +363,11 @@ -rm -rf .libs _libs install-themeDATA: $(theme_DATA) @$(NORMAL_INSTALL) - test -z "$(themedir)" || $(MKDIR_P) "$(DESTDIR)$(themedir)" @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(themedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(themedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/webalbums/data/gthumb_webalbums.schemas.in gthumb-3.0.0/extensions/webalbums/data/gthumb_webalbums.schemas.in --- gthumb-2.14.3/extensions/webalbums/data/gthumb_webalbums.schemas.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/gthumb_webalbums.schemas.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,369 +0,0 @@ - - - - - /schemas/apps/gthumb/ext/webalbums/index_file - /apps/gthumb/ext/webalbums/index_file - gthumb - string - index.html - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/directories/previews - /apps/gthumb/ext/webalbums/directories/previews - gthumb - string - previews - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/directories/thumbnails - /apps/gthumb/ext/webalbums/directories/thumbnails - gthumb - string - thumbnails - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/directories/images - /apps/gthumb/ext/webalbums/directories/images - gthumb - string - images - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/directories/html_images - /apps/gthumb/ext/webalbums/directories/html_images - gthumb - string - html - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/directories/html_indexes - /apps/gthumb/ext/webalbums/directories/html_indexes - gthumb - string - html - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/directories/theme_files - /apps/gthumb/ext/webalbums/directories/theme_files - gthumb - string - theme - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/destination - /apps/gthumb/ext/webalbums/destination - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/copy_images - /apps/gthumb/ext/webalbums/copy_images - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/resize_images - /apps/gthumb/ext/webalbums/resize_images - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/resize_width - /apps/gthumb/ext/webalbums/resize_width - gthumb - int - 640 - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/resize_height - /apps/gthumb/ext/webalbums/resize_height - gthumb - int - 480 - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/images_per_index - /apps/gthumb/ext/webalbums/images_per_index - gthumb - int - 12 - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/single_index - /apps/gthumb/ext/webalbums/single_index - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/columns - /apps/gthumb/ext/webalbums/columns - gthumb - int - 4 - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/adapt_to_width - /apps/gthumb/ext/webalbums/adapt_to_width - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/sort_type - /apps/gthumb/ext/webalbums/sort_type - gthumb - string - file::mtime - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/sort_inverse - /apps/gthumb/ext/webalbums/sort_inverse - gthumb - bool - false - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/header - /apps/gthumb/ext/webalbums/header - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/footer - /apps/gthumb/ext/webalbums/footer - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/image_page_header - /apps/gthumb/ext/webalbums/image_page_header - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/image_page_footer - /apps/gthumb/ext/webalbums/image_page_footer - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/theme - /apps/gthumb/ext/webalbums/theme - gthumb - string - Wiki - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/enable_thumbnail_caption - /apps/gthumb/ext/webalbums/enable_thumbnail_caption - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/thumbnail_caption - /apps/gthumb/ext/webalbums/thumbnail_caption - gthumb - string - - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/enable_image_description - /apps/gthumb/ext/webalbums/enable_image_description - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/enable_image_attributes - /apps/gthumb/ext/webalbums/enable_image_attributes - gthumb - bool - true - - - - - - - - - /schemas/apps/gthumb/ext/webalbums/image_attributes - /apps/gthumb/ext/webalbums/image_attributes - gthumb - string - - - - - - - - - - diff -Nru gthumb-2.14.3/extensions/webalbums/data/Makefile.am gthumb-3.0.0/extensions/webalbums/data/Makefile.am --- gthumb-2.14.3/extensions/webalbums/data/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/Makefile.am 2012-02-19 15:01:32.000000000 +0000 @@ -1,18 +1,3 @@ SUBDIRS = albumthemes ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_webalbums.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL -install-data-local: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/webalbums/data/$(schema_DATA) -endif - -EXTRA_DIST = $(schema_in_files) - -CLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/webalbums/data/Makefile.in gthumb-3.0.0/extensions/webalbums/data/Makefile.in --- gthumb-2.14.3/extensions/webalbums/data/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -14,8 +14,24 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -63,35 +79,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(schemadir)" -DATA = $(schema_DATA) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -170,10 +162,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -181,6 +171,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -220,6 +211,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -268,8 +261,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -300,6 +291,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -331,11 +323,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = albumthemes ui -schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_in_files = gthumb_webalbums.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -EXTRA_DIST = $(schema_in_files) -CLEANFILES = $(schema_DATA) all: all-recursive .SUFFIXES: @@ -375,24 +362,6 @@ clean-libtool: -rm -rf .libs _libs -install-schemaDATA: $(schema_DATA) - @$(NORMAL_INSTALL) - test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)" - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \ - done - -uninstall-schemaDATA: - @$(NORMAL_UNINSTALL) - @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(schemadir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -561,13 +530,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -589,12 +555,9 @@ done check-am: all-am check: check-recursive -all-am: Makefile $(DATA) +all-am: Makefile installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(schemadir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -617,7 +580,6 @@ mostlyclean-generic: clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -626,7 +588,6 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -647,7 +608,7 @@ info-am: -install-data-am: install-data-local install-schemaDATA +install-data-am: install-dvi: install-dvi-recursive @@ -691,7 +652,7 @@ ps-am: -uninstall-am: uninstall-schemaDATA +uninstall-am: .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ install-am install-strip tags-recursive @@ -701,21 +662,15 @@ ctags ctags-recursive distclean distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-data-local 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-schemaDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-schemaDATA - - -@INTLTOOL_SCHEMAS_RULE@ + 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 installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am -@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: -@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/extensions/webalbums/data/$(schema_DATA) -include $(top_srcdir)/git.mk diff -Nru gthumb-2.14.3/extensions/webalbums/data/ui/Makefile.in gthumb-3.0.0/extensions/webalbums/data/ui/Makefile.in --- gthumb-2.14.3/extensions/webalbums/data/ui/Makefile.in 2012-03-25 18:34:16.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/ui/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-uiDATA: $(ui_DATA) @$(NORMAL_INSTALL) - test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(uidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/extensions/webalbums/data/ui/web-album-exporter.ui gthumb-3.0.0/extensions/webalbums/data/ui/web-album-exporter.ui --- gthumb-2.14.3/extensions/webalbums/data/ui/web-album-exporter.ui 2011-10-17 08:57:03.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/data/ui/web-album-exporter.ui 2012-02-19 15:01:32.000000000 +0000 @@ -22,6 +22,12 @@ + + + + + + 1 100 @@ -29,12 +35,6 @@ 1 10 - - - - - - @@ -72,6 +72,7 @@ gtk-help + False True True True @@ -89,6 +90,7 @@ gtk-cancel + False True True True @@ -105,6 +107,7 @@ gtk-save + False True True True @@ -179,6 +182,7 @@ 1 2 + GTK_FILL @@ -194,6 +198,7 @@ 2 3 + GTK_FILL @@ -211,6 +216,7 @@ 2 1 2 + GTK_FILL @@ -228,6 +234,7 @@ 2 2 3 + GTK_FILL @@ -241,6 +248,9 @@ + + GTK_FILL + @@ -256,6 +266,7 @@ 1 2 + GTK_FILL @@ -271,6 +282,7 @@ 3 4 + GTK_FILL @@ -288,6 +300,7 @@ 2 3 4 + GTK_FILL @@ -439,7 +452,7 @@ - True + False True 0 @@ -447,6 +460,7 @@ _Copy originals to destination + False True True False @@ -456,7 +470,7 @@ True - True + False True 2 @@ -474,6 +488,7 @@ _Resize if larger than: + False True True False @@ -521,7 +536,7 @@ - True + False True 3 @@ -694,6 +709,7 @@ Re_verse order + False True True False @@ -713,7 +729,6 @@ 2 2 3 - GTK_FILL GTK_FILL @@ -729,6 +744,8 @@ 1 2 + GTK_FILL + GTK_FILL @@ -753,6 +770,7 @@ _Adapt to the window width + False True True False @@ -772,6 +790,7 @@ 2 1 2 + GTK_FILL @@ -796,6 +815,7 @@ All images on a single page + False True True False @@ -812,6 +832,7 @@ 1 2 + GTK_FILL @@ -823,6 +844,10 @@ True images_per_index_spinbutton + + GTK_FILL + GTK_FILL + @@ -872,6 +897,7 @@ + False True True False @@ -997,6 +1023,7 @@ 1 2 + GTK_FILL @@ -1012,6 +1039,7 @@ 2 3 + GTK_FILL @@ -1029,6 +1057,7 @@ 2 1 2 + GTK_FILL @@ -1046,6 +1075,7 @@ 2 2 3 + GTK_FILL @@ -1059,6 +1089,9 @@ + + GTK_FILL + @@ -1074,6 +1107,7 @@ 1 2 + GTK_FILL @@ -1089,6 +1123,7 @@ 5 6 + GTK_FILL @@ -1106,6 +1141,7 @@ 2 5 6 + GTK_FILL @@ -1121,6 +1157,7 @@ 3 4 + GTK_FILL @@ -1138,6 +1175,7 @@ 2 3 4 + GTK_FILL @@ -1155,6 +1193,7 @@ 2 4 5 + GTK_FILL @@ -1170,6 +1209,7 @@ 4 5 + GTK_FILL @@ -1215,7 +1255,7 @@ - True + False True 0 @@ -1262,6 +1302,7 @@ Show the description, if available + False True True False @@ -1277,6 +1318,7 @@ + False True True False diff -Nru gthumb-2.14.3/extensions/webalbums/dlg-web-exporter.c gthumb-3.0.0/extensions/webalbums/dlg-web-exporter.c --- gthumb-2.14.3/extensions/webalbums/dlg-web-exporter.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/dlg-web-exporter.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,11 +26,10 @@ #include "gth-web-exporter.h" #include "preferences.h" + #define GET_WIDGET(name) _gtk_builder_get_widget (data->builder, (name)) #define STRING_IS_VOID(x) (((x) == NULL) || (*(x) == 0)) -#define DEFAULT_ALBUM_THEME "Wiki" -#define DEFAULT_WEB_IMAGE_ATTRIBUTES ("gth::file::display-size,standard::fast-content-type,general::dimensions,general::format,general::location,general::datetime,general::rating,Exif::Image::Make,Exif::Image::Model,Exif::Image::Software,Exif::Image::Artist,Exif::Image::Copyright,Exif::Photo::ISOSpeedRatings,Exif::Photo::BrightnessValue,Exif::Photo::FNumber,Exif::Photo::ApertureValue,Exif::Photo::MaxApertureValue,Exif::Photo::ExposureTime,Exif::Photo::ExposureProgram,Exif::Photo::ExposureIndex,Exif::Photo::ExposureBiasValue,Exif::Photo::ExposureMode,Exif::Photo::ShutterSpeedValue,Exif::Photo::MeteringMode,Exif::Photo::LightSource,Exif::Photo::WhiteBalance,Exif::Photo::Flash,Exif::Photo::FocalLength,Exif::Photo::SubjectArea,Exif::Photo::Contrast,Exif::Photo::Saturation,Exif::Photo::Sharpness") -#define DEFAULT_WEB_THUMBNAIL_CAPTION ("general::datetime,general::dimensions,gth::file::display-size") + enum { THEME_COLUMN_ID, @@ -59,6 +58,7 @@ typedef struct { GthBrowser *browser; + GSettings *settings; GList *file_list; GtkBuilder *builder; GtkWidget *dialog; @@ -73,6 +73,7 @@ { gth_browser_set_dialog (data->browser, "web_exporter", NULL); _g_object_list_unref (data->file_list); + g_object_unref (data->settings); g_object_unref (data->builder); g_free (data); } @@ -108,20 +109,20 @@ s_value = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton"))); destination = g_file_new_for_uri (s_value); - eel_gconf_set_path (PREF_WEBALBUMS_DESTINATION, s_value); + _g_settings_set_uri (data->settings, PREF_WEBALBUMS_DESTINATION, s_value); g_free (s_value); - eel_gconf_set_boolean (PREF_WEBALBUMS_COPY_IMAGES, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("copy_images_checkbutton")))); - eel_gconf_set_boolean (PREF_WEBALBUMS_RESIZE_IMAGES, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_images_checkbutton")))); + g_settings_set_boolean (data->settings, PREF_WEBALBUMS_COPY_IMAGES, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("copy_images_checkbutton")))); + g_settings_set_boolean (data->settings, PREF_WEBALBUMS_RESIZE_IMAGES, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_images_checkbutton")))); i_value = gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("resize_images_combobox"))); - eel_gconf_set_integer (PREF_WEBALBUMS_RESIZE_WIDTH, resize_size[i_value].width); - eel_gconf_set_integer (PREF_WEBALBUMS_RESIZE_HEIGHT, resize_size[i_value].height); + g_settings_set_int (data->settings, PREF_WEBALBUMS_RESIZE_WIDTH, resize_size[i_value].width); + g_settings_set_int (data->settings, PREF_WEBALBUMS_RESIZE_HEIGHT, resize_size[i_value].height); - eel_gconf_set_integer (PREF_WEBALBUMS_IMAGES_PER_INDEX, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("images_per_index_spinbutton")))); - eel_gconf_set_boolean (PREF_WEBALBUMS_SINGLE_INDEX, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_index_checkbutton")))); - eel_gconf_set_integer (PREF_WEBALBUMS_COLUMNS, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("cols_spinbutton")))); - eel_gconf_set_boolean (PREF_WEBALBUMS_ADAPT_TO_WIDTH, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("adapt_column_checkbutton")))); + g_settings_set_int (data->settings, PREF_WEBALBUMS_IMAGES_PER_INDEX, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("images_per_index_spinbutton")))); + g_settings_set_boolean (data->settings, PREF_WEBALBUMS_SINGLE_INDEX, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_index_checkbutton")))); + g_settings_set_int (data->settings, PREF_WEBALBUMS_COLUMNS, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (GET_WIDGET ("cols_spinbutton")))); + g_settings_set_boolean (data->settings, PREF_WEBALBUMS_ADAPT_TO_WIDTH, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("adapt_column_checkbutton")))); if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (GET_WIDGET ("sort_combobox")), &iter)) { GthFileDataSort *sort_type; @@ -130,22 +131,22 @@ &iter, SORT_TYPE_COLUMN_DATA, &sort_type, -1); - eel_gconf_set_string (PREF_WEBALBUMS_SORT_TYPE, sort_type->name); + g_settings_set_string (data->settings, PREF_WEBALBUMS_SORT_TYPE, sort_type->name); } - eel_gconf_set_boolean (PREF_WEBALBUMS_SORT_INVERSE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")))); + g_settings_set_boolean (data->settings, PREF_WEBALBUMS_SORT_INVERSE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")))); header = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("header_entry"))); - eel_gconf_set_string (PREF_WEBALBUMS_HEADER, header); + g_settings_set_string (data->settings, PREF_WEBALBUMS_HEADER, header); footer = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("footer_entry"))); - eel_gconf_set_string (PREF_WEBALBUMS_FOOTER, footer); + g_settings_set_string (data->settings, PREF_WEBALBUMS_FOOTER, footer); image_page_header = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("image_page_header_entry"))); - eel_gconf_set_string (PREF_WEBALBUMS_IMAGE_PAGE_HEADER, image_page_header); + g_settings_set_string (data->settings, PREF_WEBALBUMS_IMAGE_PAGE_HEADER, image_page_header); image_page_footer = gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("image_page_footer_entry"))); - eel_gconf_set_string (PREF_WEBALBUMS_IMAGE_PAGE_FOOTER, image_page_footer); + g_settings_set_string (data->settings, PREF_WEBALBUMS_IMAGE_PAGE_FOOTER, image_page_footer); theme_name = NULL; { @@ -167,19 +168,19 @@ g_list_free (list); } g_return_if_fail (theme_name != NULL); - eel_gconf_set_string (PREF_WEBALBUMS_THEME, theme_name); + g_settings_set_string (data->settings, PREF_WEBALBUMS_THEME, theme_name); - eel_gconf_set_boolean (PREF_WEBALBUMS_ENABLE_THUMBNAIL_CAPTION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("thumbnail_caption_checkbutton")))); + g_settings_set_boolean (data->settings, PREF_WEBALBUMS_ENABLE_THUMBNAIL_CAPTION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("thumbnail_caption_checkbutton")))); thumbnail_caption = gth_metadata_chooser_get_selection (GTH_METADATA_CHOOSER (data->thumbnail_caption_chooser)); - eel_gconf_set_string (PREF_WEBALBUMS_THUMBNAIL_CAPTION, thumbnail_caption); + g_settings_set_string (data->settings, PREF_WEBALBUMS_THUMBNAIL_CAPTION, thumbnail_caption); - eel_gconf_set_boolean (PREF_WEBALBUMS_ENABLE_IMAGE_ATTRIBUTES, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("image_attributes_checkbutton")))); + g_settings_set_boolean (data->settings, PREF_WEBALBUMS_ENABLE_IMAGE_ATTRIBUTES, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("image_attributes_checkbutton")))); - eel_gconf_set_boolean (PREF_WEBALBUMS_ENABLE_IMAGE_DESCRIPTION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("image_description_checkbutton")))); + g_settings_set_boolean (data->settings, PREF_WEBALBUMS_ENABLE_IMAGE_DESCRIPTION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("image_description_checkbutton")))); image_attributes = gth_metadata_chooser_get_selection (GTH_METADATA_CHOOSER (data->image_attributes_chooser)); - eel_gconf_set_string (PREF_WEBALBUMS_IMAGE_ATTRIBUTES, image_attributes); + g_settings_set_string (data->settings, PREF_WEBALBUMS_IMAGE_ATTRIBUTES, image_attributes); /* exec the task */ @@ -191,24 +192,30 @@ gth_web_exporter_set_image_page_footer (GTH_WEB_EXPORTER (task), image_page_footer); gth_web_exporter_set_style (GTH_WEB_EXPORTER (task), theme_name); gth_web_exporter_set_destination (GTH_WEB_EXPORTER (task), destination); - gth_web_exporter_set_copy_images (GTH_WEB_EXPORTER (task), eel_gconf_get_boolean (PREF_WEBALBUMS_COPY_IMAGES, FALSE)); + gth_web_exporter_set_copy_images (GTH_WEB_EXPORTER (task), + g_settings_get_boolean (data->settings, PREF_WEBALBUMS_COPY_IMAGES)); gth_web_exporter_set_resize_images (GTH_WEB_EXPORTER (task), - eel_gconf_get_boolean (PREF_WEBALBUMS_RESIZE_IMAGES, FALSE), - eel_gconf_get_integer (PREF_WEBALBUMS_RESIZE_WIDTH, 640), - eel_gconf_get_integer (PREF_WEBALBUMS_RESIZE_HEIGHT, 480)); + g_settings_get_boolean (data->settings, PREF_WEBALBUMS_RESIZE_IMAGES), + g_settings_get_int (data->settings, PREF_WEBALBUMS_RESIZE_WIDTH), + g_settings_get_int (data->settings, PREF_WEBALBUMS_RESIZE_HEIGHT)); - s_value = eel_gconf_get_string (PREF_WEBALBUMS_SORT_TYPE, "file::mtime"); + s_value = g_settings_get_string (data->settings, PREF_WEBALBUMS_SORT_TYPE); sort_type = gth_main_get_sort_type (s_value); gth_web_exporter_set_sort_order (GTH_WEB_EXPORTER (task), sort_type, - eel_gconf_get_boolean (PREF_WEBALBUMS_SORT_INVERSE, FALSE)); + g_settings_get_boolean (data->settings, PREF_WEBALBUMS_SORT_INVERSE)); g_free (s_value); - gth_web_exporter_set_images_per_index (GTH_WEB_EXPORTER (task), eel_gconf_get_integer (PREF_WEBALBUMS_IMAGES_PER_INDEX, 16)); - gth_web_exporter_set_single_index (GTH_WEB_EXPORTER (task), eel_gconf_get_boolean (PREF_WEBALBUMS_SINGLE_INDEX, FALSE)); - gth_web_exporter_set_columns (GTH_WEB_EXPORTER (task), eel_gconf_get_integer (PREF_WEBALBUMS_COLUMNS, 4)); - gth_web_exporter_set_adapt_to_width (GTH_WEB_EXPORTER (task), eel_gconf_get_boolean (PREF_WEBALBUMS_ADAPT_TO_WIDTH, FALSE)); - gth_web_exporter_set_thumbnail_caption (GTH_WEB_EXPORTER (task), gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("thumbnail_caption_checkbutton"))) ? thumbnail_caption : ""); + gth_web_exporter_set_images_per_index (GTH_WEB_EXPORTER (task), + g_settings_get_int (data->settings, PREF_WEBALBUMS_IMAGES_PER_INDEX)); + gth_web_exporter_set_single_index (GTH_WEB_EXPORTER (task), + g_settings_get_boolean (data->settings, PREF_WEBALBUMS_SINGLE_INDEX)); + gth_web_exporter_set_columns (GTH_WEB_EXPORTER (task), + g_settings_get_int (data->settings, PREF_WEBALBUMS_COLUMNS)); + gth_web_exporter_set_adapt_to_width (GTH_WEB_EXPORTER (task), + g_settings_get_boolean (data->settings, PREF_WEBALBUMS_ADAPT_TO_WIDTH)); + gth_web_exporter_set_thumbnail_caption (GTH_WEB_EXPORTER (task), + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("thumbnail_caption_checkbutton"))) ? thumbnail_caption : ""); gth_web_exporter_set_image_attributes (GTH_WEB_EXPORTER (task), gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("image_description_checkbutton"))), gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("image_attributes_checkbutton"))) ? image_attributes : ""); @@ -338,7 +345,7 @@ gtk_widget_set_size_request (GET_WIDGET ("theme_iconview"), (150 * 3), 140); gtk_widget_realize (GET_WIDGET ("theme_iconview")); - default_theme = eel_gconf_get_string (PREF_WEBALBUMS_THEME, DEFAULT_ALBUM_THEME); + default_theme = g_settings_get_string (data->settings, PREF_WEBALBUMS_THEME); model = GTK_TREE_MODEL (GET_WIDGET ("theme_liststore")); if (gtk_tree_model_get_iter_first (model, &iter)) { @@ -390,6 +397,7 @@ data->browser = browser; data->file_list = _g_object_list_ref (file_list); data->builder = _gtk_builder_new_from_file ("web-album-exporter.ui", "webalbums"); + data->settings = g_settings_new (GTHUMB_WEBALBUMS_SCHEMA); data->dialog = _gtk_builder_get_widget (data->builder, "web_album_dialog"); gth_browser_set_dialog (browser, "web_exporter", data->dialog); @@ -405,12 +413,17 @@ /* Set widgets data. */ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("copy_images_checkbutton")), eel_gconf_get_boolean (PREF_WEBALBUMS_COPY_IMAGES, FALSE)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_images_checkbutton")), eel_gconf_get_boolean (PREF_WEBALBUMS_RESIZE_IMAGES, FALSE)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("images_per_index_spinbutton")), eel_gconf_get_integer (PREF_WEBALBUMS_IMAGES_PER_INDEX, 12)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_index_checkbutton")), eel_gconf_get_boolean (PREF_WEBALBUMS_SINGLE_INDEX, FALSE)); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("cols_spinbutton")), eel_gconf_get_integer (PREF_WEBALBUMS_COLUMNS, 4)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("adapt_column_checkbutton")), eel_gconf_get_boolean (PREF_WEBALBUMS_ADAPT_TO_WIDTH, TRUE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("copy_images_checkbutton")), + g_settings_get_boolean (data->settings, PREF_WEBALBUMS_COPY_IMAGES)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("resize_images_checkbutton")), + g_settings_get_boolean (data->settings, PREF_WEBALBUMS_RESIZE_IMAGES)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("images_per_index_spinbutton")), g_settings_get_int (data->settings, PREF_WEBALBUMS_IMAGES_PER_INDEX)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("single_index_checkbutton")), + g_settings_get_boolean (data->settings, PREF_WEBALBUMS_SINGLE_INDEX)); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (GET_WIDGET ("cols_spinbutton")), + g_settings_get_int (data->settings, PREF_WEBALBUMS_COLUMNS)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("adapt_column_checkbutton")), + g_settings_get_boolean (data->settings, PREF_WEBALBUMS_ADAPT_TO_WIDTH)); active_index = 0; for (i = 0; i < G_N_ELEMENTS (resize_size); i++) { @@ -419,8 +432,8 @@ gtk_list_store_append (GTK_LIST_STORE (GET_WIDGET ("size_liststore")), &iter); - if ((resize_size[i].width == eel_gconf_get_integer (PREF_WEBALBUMS_RESIZE_WIDTH, 640)) - && (resize_size[i].height == eel_gconf_get_integer (PREF_WEBALBUMS_RESIZE_HEIGHT, 480))) + if ((resize_size[i].width == g_settings_get_int (data->settings, PREF_WEBALBUMS_RESIZE_WIDTH)) + && (resize_size[i].height == g_settings_get_int (data->settings, PREF_WEBALBUMS_RESIZE_HEIGHT))) { active_index = i; } @@ -435,7 +448,7 @@ } gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("resize_images_combobox")), active_index); - default_sort_type = eel_gconf_get_string (PREF_WEBALBUMS_SORT_TYPE, "file::mtime"); + default_sort_type = g_settings_get_string (data->settings, PREF_WEBALBUMS_SORT_TYPE); active_index = 0; sort_types = gth_main_get_all_sort_types (); for (i = 0, scan = sort_types; scan; scan = scan->next, i++) { @@ -454,32 +467,32 @@ g_list_free (sort_types); gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("sort_combobox")), active_index); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")), eel_gconf_get_boolean (PREF_WEBALBUMS_SORT_INVERSE, FALSE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reverse_order_checkbutton")), g_settings_get_boolean (data->settings, PREF_WEBALBUMS_SORT_INVERSE)); g_free (default_sort_type); gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("header_entry")), g_file_info_get_edit_name (gth_browser_get_location_data (browser)->info)); - s_value = eel_gconf_get_string (PREF_WEBALBUMS_FOOTER, ""); + s_value = g_settings_get_string (data->settings, PREF_WEBALBUMS_FOOTER); gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("footer_entry")), s_value); g_free (s_value); - s_value = eel_gconf_get_string (PREF_WEBALBUMS_IMAGE_PAGE_FOOTER, ""); + s_value = g_settings_get_string (data->settings, PREF_WEBALBUMS_IMAGE_PAGE_FOOTER); gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("image_page_footer_entry")), s_value); g_free (s_value); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("thumbnail_caption_checkbutton")), eel_gconf_get_boolean (PREF_WEBALBUMS_ENABLE_THUMBNAIL_CAPTION, TRUE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("thumbnail_caption_checkbutton")), g_settings_get_boolean (data->settings, PREF_WEBALBUMS_ENABLE_THUMBNAIL_CAPTION)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("image_description_checkbutton")), eel_gconf_get_boolean (PREF_WEBALBUMS_ENABLE_IMAGE_DESCRIPTION, TRUE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("image_description_checkbutton")), g_settings_get_boolean (data->settings, PREF_WEBALBUMS_ENABLE_IMAGE_DESCRIPTION)); - caption = eel_gconf_get_string (PREF_WEBALBUMS_THUMBNAIL_CAPTION, DEFAULT_WEB_THUMBNAIL_CAPTION); + caption = g_settings_get_string (data->settings, PREF_WEBALBUMS_THUMBNAIL_CAPTION); gth_metadata_chooser_set_selection (GTH_METADATA_CHOOSER (data->thumbnail_caption_chooser), caption); g_free (caption); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("image_attributes_checkbutton")), eel_gconf_get_boolean (PREF_WEBALBUMS_ENABLE_IMAGE_ATTRIBUTES, TRUE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("image_attributes_checkbutton")), g_settings_get_boolean (data->settings, PREF_WEBALBUMS_ENABLE_IMAGE_ATTRIBUTES)); - caption = eel_gconf_get_string (PREF_WEBALBUMS_IMAGE_ATTRIBUTES, DEFAULT_WEB_IMAGE_ATTRIBUTES); + caption = g_settings_get_string (data->settings, PREF_WEBALBUMS_IMAGE_ATTRIBUTES); gth_metadata_chooser_set_selection (GTH_METADATA_CHOOSER (data->image_attributes_chooser), caption); g_free (caption); @@ -493,7 +506,7 @@ { char *destination; - destination = eel_gconf_get_path (PREF_WEBALBUMS_DESTINATION, NULL); + destination = _g_settings_get_uri (data->settings, PREF_WEBALBUMS_DESTINATION); if (destination == NULL) destination = g_strdup (get_home_uri ()); gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (GET_WIDGET ("destination_filechooserbutton")), destination); diff -Nru gthumb-2.14.3/extensions/webalbums/gth-web-exporter.c gthumb-3.0.0/extensions/webalbums/gth-web-exporter.c --- gthumb-2.14.3/extensions/webalbums/gth-web-exporter.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/gth-web-exporter.c 2012-02-19 15:01:32.000000000 +0000 @@ -40,17 +40,8 @@ #define DEFAULT_INDEX_FILE "index.html" #define SAVING_TIMEOUT 5 -/* Default subdirectories. - * - Used as fallback when gconf values are empty or not accessible - * - Please keep in sync with values in gthumb.schemas.in - */ - -#define DEFAULT_WEB_DIR_PREVIEWS "previews" -#define DEFAULT_WEB_DIR_THUMBNAILS "thumbnails" -#define DEFAULT_WEB_DIR_IMAGES "images" -#define DEFAULT_WEB_DIR_HTML_IMAGES "html" -#define DEFAULT_WEB_DIR_HTML_INDEXES "html" -#define DEFAULT_WEB_DIR_THEME_FILES "theme" + +G_DEFINE_TYPE (GthWebExporter, gth_web_exporter, GTH_TYPE_TASK) typedef enum { @@ -75,7 +66,6 @@ extern GFileInputStream *yy_istream; -static GObjectClass *parent_class = NULL; typedef struct { GthFileData *file_data; @@ -1391,7 +1381,7 @@ case GTH_TAG_FILE_SIZE: idx = get_image_idx (tag, self); idata = g_list_nth (self->priv->file_list, idx)->data; - line = g_format_size_for_display (g_file_info_get_size (idata->file_data->info)); + line = g_format_size (g_file_info_get_size (idata->file_data->info)); write_markup_escape_line (ostream, line, error); break; @@ -2918,6 +2908,7 @@ { GthWebExporter *self; GError *error = NULL; + GSettings *settings; GString *required_attributes; g_return_if_fail (GTH_IS_WEB_EXPORTER (task)); @@ -2954,15 +2945,20 @@ if (self->priv->images_per_index % self->priv->columns_per_page > 0) self->priv->rows_per_page++; - /* get index file name and subdirs from gconf (hidden prefs) */ + /* get index file name and sub-directories (hidden preferences) */ - self->priv->index_file = eel_gconf_get_string (PREF_WEBALBUMS_INDEX_FILE, DEFAULT_INDEX_FILE); - self->priv->directories.previews = eel_gconf_get_string (PREF_WEBALBUMS_DIR_PREVIEWS, DEFAULT_WEB_DIR_PREVIEWS); - self->priv->directories.thumbnails = eel_gconf_get_string (PREF_WEBALBUMS_DIR_THUMBNAILS, DEFAULT_WEB_DIR_THUMBNAILS); - self->priv->directories.images = eel_gconf_get_string (PREF_WEBALBUMS_DIR_IMAGES, DEFAULT_WEB_DIR_IMAGES); - self->priv->directories.html_images = eel_gconf_get_string (PREF_WEBALBUMS_DIR_HTML_IMAGES, DEFAULT_WEB_DIR_HTML_IMAGES); - self->priv->directories.html_indexes = eel_gconf_get_string (PREF_WEBALBUMS_DIR_HTML_INDEXES, DEFAULT_WEB_DIR_HTML_INDEXES); - self->priv->directories.theme_files = eel_gconf_get_string (PREF_WEBALBUMS_DIR_THEME_FILES, DEFAULT_WEB_DIR_THEME_FILES); + settings = g_settings_new (GTHUMB_WEBALBUMS_SCHEMA); + self->priv->index_file = g_settings_get_string (settings, PREF_WEBALBUMS_INDEX_FILE); + g_object_unref (settings); + + settings = g_settings_new (GTHUMB_WEBALBUMS_DIRECTORIES_SCHEMA); + self->priv->directories.previews = g_settings_get_string (settings, PREF_WEBALBUMS_DIR_PREVIEWS); + self->priv->directories.thumbnails = g_settings_get_string (settings, PREF_WEBALBUMS_DIR_THUMBNAILS); + self->priv->directories.images = g_settings_get_string (settings, PREF_WEBALBUMS_DIR_IMAGES); + self->priv->directories.html_images = g_settings_get_string (settings, PREF_WEBALBUMS_DIR_HTML_IMAGES); + self->priv->directories.html_indexes = g_settings_get_string (settings, PREF_WEBALBUMS_DIR_HTML_INDEXES); + self->priv->directories.theme_files = g_settings_get_string (settings, PREF_WEBALBUMS_DIR_THEME_FILES); + g_object_unref (settings); /* create a tmp dir */ @@ -3100,7 +3096,7 @@ } _g_object_list_unref (self->priv->gfile_list); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_web_exporter_parent_class)->finalize (object); } @@ -3110,7 +3106,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthWebExporterPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -3166,34 +3161,6 @@ } -GType -gth_web_exporter_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthWebExporterClass), - NULL, - NULL, - (GClassInitFunc) gth_web_exporter_class_init, - NULL, - NULL, - sizeof (GthWebExporter), - 0, - (GInstanceInitFunc) gth_web_exporter_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthWebExporter", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_web_exporter_new (GthBrowser *browser, GList *file_list) diff -Nru gthumb-2.14.3/extensions/webalbums/Makefile.am gthumb-3.0.0/extensions/webalbums/Makefile.am --- gthumb-2.14.3/extensions/webalbums/Makefile.am 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/Makefile.am 2012-04-20 21:23:07.000000000 +0000 @@ -34,7 +34,10 @@ libwebalbums_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb -DWEBALBUM_DATADIR=\"$(webalbum_datadir)\" libwebalbums_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -libwebalbums_la_LIBADD = $(GTHUMB_LIBS) ../image_rotation/libimage_rotation.la ../export_tools/libexport_tools.la +libwebalbums_la_LIBADD = $(GTHUMB_LIBS) ../export_tools/libexport_tools.la +if ENABLE_JPEG_TOOLS +libwebalbums_la_LIBADD += ../image_rotation/libimage_rotation.la +endif libwebalbums_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) extensioninidir = $(extensiondir) diff -Nru gthumb-2.14.3/extensions/webalbums/Makefile.in gthumb-3.0.0/extensions/webalbums/Makefile.in --- gthumb-2.14.3/extensions/webalbums/Makefile.in 2012-03-25 18:34:15.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/Makefile.in 2012-04-23 18:09:51.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,6 +52,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +@ENABLE_JPEG_TOOLS_TRUE@@ENABLE_WEB_ALBUMS_TRUE@am__append_1 = ../image_rotation/libimage_rotation.la subdir = extensions/webalbums DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -137,6 +155,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(extensionini_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -216,10 +239,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -227,6 +248,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -266,6 +288,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -314,8 +338,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -346,6 +368,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -398,7 +421,9 @@ @ENABLE_WEB_ALBUMS_TRUE@@RUN_IN_PLACE_TRUE@webalbum_datadir = $(abs_top_srcdir)/extensions/webalbums/data @ENABLE_WEB_ALBUMS_TRUE@libwebalbums_la_CFLAGS = $(GTHUMB_CFLAGS) -I$(top_srcdir) -I$(top_builddir)/gthumb -DWEBALBUM_DATADIR=\"$(webalbum_datadir)\" @ENABLE_WEB_ALBUMS_TRUE@libwebalbums_la_LDFLAGS = $(EXTENSION_LIBTOOL_FLAGS) -@ENABLE_WEB_ALBUMS_TRUE@libwebalbums_la_LIBADD = $(GTHUMB_LIBS) ../image_rotation/libimage_rotation.la ../export_tools/libexport_tools.la +@ENABLE_WEB_ALBUMS_TRUE@libwebalbums_la_LIBADD = $(GTHUMB_LIBS) \ +@ENABLE_WEB_ALBUMS_TRUE@ ../export_tools/libexport_tools.la \ +@ENABLE_WEB_ALBUMS_TRUE@ $(am__append_1) @ENABLE_WEB_ALBUMS_TRUE@libwebalbums_la_DEPENDENCIES = $(top_builddir)/gthumb/gthumb$(EXEEXT) @ENABLE_WEB_ALBUMS_TRUE@extensioninidir = $(extensiondir) @ENABLE_WEB_ALBUMS_TRUE@extensionini_DATA = $(extensionini_in_files:.extension.in.in=.extension) @@ -452,7 +477,6 @@ $(am__aclocal_m4_deps): install-extensionLTLIBRARIES: $(extension_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)" @list='$(extension_LTLIBRARIES)'; test -n "$(extensiondir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -460,6 +484,8 @@ else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensiondir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensiondir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(extensiondir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(extensiondir)"; \ } @@ -575,8 +601,11 @@ -rm -rf .libs _libs install-extensioniniDATA: $(extensionini_DATA) @$(NORMAL_INSTALL) - test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" @list='$(extensionini_DATA)'; test -n "$(extensioninidir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(extensioninidir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(extensioninidir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -759,13 +788,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/extensions/webalbums/preferences.h gthumb-3.0.0/extensions/webalbums/preferences.h --- gthumb-2.14.3/extensions/webalbums/preferences.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/preferences.h 2012-02-19 15:01:32.000000000 +0000 @@ -26,34 +26,44 @@ G_BEGIN_DECLS -#define PREF_WEBALBUMS_INDEX_FILE "/apps/gthumb/ext/webalbums/index_file" -#define PREF_WEBALBUMS_DIR_PREVIEWS "/apps/gthumb/ext/webalbums/directories/previews" -#define PREF_WEBALBUMS_DIR_THUMBNAILS "/apps/gthumb/ext/webalbums/directories/thumbnails" -#define PREF_WEBALBUMS_DIR_IMAGES "/apps/gthumb/ext/webalbums/directories/images" -#define PREF_WEBALBUMS_DIR_HTML_IMAGES "/apps/gthumb/ext/webalbums/directories/html_images" -#define PREF_WEBALBUMS_DIR_HTML_INDEXES "/apps/gthumb/ext/webalbums/directories/html_indexes" -#define PREF_WEBALBUMS_DIR_THEME_FILES "/apps/gthumb/ext/webalbums/directories/theme_files" -#define PREF_WEBALBUMS_DESTINATION "/apps/gthumb/ext/webalbums/destination" -#define PREF_WEBALBUMS_COPY_IMAGES "/apps/gthumb/ext/webalbums/copy_images" -#define PREF_WEBALBUMS_RESIZE_IMAGES "/apps/gthumb/ext/webalbums/resize_images" -#define PREF_WEBALBUMS_RESIZE_WIDTH "/apps/gthumb/ext/webalbums/resize_width" -#define PREF_WEBALBUMS_RESIZE_HEIGHT "/apps/gthumb/ext/webalbums/resize_height" -#define PREF_WEBALBUMS_IMAGES_PER_INDEX "/apps/gthumb/ext/webalbums/images_per_index" -#define PREF_WEBALBUMS_SINGLE_INDEX "/apps/gthumb/ext/webalbums/single_index" -#define PREF_WEBALBUMS_COLUMNS "/apps/gthumb/ext/webalbums/columns" -#define PREF_WEBALBUMS_ADAPT_TO_WIDTH "/apps/gthumb/ext/webalbums/adapt_to_width" -#define PREF_WEBALBUMS_SORT_TYPE "/apps/gthumb/ext/webalbums/sort_type" -#define PREF_WEBALBUMS_SORT_INVERSE "/apps/gthumb/ext/webalbums/sort_inverse" -#define PREF_WEBALBUMS_HEADER "/apps/gthumb/ext/webalbums/header" -#define PREF_WEBALBUMS_FOOTER "/apps/gthumb/ext/webalbums/footer" -#define PREF_WEBALBUMS_IMAGE_PAGE_HEADER "/apps/gthumb/ext/webalbums/image_page_header" -#define PREF_WEBALBUMS_IMAGE_PAGE_FOOTER "/apps/gthumb/ext/webalbums/image_page_footer" -#define PREF_WEBALBUMS_THEME "/apps/gthumb/ext/webalbums/theme" -#define PREF_WEBALBUMS_ENABLE_THUMBNAIL_CAPTION "/apps/gthumb/ext/webalbums/enable_thumbnail_caption" -#define PREF_WEBALBUMS_THUMBNAIL_CAPTION "/apps/gthumb/ext/webalbums/thumbnail_caption" -#define PREF_WEBALBUMS_ENABLE_IMAGE_DESCRIPTION "/apps/gthumb/ext/webalbums/enable_image_description" -#define PREF_WEBALBUMS_ENABLE_IMAGE_ATTRIBUTES "/apps/gthumb/ext/webalbums/enable_image_attributes" -#define PREF_WEBALBUMS_IMAGE_ATTRIBUTES "/apps/gthumb/ext/webalbums/image_attributes" +/* schemas */ + +#define GTHUMB_WEBALBUMS_SCHEMA GTHUMB_SCHEMA ".webalbums" +#define GTHUMB_WEBALBUMS_DIRECTORIES_SCHEMA GTHUMB_WEBALBUMS_SCHEMA ".directories" + +/* keys: webalbums */ + +#define PREF_WEBALBUMS_INDEX_FILE "index-file" +#define PREF_WEBALBUMS_DESTINATION "destination" +#define PREF_WEBALBUMS_COPY_IMAGES "copy-images" +#define PREF_WEBALBUMS_RESIZE_IMAGES "resize-images" +#define PREF_WEBALBUMS_RESIZE_WIDTH "resize-width" +#define PREF_WEBALBUMS_RESIZE_HEIGHT "resize-height" +#define PREF_WEBALBUMS_IMAGES_PER_INDEX "images-per-index" +#define PREF_WEBALBUMS_SINGLE_INDEX "single-index" +#define PREF_WEBALBUMS_COLUMNS "columns" +#define PREF_WEBALBUMS_ADAPT_TO_WIDTH "adapt-to-width" +#define PREF_WEBALBUMS_SORT_TYPE "sort-type" +#define PREF_WEBALBUMS_SORT_INVERSE "sort-inverse" +#define PREF_WEBALBUMS_HEADER "header" +#define PREF_WEBALBUMS_FOOTER "footer" +#define PREF_WEBALBUMS_IMAGE_PAGE_HEADER "image-page-header" +#define PREF_WEBALBUMS_IMAGE_PAGE_FOOTER "image-page-footer" +#define PREF_WEBALBUMS_THEME "theme" +#define PREF_WEBALBUMS_ENABLE_THUMBNAIL_CAPTION "enable-thumbnail-caption" +#define PREF_WEBALBUMS_THUMBNAIL_CAPTION "thumbnail-caption" +#define PREF_WEBALBUMS_ENABLE_IMAGE_DESCRIPTION "enable-image-description" +#define PREF_WEBALBUMS_ENABLE_IMAGE_ATTRIBUTES "enable-image-attributes" +#define PREF_WEBALBUMS_IMAGE_ATTRIBUTES "image-attributes" + +/* keys: webalbums directories */ + +#define PREF_WEBALBUMS_DIR_PREVIEWS "previews" +#define PREF_WEBALBUMS_DIR_THUMBNAILS "thumbnails" +#define PREF_WEBALBUMS_DIR_IMAGES "images" +#define PREF_WEBALBUMS_DIR_HTML_IMAGES "html-images" +#define PREF_WEBALBUMS_DIR_HTML_INDEXES "html-indexes" +#define PREF_WEBALBUMS_DIR_THEME_FILES "theme-files" G_END_DECLS diff -Nru gthumb-2.14.3/extensions/webalbums/webalbums.extension.in.in gthumb-3.0.0/extensions/webalbums/webalbums.extension.in.in --- gthumb-2.14.3/extensions/webalbums/webalbums.extension.in.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/extensions/webalbums/webalbums.extension.in.in 2012-04-21 09:23:25.000000000 +0000 @@ -9,4 +9,5 @@ [Loader] Type=module File=%LIBRARY% +API=%GTHUMB_API_VERSION% Requires=export_tools diff -Nru gthumb-2.14.3/gthumb/cairo-utils.c gthumb-3.0.0/gthumb/cairo-utils.c --- gthumb-2.14.3/gthumb/cairo-utils.c 2011-11-06 09:39:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/cairo-utils.c 2012-02-19 15:01:32.000000000 +0000 @@ -56,6 +56,18 @@ } +gboolean +_cairo_rectangle_contains_point (cairo_rectangle_int_t *rect, + int x, + int y) +{ + return ((x >= rect->x) + && (y >= rect->y) + && (x <= rect->x + rect->width) + && (y <= rect->y + rect->height)); +} + + void _gdk_color_to_cairo_color (GdkColor *g_color, cairo_color_t *c_color) @@ -591,17 +603,6 @@ if (r == 0) { cairo_rectangle (cr, x, y, w, h); } - else if (r == 1) { - cairo_move_to (cr, x + 1, y); - cairo_rel_line_to (cr, w - 2, 0); - cairo_rel_line_to (cr, 1, 1); - cairo_rel_line_to (cr, 0, h - 2); - cairo_rel_line_to (cr, -1, 1); - cairo_rel_line_to (cr, - (w - 2), 0); - cairo_rel_line_to (cr, -1, -1); - cairo_rel_line_to (cr, 0, - (h - 2)); - cairo_rel_line_to (cr, 1, -1); - } else { cairo_move_to (cr, x, y + r); if (r > 0) @@ -782,9 +783,9 @@ void -_cairo_paint_grid (cairo_t *cr, - GdkRectangle *rectangle, - GthGridType grid_type) +_cairo_paint_grid (cairo_t *cr, + cairo_rectangle_int_t *rectangle, + GthGridType grid_type) { double ux, uy; diff -Nru gthumb-2.14.3/gthumb/cairo-utils.h gthumb-3.0.0/gthumb/cairo-utils.h --- gthumb-2.14.3/gthumb/cairo-utils.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/cairo-utils.h 2012-02-19 15:01:32.000000000 +0000 @@ -132,83 +132,86 @@ /* math */ -int _cairo_multiply_alpha (int color, - int alpha); +int _cairo_multiply_alpha (int color, + int alpha); +gboolean _cairo_rectangle_contains_point (cairo_rectangle_int_t *rect, + int x, + int y); /* colors */ -void _gdk_color_to_cairo_color (GdkColor *g_color, - cairo_color_t *c_color); -void _gdk_color_to_cairo_color_255 (GdkColor *g_color, - cairo_color_255_t *c_color); +void _gdk_color_to_cairo_color (GdkColor *g_color, + cairo_color_t *c_color); +void _gdk_color_to_cairo_color_255 (GdkColor *g_color, + cairo_color_255_t *c_color); /* surface */ -void _cairo_clear_surface (cairo_surface_t **surface); +void _cairo_clear_surface (cairo_surface_t **surface); cairo_surface_metadata_t * - _cairo_image_surface_get_metadata (cairo_surface_t *surface); -gboolean _cairo_image_surface_get_has_alpha (cairo_surface_t *surface); -cairo_surface_t * _cairo_image_surface_copy (cairo_surface_t *surface); -cairo_surface_t * _cairo_image_surface_copy_subsurface (cairo_surface_t *surface, - int src_x, - int src_y, - int width, - int height); -cairo_surface_t * _cairo_image_surface_create_from_pixbuf (GdkPixbuf *pixbuf); -cairo_surface_t * _cairo_image_surface_create_compatible (cairo_surface_t *surface); -cairo_surface_t * _cairo_image_surface_scale_to (cairo_surface_t *surface, - int width, - int height, - cairo_filter_t filter); -void _cairo_image_surface_transform_get_steps (cairo_format_t format, - int width, - int height, - GthTransform transform, - int *destination_width_p, - int *destination_height_p, - int *line_start_p, - int *line_step_p, - int *pixel_step_p); -cairo_surface_t * _cairo_image_surface_transform (cairo_surface_t *surface, - GthTransform transform); + _cairo_image_surface_get_metadata (cairo_surface_t *surface); +gboolean _cairo_image_surface_get_has_alpha (cairo_surface_t *surface); +cairo_surface_t * _cairo_image_surface_copy (cairo_surface_t *surface); +cairo_surface_t * _cairo_image_surface_copy_subsurface (cairo_surface_t *surface, + int src_x, + int src_y, + int width, + int height); +cairo_surface_t * _cairo_image_surface_create_from_pixbuf (GdkPixbuf *pixbuf); +cairo_surface_t * _cairo_image_surface_create_compatible (cairo_surface_t *surface); +cairo_surface_t * _cairo_image_surface_scale_to (cairo_surface_t *surface, + int width, + int height, + cairo_filter_t filter); +void _cairo_image_surface_transform_get_steps (cairo_format_t format, + int width, + int height, + GthTransform transform, + int *destination_width_p, + int *destination_height_p, + int *line_start_p, + int *line_step_p, + int *pixel_step_p); +cairo_surface_t * _cairo_image_surface_transform (cairo_surface_t *surface, + GthTransform transform); /* paint / draw */ -void _cairo_paint_full_gradient (cairo_surface_t *surface, - GdkColor *h_color1, - GdkColor *h_color2, - GdkColor *v_color1, - GdkColor *v_color2); -void _cairo_draw_rounded_box (cairo_t *cr, - double x, - double y, - double w, - double h, - double r); -void _cairo_draw_drop_shadow (cairo_t *cr, - double x, - double y, - double w, - double h, - double r); -void _cairo_draw_frame (cairo_t *cr, - double x, - double y, - double w, - double h, - double r); -void _cairo_draw_slide (cairo_t *cr, - double frame_x, - double frame_y, - double frame_width, - double frame_height, - double image_width, - double image_height, - GdkColor *frame_color, - gboolean draw_inner_border); -void _cairo_paint_grid (cairo_t *cr, - GdkRectangle *rectangle, - GthGridType grid_type); +void _cairo_paint_full_gradient (cairo_surface_t *surface, + GdkColor *h_color1, + GdkColor *h_color2, + GdkColor *v_color1, + GdkColor *v_color2); +void _cairo_draw_rounded_box (cairo_t *cr, + double x, + double y, + double w, + double h, + double r); +void _cairo_draw_drop_shadow (cairo_t *cr, + double x, + double y, + double w, + double h, + double r); +void _cairo_draw_frame (cairo_t *cr, + double x, + double y, + double w, + double h, + double r); +void _cairo_draw_slide (cairo_t *cr, + double frame_x, + double frame_y, + double frame_width, + double frame_height, + double image_width, + double image_height, + GdkColor *frame_color, + gboolean draw_inner_border); +void _cairo_paint_grid (cairo_t *cr, + cairo_rectangle_int_t *rectangle, + GthGridType grid_type); #endif /* CAIRO_UTILS_H */ diff -Nru gthumb-2.14.3/gthumb/dlg-location.c gthumb-3.0.0/gthumb/dlg-location.c --- gthumb-2.14.3/gthumb/dlg-location.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/gthumb/dlg-location.c 2012-03-26 15:49:30.000000000 +0000 @@ -0,0 +1,458 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2001-2012 The Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include "dlg-location.h" +#include "glib-utils.h" +#include "gth-browser.h" +#include "gth-file-source-vfs.h" +#include "gth-main.h" +#include "gtk-utils.h" + + +#define GET_WIDGET(name) _gtk_builder_get_widget (data->builder, (name)) +#define UPDATE_DELAY 200 + + +enum { + COMPLETION_NAME_COLUMN = 0, + COMPLETION_N_COLUMNS +}; + + +typedef struct _DialogData DialogData; + + +typedef struct { + guint ref_count; + char *uri; + GFile *folder; + GthFileSource *source; + DialogData *data; + gboolean keep_scheme; +} CompletionJob; + + +struct _DialogData { + guint ref_count; + GthBrowser *browser; + GtkBuilder *builder; + GtkWidget *dialog; + GtkEntryCompletion *completion; + GtkListStore *completion_store; + guint update_event; + CompletionJob *job; + GFile *last_folder; +}; + + +static DialogData * +dialog_data_ref (DialogData *data) +{ + data->ref_count++; + return data; +} + + +static void completion_job_unref (CompletionJob *job); + + +static void +dialog_data_unref (DialogData *data) +{ + if (data == NULL) + return; + + data->ref_count--; + if (data->ref_count > 0) + return; + + if (data->update_event != 0) + g_source_remove (data->update_event); + data->update_event = 0; + g_object_unref (data->builder); + completion_job_unref (data->job); + _g_object_unref (data->last_folder); + g_free (data); +} + + +static CompletionJob * +completion_job_new_for_uri (DialogData *data, + const char *uri) +{ + CompletionJob *job = NULL; + + job = g_new0 (CompletionJob, 1); + job->ref_count = 1; + job->data = dialog_data_ref (data); + job->uri = g_strdup (uri); + job->source = gth_main_get_file_source_for_uri (job->uri); + if (job->source == NULL) { + completion_job_unref (job); + job = NULL; + } + job->folder = NULL; + + return job; +} + + +static void +completion_job_ref (CompletionJob *job) +{ + job->ref_count++; +} + + +static void +completion_job_unref (CompletionJob *job) +{ + if (job == NULL) + return; + job->ref_count--; + if (job->ref_count > 0) + return; + + _g_object_unref (job->source); + job->source = NULL; + dialog_data_unref (job->data); + _g_object_unref (job->folder); + g_free (job->uri); + g_free (job); +} + + +static void +destroy_cb (GtkWidget *widget, + DialogData *data) +{ + gth_browser_set_dialog (data->browser, "location", NULL); + if ((data->job != NULL) && (data->job->source != NULL)) + gth_file_source_cancel (data->job->source); + dialog_data_unref (data); +} + + +static void +cancel_button_clicked_cb (GtkWidget *widget, + DialogData *data) +{ + gtk_widget_destroy (data->dialog); +} + + +static char * +get_location_uri (DialogData *data, + gboolean *has_scheme, + GError **error) +{ + char *uri; + char *scheme; + + uri = g_strdup (gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("location_entry")))); + scheme = _g_uri_get_scheme (uri); + if (scheme == NULL) { + char *tmp = uri; + uri = g_filename_to_uri (tmp, NULL, error); + g_free (tmp); + } + if (has_scheme != NULL) + *has_scheme = (scheme != NULL); + + g_free (scheme); + + return uri; +} + + +static void +ok_button_clicked_cb (GtkWidget *widget, + DialogData *data) +{ + char *uri; + GError *error = NULL; + GFile *location; + + uri = get_location_uri (data, NULL, &error); + if (uri == NULL) { + char *title; + + title = g_strdup_printf (_("Could not load the position \"%s\""), gtk_entry_get_text (GTK_ENTRY (GET_WIDGET ("location_entry")))); + _gtk_error_dialog_from_gerror_show (GTK_WINDOW (GET_WIDGET ("location_dialog")), title, error); + + g_free (title); + g_clear_error (&error); + + return; + } + + location = g_file_new_for_uri (uri); + gth_browser_load_location (data->browser, location); + + g_object_unref (location); + g_free (uri); + gtk_widget_destroy (data->dialog); +} + + +static int +file_data_compare_by_name (gconstpointer a, + gconstpointer b) +{ + GthFileData *fa = (GthFileData *) a; + GthFileData *fb = (GthFileData *) b; + const char *namea; + const char *nameb; + int result; + + namea = g_file_info_get_name (fa->info); + nameb = g_file_info_get_name (fb->info); + if ((namea == NULL) || (nameb == NULL)) { + if ((namea == NULL) && (nameb == NULL)) + return 0; + else if (namea == NULL) + return -1; + else + return 1; + } + else { + char *sa = g_utf8_collate_key_for_filename (namea, -1); + char *sb = g_utf8_collate_key_for_filename (nameb, -1); + result = strcmp (sa, sb); + + g_free (sa); + g_free (sb); + } + + return result; +} + + +static void +completion_job_list_ready_cb (GthFileSource *file_source, + GList *files, + GError *error, + gpointer user_data) +{ + CompletionJob *job = user_data; + DialogData *data; + GList *ordered; + GList *scan; + + if (error != NULL) { + completion_job_unref (job); + return; + } + + data = job->data; + + ordered = g_list_copy (files); + ordered = g_list_sort (ordered, file_data_compare_by_name); + + gtk_list_store_clear (data->completion_store); + for (scan = ordered; scan; scan = scan->next) { + GthFileData *file_data = scan->data; + + if (g_file_info_get_file_type (file_data->info) == G_FILE_TYPE_DIRECTORY) { + GtkTreeIter iter; + GFile *child; + char *uri; + + child = g_file_get_child (job->folder, g_file_info_get_name (file_data->info)); + if (job->keep_scheme) + uri = g_file_get_uri (child); + else + uri = g_file_get_path (child); + + gtk_list_store_append (data->completion_store, &iter); + gtk_list_store_set (data->completion_store, &iter, + COMPLETION_NAME_COLUMN, uri, + -1); + + g_free (uri); + g_object_unref (child); + } + } + + g_list_free (ordered); + + if (job == data->job) { + completion_job_unref (data->job); + data->job = NULL; + } + completion_job_unref (job); +} + + +static void +update_completion_list (DialogData *data) +{ + gboolean has_scheme; + char *uri; + + + uri = get_location_uri (data, &has_scheme, NULL); + if (uri == NULL) { + _g_object_unref (data->last_folder); + data->last_folder = NULL; + gtk_list_store_clear (data->completion_store); + return; + } + + if (data->job != NULL) { + if (data->job->source != NULL) + gth_file_source_cancel (data->job->source); + completion_job_unref (data->job); + } + + data->job = completion_job_new_for_uri (data, uri); + if (data->job != NULL) { + data->job->keep_scheme = has_scheme; + data->job->folder = g_file_new_for_uri (uri); + if (! g_str_has_suffix (uri, "/")) { + GFile *parent; + + parent = g_file_get_parent (data->job->folder); + if (parent != NULL) { + g_object_unref (data->job->folder); + data->job->folder = parent; + } + } + + if ((data->last_folder == NULL) || ! g_file_equal (data->last_folder, data->job->folder)) { + _g_object_unref (data->last_folder); + data->last_folder = g_object_ref (data->job->folder); + + completion_job_ref (data->job); + gth_file_source_list (data->job->source, + data->job->folder, + "standard::type,standard::name", + completion_job_list_ready_cb, + data->job); + } + else { + completion_job_unref (data->job); + data->job = NULL; + } + + } + + g_free (uri); +} + + +static gboolean +update_completion_list_cb (gpointer user_data) +{ + DialogData *data = user_data; + + data->update_event = 0; + update_completion_list (data); + + return FALSE; +} + + +static void +location_entry_changed_cb (GtkEntry *entry, + GParamSpec *pspec, + gpointer user_data) +{ + DialogData *data = user_data; + + if (data->update_event != 0) + g_source_remove (data->update_event); + data->update_event = g_timeout_add (UPDATE_DELAY, update_completion_list_cb, data); +} + + +void +dlg_location (GthBrowser *browser) +{ + DialogData *data; + char *text; + GFile *location; + GthFileSource *source; + + if (gth_browser_get_dialog (browser, "location") != NULL) { + gtk_window_present (GTK_WINDOW (gth_browser_get_dialog (browser, "location"))); + return; + } + + data = g_new0 (DialogData, 1); + data->ref_count = 1; + data->browser = browser; + data->builder = _gtk_builder_new_from_file ("location.ui", NULL); + data->dialog = GET_WIDGET ("location_dialog"); + + gth_browser_set_dialog (browser, "location", data->dialog); + + /* set the widget data */ + + data->completion = gtk_entry_completion_new (); + gtk_entry_completion_set_popup_completion (data->completion, TRUE); + gtk_entry_completion_set_popup_single_match (data->completion, FALSE); + gtk_entry_completion_set_inline_completion (data->completion, TRUE); + data->completion_store = gtk_list_store_new (COMPLETION_N_COLUMNS, G_TYPE_STRING); + gtk_entry_completion_set_model (data->completion, GTK_TREE_MODEL (data->completion_store)); + g_object_unref (data->completion_store); + gtk_entry_completion_set_text_column (data->completion, COMPLETION_NAME_COLUMN); + gtk_entry_set_completion (GTK_ENTRY (GET_WIDGET ("location_entry")), data->completion); + + text = NULL; + location = gth_browser_get_location (browser); + source = gth_main_get_file_source (location); + if (GTH_IS_FILE_SOURCE_VFS (source)) + text = g_file_get_path (location); + if (text == NULL) + text = g_file_get_uri (location); + gtk_entry_set_text (GTK_ENTRY (GET_WIDGET ("location_entry")), text); + + g_free (text); + g_object_unref (source); + + /* set the signals handlers. */ + + g_signal_connect (G_OBJECT (data->dialog), + "destroy", + G_CALLBACK (destroy_cb), + data); + g_signal_connect (G_OBJECT (GET_WIDGET ("cancel_button")), + "clicked", + G_CALLBACK (cancel_button_clicked_cb), + data); + g_signal_connect (G_OBJECT (GET_WIDGET ("ok_button")), + "clicked", + G_CALLBACK (ok_button_clicked_cb), + data); + g_signal_connect (GET_WIDGET ("location_entry"), + "notify::text", + G_CALLBACK (location_entry_changed_cb), + data); + + /* run dialog. */ + + update_completion_list (data); + gtk_window_set_transient_for (GTK_WINDOW (data->dialog), GTK_WINDOW (browser)); + gtk_widget_show (data->dialog); +} diff -Nru gthumb-2.14.3/gthumb/dlg-location.h gthumb-3.0.0/gthumb/dlg-location.h --- gthumb-2.14.3/gthumb/dlg-location.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/gthumb/dlg-location.h 2012-03-25 11:31:33.000000000 +0000 @@ -0,0 +1,29 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2001-2012 The Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef DLG_LOCATION_H +#define DLG_LOCATION_H + +#include "gth-browser.h" + +void dlg_location (GthBrowser *browser); + +#endif /* DLG_LOCATION_H */ diff -Nru gthumb-2.14.3/gthumb/dlg-personalize-filters.c gthumb-3.0.0/gthumb/dlg-personalize-filters.c --- gthumb-2.14.3/gthumb/dlg-personalize-filters.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/dlg-personalize-filters.c 2012-02-19 15:01:32.000000000 +0000 @@ -22,7 +22,6 @@ #include #include #include "dlg-personalize-filters.h" -#include "gconf-utils.h" #include "glib-utils.h" #include "gth-filter-editor-dialog.h" #include "gth-main.h" @@ -46,6 +45,7 @@ typedef struct { GthBrowser *browser; GtkBuilder *builder; + GSettings *settings; GtkWidget *dialog; GtkWidget *list_view; GtkWidget *general_filter_combobox; @@ -69,6 +69,7 @@ _g_string_list_free (data->general_tests); g_object_unref (data->builder); + g_object_unref (data->settings); g_free (data); } @@ -489,7 +490,7 @@ int idx; idx = gtk_combo_box_get_active (widget); - eel_gconf_set_string (PREF_GENERAL_FILTER, g_list_nth (data->general_tests, idx)->data); + g_settings_set_string (data->settings, PREF_BROWSER_GENERAL_FILTER, g_list_nth (data->general_tests, idx)->data); } @@ -510,6 +511,7 @@ data = g_new0 (DialogData, 1); data->browser = browser; data->builder = _gtk_builder_new_from_file ("personalize-filters.ui", NULL); + data->settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); /* Get the widgets. */ @@ -520,7 +522,7 @@ /* Set widgets data. */ tests = gth_main_get_registered_objects_id (GTH_TYPE_TEST); - general_filter = eel_gconf_get_string (PREF_GENERAL_FILTER, DEFAULT_GENERAL_FILTER); + general_filter = g_settings_get_string (data->settings, PREF_BROWSER_GENERAL_FILTER); active_filter = 0; data->general_filter_combobox = gtk_combo_box_text_new (); diff -Nru gthumb-2.14.3/gthumb/dlg-preferences.c gthumb-3.0.0/gthumb/dlg-preferences.c --- gthumb-2.14.3/gthumb/dlg-preferences.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/dlg-preferences.c 2012-03-31 09:42:32.000000000 +0000 @@ -22,7 +22,6 @@ #include #include #include "dlg-preferences.h" -#include "gconf-utils.h" #include "gth-browser.h" #include "gth-enum-types.h" #include "gth-file-source-vfs.h" @@ -41,9 +40,10 @@ GthBrowser *browser; GtkBuilder *builder; GtkWidget *dialog; - GtkWidget *toolbar_style_combobox; - GtkWidget *thumbnail_size_combobox; GtkWidget *thumbnail_caption_chooser; + GSettings *general_settings; + GSettings *browser_settings; + GSettings *messages_settings; } DialogData; static int thumb_size[] = { 48, 64, 85, 95, 112, 128, 164, 200, 256 }; @@ -67,15 +67,15 @@ { /* Startup dir. */ - eel_gconf_set_boolean (PREF_GO_TO_LAST_LOCATION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("go_to_last_location_radiobutton")))); - eel_gconf_set_boolean (PREF_USE_STARTUP_LOCATION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("use_startup_location_radiobutton")))); - eel_gconf_set_boolean (PREF_STORE_METADATA_IN_FILES, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("embed_metadata_checkbutton")))); + g_settings_set_boolean (data->browser_settings, PREF_BROWSER_GO_TO_LAST_LOCATION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("go_to_last_location_radiobutton")))); + g_settings_set_boolean (data->browser_settings, PREF_BROWSER_USE_STARTUP_LOCATION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("use_startup_location_radiobutton")))); + g_settings_set_boolean (data->general_settings, PREF_GENERAL_STORE_METADATA_IN_FILES, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("embed_metadata_checkbutton")))); - if (eel_gconf_get_boolean (PREF_USE_STARTUP_LOCATION, FALSE)) { + if (g_settings_get_boolean (data->browser_settings, PREF_BROWSER_USE_STARTUP_LOCATION)) { char *location; location = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (GET_WIDGET ("startup_dir_filechooserbutton"))); - eel_gconf_set_path (PREF_STARTUP_LOCATION, location); + _g_settings_set_uri (data->browser_settings, PREF_BROWSER_STARTUP_LOCATION, location); gth_pref_set_startup_location (location); g_free (location); } @@ -90,6 +90,10 @@ { apply_changes (data); gth_browser_set_dialog (data->browser, "preferences", NULL); + + g_object_unref (data->general_settings); + g_object_unref (data->browser_settings); + g_object_unref (data->messages_settings); g_object_unref (data->builder); g_free (data); } @@ -107,7 +111,7 @@ help_button_clicked_cb (GtkWidget *widget, DialogData *data) { - show_help_dialog (GTK_WINDOW (data->dialog), "preferences"); + show_help_dialog (GTK_WINDOW (data->dialog), NULL); } @@ -146,7 +150,7 @@ toolbar_style_changed_cb (GtkWidget *widget, DialogData *data) { - eel_gconf_set_enum (PREF_UI_TOOLBAR_STYLE, GTH_TYPE_TOOLBAR_STYLE, gtk_combo_box_get_active (GTK_COMBO_BOX (data->toolbar_style_combobox))); + g_settings_set_enum (data->browser_settings, PREF_BROWSER_TOOLBAR_STYLE, gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("toolbar_style_combobox")))); } @@ -154,7 +158,23 @@ thumbnails_pane_orientation_changed_cb (GtkWidget *widget, DialogData *data) { - eel_gconf_set_enum (PREF_UI_VIEWER_THUMBNAILS_ORIENT, GTK_TYPE_ORIENTATION, gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnails_pane_orient_combobox")))); + g_settings_set_enum (data->browser_settings, PREF_BROWSER_VIEWER_THUMBNAILS_ORIENT, gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnails_pane_orient_combobox")))); +} + + +static void +file_properties_position_combobox_changed_cb (GtkWidget *widget, + DialogData *data) +{ + g_settings_set_boolean (data->browser_settings, PREF_BROWSER_PROPERTIES_ON_THE_RIGHT, gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("file_properties_position_combobox"))) == 1); +} + + +static void +reuse_active_window_checkbutton_toggled_cb (GtkToggleButton *button, + DialogData *data) +{ + g_settings_set_boolean (data->browser_settings, PREF_BROWSER_REUSE_ACTIVE_WINDOW, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reuse_active_window_checkbutton")))); } @@ -162,7 +182,7 @@ confirm_deletion_toggled_cb (GtkToggleButton *button, DialogData *data) { - eel_gconf_set_boolean (PREF_MSG_CONFIRM_DELETION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("confirm_deletion_checkbutton")))); + g_settings_set_boolean (data->messages_settings, PREF_MSG_CONFIRM_DELETION, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("confirm_deletion_checkbutton")))); } @@ -170,7 +190,7 @@ ask_to_save_toggled_cb (GtkToggleButton *button, DialogData *data) { - eel_gconf_set_boolean (PREF_MSG_SAVE_MODIFIED_IMAGE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("ask_to_save_checkbutton")))); + g_settings_set_boolean (data->messages_settings, PREF_MSG_SAVE_MODIFIED_IMAGE, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("ask_to_save_checkbutton")))); } @@ -178,7 +198,7 @@ thumbnail_size_changed_cb (GtkWidget *widget, DialogData *data) { - eel_gconf_set_integer (PREF_THUMBNAIL_SIZE, thumb_size[gtk_combo_box_get_active (GTK_COMBO_BOX (data->thumbnail_size_combobox))]); + g_settings_set_int (data->browser_settings, PREF_BROWSER_THUMBNAIL_SIZE, thumb_size[gtk_combo_box_get_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnail_size_combobox")))]); } @@ -186,7 +206,7 @@ fast_file_type_toggled_cb (GtkToggleButton *button, DialogData *data) { - eel_gconf_set_boolean (PREF_FAST_FILE_TYPE, ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("slow_mime_type_checkbutton")))); + g_settings_set_boolean (data->browser_settings, PREF_BROWSER_FAST_FILE_TYPE, ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("slow_mime_type_checkbutton")))); } @@ -197,7 +217,7 @@ char *attributes; attributes = gth_metadata_chooser_get_selection (chooser); - eel_gconf_set_string (PREF_THUMBNAIL_CAPTION, attributes); + g_settings_set_string (data->browser_settings, PREF_BROWSER_THUMBNAIL_CAPTION, attributes); g_free (attributes); } @@ -220,38 +240,25 @@ data->browser = browser; data->builder = _gtk_builder_new_from_file ("preferences.ui", NULL); data->dialog = GET_WIDGET ("preferences_dialog"); + data->general_settings = g_settings_new (GTHUMB_GENERAL_SCHEMA); + data->browser_settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + data->messages_settings = g_settings_new (GTHUMB_MESSAGES_SCHEMA); gth_browser_set_dialog (browser, "preferences", data->dialog); - eel_gconf_preload_cache ("/apps/gthumb/browser", GCONF_CLIENT_PRELOAD_ONELEVEL); - eel_gconf_preload_cache ("/apps/gthumb/ui", GCONF_CLIENT_PRELOAD_ONELEVEL); - - /* Set widgets data. */ - - data->toolbar_style_combobox = _gtk_combo_box_new_with_texts (_("System settings"), _("Text below icons"), _("Text beside icons"), _("Icons only"), _("Text only"), NULL); - data->thumbnail_size_combobox = _gtk_combo_box_new_with_texts ("48", "64", "85", "95", "112", "128", "164", "200", "256", NULL); - /* caption list */ data->thumbnail_caption_chooser = gth_metadata_chooser_new (GTH_METADATA_ALLOW_IN_FILE_LIST); gtk_widget_show (data->thumbnail_caption_chooser); gtk_container_add (GTK_CONTAINER (GET_WIDGET ("caption_scrolledwindow")), data->thumbnail_caption_chooser); - current_caption = eel_gconf_get_string (PREF_THUMBNAIL_CAPTION, DEFAULT_THUMBNAIL_CAPTION); + current_caption = g_settings_get_string (data->browser_settings, PREF_BROWSER_THUMBNAIL_CAPTION); gth_metadata_chooser_set_selection (GTH_METADATA_CHOOSER (data->thumbnail_caption_chooser), current_caption); g_free (current_caption); - gtk_widget_show (data->toolbar_style_combobox); - gtk_widget_show (data->thumbnail_size_combobox); - - gtk_box_pack_start (GTK_BOX (GET_WIDGET ("toolbar_style_combobox_box")), data->toolbar_style_combobox, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (GET_WIDGET ("thumbnail_size_box")), data->thumbnail_size_combobox, FALSE, FALSE, 0); - - gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("size_label")), data->thumbnail_size_combobox); - /* * general */ - if (eel_gconf_get_boolean (PREF_USE_STARTUP_LOCATION, FALSE)) + if (g_settings_get_boolean (data->browser_settings, PREF_BROWSER_USE_STARTUP_LOCATION)) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("use_startup_location_radiobutton")), TRUE); else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("go_to_last_location_radiobutton")), TRUE); @@ -261,7 +268,7 @@ gtk_widget_set_sensitive (GET_WIDGET ("set_to_current_button"), FALSE); } - startup_location = eel_gconf_get_path (PREF_STARTUP_LOCATION, NULL); + startup_location = _g_settings_get_uri (data->browser_settings, PREF_BROWSER_STARTUP_LOCATION); if (startup_location == NULL) startup_location = g_strdup (get_home_uri ()); file_source = gth_main_get_file_source_for_uri (startup_location); @@ -282,17 +289,28 @@ g_object_unref (file_source); g_free (startup_location); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("confirm_deletion_checkbutton")), eel_gconf_get_boolean (PREF_MSG_CONFIRM_DELETION, DEFAULT_MSG_CONFIRM_DELETION)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("ask_to_save_checkbutton")), eel_gconf_get_boolean (PREF_MSG_SAVE_MODIFIED_IMAGE, DEFAULT_MSG_SAVE_MODIFIED_IMAGE)); - gtk_combo_box_set_active (GTK_COMBO_BOX (data->toolbar_style_combobox), eel_gconf_get_enum (PREF_UI_TOOLBAR_STYLE, GTH_TYPE_TOOLBAR_STYLE, GTH_TOOLBAR_STYLE_SYSTEM)); - gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnails_pane_orient_combobox")), eel_gconf_get_enum (PREF_UI_VIEWER_THUMBNAILS_ORIENT, GTK_TYPE_ORIENTATION, GTK_ORIENTATION_HORIZONTAL)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("reuse_active_window_checkbutton")), + g_settings_get_boolean (data->browser_settings, PREF_BROWSER_REUSE_ACTIVE_WINDOW)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("confirm_deletion_checkbutton")), + g_settings_get_boolean (data->messages_settings, PREF_MSG_CONFIRM_DELETION)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("ask_to_save_checkbutton")), + g_settings_get_boolean (data->messages_settings, PREF_MSG_SAVE_MODIFIED_IMAGE)); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("toolbar_style_combobox")), + g_settings_get_enum (data->browser_settings, PREF_BROWSER_TOOLBAR_STYLE)); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnails_pane_orient_combobox")), + g_settings_get_enum (data->browser_settings, PREF_BROWSER_VIEWER_THUMBNAILS_ORIENT)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("embed_metadata_checkbutton")), eel_gconf_get_boolean (PREF_STORE_METADATA_IN_FILES, TRUE)); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("embed_metadata_checkbutton")), + g_settings_get_boolean (data->general_settings, PREF_GENERAL_STORE_METADATA_IN_FILES)); /* * browser */ - gtk_combo_box_set_active (GTK_COMBO_BOX (data->thumbnail_size_combobox), get_idx_from_size (eel_gconf_get_integer (PREF_THUMBNAIL_SIZE, DEFAULT_THUMBNAIL_SIZE))); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("slow_mime_type_checkbutton")), ! eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, DEFAULT_FAST_FILE_TYPE)); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("thumbnail_size_combobox")), + get_idx_from_size (g_settings_get_int (data->browser_settings, PREF_BROWSER_THUMBNAIL_SIZE))); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (GET_WIDGET ("slow_mime_type_checkbutton")), + ! g_settings_get_boolean (data->browser_settings, PREF_BROWSER_FAST_FILE_TYPE)); + gtk_combo_box_set_active (GTK_COMBO_BOX (GET_WIDGET ("file_properties_position_combobox")), + g_settings_get_boolean (data->browser_settings, PREF_BROWSER_PROPERTIES_ON_THE_RIGHT) ? 1 : 0); gth_hook_invoke ("dlg-preferences-construct", data->dialog, data->browser, data->builder); @@ -313,7 +331,7 @@ /* general */ - g_signal_connect (G_OBJECT (data->toolbar_style_combobox), + g_signal_connect (G_OBJECT (GET_WIDGET ("toolbar_style_combobox")), "changed", G_CALLBACK (toolbar_style_changed_cb), data); @@ -321,6 +339,10 @@ "changed", G_CALLBACK (thumbnails_pane_orientation_changed_cb), data); + g_signal_connect (GET_WIDGET ("file_properties_position_combobox"), + "changed", + G_CALLBACK (file_properties_position_combobox_changed_cb), + data); g_signal_connect (G_OBJECT (GET_WIDGET ("use_startup_location_radiobutton")), "toggled", G_CALLBACK (use_startup_toggled_cb), @@ -329,6 +351,10 @@ "clicked", G_CALLBACK (set_to_current_cb), data); + g_signal_connect (G_OBJECT (GET_WIDGET ("reuse_active_window_checkbutton")), + "toggled", + G_CALLBACK (reuse_active_window_checkbutton_toggled_cb), + data); g_signal_connect (G_OBJECT (GET_WIDGET ("confirm_deletion_checkbutton")), "toggled", G_CALLBACK (confirm_deletion_toggled_cb), @@ -340,7 +366,7 @@ /* browser */ - g_signal_connect (G_OBJECT (data->thumbnail_size_combobox), + g_signal_connect (G_OBJECT (GET_WIDGET ("thumbnail_size_combobox")), "changed", G_CALLBACK (thumbnail_size_changed_cb), data); diff -Nru gthumb-2.14.3/gthumb/dlg-preferences-extensions.c gthumb-3.0.0/gthumb/dlg-preferences-extensions.c --- gthumb-2.14.3/gthumb/dlg-preferences-extensions.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/dlg-preferences-extensions.c 2012-03-05 17:51:23.000000000 +0000 @@ -21,7 +21,6 @@ #include #include -#include "gconf-utils.h" #include "glib-utils.h" #include "gth-browser.h" #include "gth-main.h" @@ -31,7 +30,7 @@ #define GET_WIDGET(name) _gtk_builder_get_widget (data->builder, (name)) -#define DEFAULT_ICON "application-x-executable" +#define DEFAULT_ICON "application-extension" #define EXTENSION_CATEGORY_ALL "*" #define EXTENSION_CATEGORY_ENABLED "+" #define EXTENSION_CATEGORY_DISABLED "-" @@ -83,11 +82,12 @@ typedef struct { GthBrowser *browser; GtkBuilder *builder; + GSettings *settings; GtkWidget *dialog; GtkWidget *list_view; GtkListStore *list_store; GtkTreeModel *model_filter; - GSList *active_extensions; + GList *active_extensions; char *current_category; gboolean enabled_disabled_cardinality_changed; } BrowserData; @@ -97,8 +97,9 @@ static void browser_data_free (BrowserData *data) { - g_slist_foreach (data->active_extensions, (GFunc) g_free, NULL); - g_slist_free (data->active_extensions); + g_list_foreach (data->active_extensions, (GFunc) g_free, NULL); + g_list_free (data->active_extensions); + g_object_unref (data->settings); g_object_unref (data->builder); g_free (data->current_category); g_free (data); @@ -106,17 +107,17 @@ static gboolean -list_equal (GSList *list1, - GSList *list2) +list_equal (GList *list1, + GList *list2) { - GSList *sscan1; + GList *sscan1; - if (g_slist_length (list1) != g_slist_length (list2)) + if (g_list_length (list1) != g_list_length (list2)) return FALSE; for (sscan1 = list1; sscan1; sscan1 = sscan1->next) { - char *name1 = sscan1->data; - GSList *sscan2; + char *name1 = sscan1->data; + GList *sscan2; for (sscan2 = list2; sscan2; sscan2 = sscan2->next) { char *name2 = sscan2->data; @@ -143,7 +144,7 @@ GthExtensionDescription *description; char *text; - gtk_tree_model_get (tree_model, iter, 0, &description, -1); + gtk_tree_model_get (tree_model, iter, EXTENSION_DESCRIPTION_COLUMN, &description, -1); text = g_markup_printf_escaped ("%s\n%s", description->name, description->description); g_object_set (G_OBJECT (cell), "markup", text, NULL); @@ -163,7 +164,7 @@ { GthExtensionDescription *description; - gtk_tree_model_get (tree_model, iter, 0, &description, -1); + gtk_tree_model_get (tree_model, iter, EXTENSION_DESCRIPTION_COLUMN, &description, -1); if (description->icon_name != NULL) g_object_set (G_OBJECT (cell), "icon-name", description->icon_name, NULL); else @@ -183,7 +184,7 @@ { GthExtensionDescription *description; - gtk_tree_model_get (tree_model, iter, 0, &description, -1); + gtk_tree_model_get (tree_model, iter, EXTENSION_DESCRIPTION_COLUMN, &description, -1); g_object_set (G_OBJECT (cell), "active", gth_extension_description_is_active (description), NULL); g_object_unref (description); @@ -208,7 +209,7 @@ GError *error = NULL; GtkTreeIter child_iter; - gtk_tree_model_get (GTK_TREE_MODEL (data->model_filter), &iter, 0, &description, -1); + gtk_tree_model_get (GTK_TREE_MODEL (data->model_filter), &iter, EXTENSION_DESCRIPTION_COLUMN, &description, -1); gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER (data->model_filter), &child_iter, &iter); if (! gth_extension_description_is_active (description)) { if (! gth_extension_manager_activate (gth_main_get_default_extension_manager (), description->id, &error)) { @@ -216,7 +217,7 @@ g_clear_error (&error); } else { - gtk_list_store_set (data->list_store, &child_iter, 0, description, -1); + gtk_list_store_set (data->list_store, &child_iter, EXTENSION_DESCRIPTION_COLUMN, description, -1); data->enabled_disabled_cardinality_changed = TRUE; } } @@ -226,7 +227,7 @@ g_clear_error (&error); } else { - gtk_list_store_set (data->list_store, &child_iter, 0, description, -1); + gtk_list_store_set (data->list_store, &child_iter, EXTENSION_DESCRIPTION_COLUMN, description, -1); data->enabled_disabled_cardinality_changed = TRUE; } } @@ -266,7 +267,7 @@ renderer = gtk_cell_renderer_pixbuf_new (); gtk_tree_view_column_pack_start (column, renderer, FALSE); - g_object_set (renderer, "stock-size", GTK_ICON_SIZE_BUTTON, NULL); + g_object_set (renderer, "stock-size", GTK_ICON_SIZE_BUTTON, "xpad", 6, NULL); gtk_tree_view_column_set_cell_data_func (column, renderer, extension_icon_data_func_cb, data, NULL); renderer = gtk_cell_renderer_text_new (); @@ -316,8 +317,8 @@ GthExtensionDescription *description_b; int result; - gtk_tree_model_get (tree_model, iter_a, 0, &description_a, -1); - gtk_tree_model_get (tree_model, iter_b, 0, &description_b, -1); + gtk_tree_model_get (tree_model, iter_a, EXTENSION_DESCRIPTION_COLUMN, &description_a, -1); + gtk_tree_model_get (tree_model, iter_b, EXTENSION_DESCRIPTION_COLUMN, &description_b, -1); result = strcmp (description_a->name, description_b->name); @@ -529,7 +530,7 @@ if (! gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (data->list_view)), &model, &iter)) return; - gtk_tree_model_get (model, &iter, 0, &description, -1); + gtk_tree_model_get (model, &iter, EXTENSION_DESCRIPTION_COLUMN, &description, -1); dialog = gtk_about_dialog_new (); if (description->name != NULL) @@ -571,7 +572,7 @@ if (! gtk_tree_selection_get_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (data->list_view)), &model, &iter)) return; - gtk_tree_model_get (model, &iter, 0, &description, -1); + gtk_tree_model_get (model, &iter, EXTENSION_DESCRIPTION_COLUMN, &description, -1); extension = gth_extension_description_get_extension (description); gth_extension_configure (extension, GTK_WINDOW (data->dialog)); @@ -626,20 +627,20 @@ GthBrowser *browser, GtkBuilder *dialog_builder) { - BrowserData *data; - GtkWidget *notebook; - GtkWidget *page; - GthExtensionManager *manager; - GList *extensions; - GList *scan; - GSList *all_active_extensions; - GSList *s_scan; - GtkTreePath *first; - int i; - GtkWidget *label; + BrowserData *data; + GtkWidget *notebook; + GtkWidget *page; + GthExtensionManager *manager; + GList *extensions; + GList *scan; + char **all_active_extensions; + int i; + GtkTreePath *first; + GtkWidget *label; data = g_new0 (BrowserData, 1); data->builder = _gtk_builder_new_from_file ("extensions-preferences.ui", NULL); + data->settings = g_settings_new (GTHUMB_GENERAL_SCHEMA); data->dialog = dialog; data->enabled_disabled_cardinality_changed = FALSE; @@ -647,20 +648,19 @@ manager = gth_main_get_default_extension_manager (); data->active_extensions = NULL; - all_active_extensions = eel_gconf_get_string_list (PREF_ACTIVE_EXTENSIONS); - for (s_scan = all_active_extensions; s_scan; s_scan = s_scan->next) { - char *name = s_scan->data; + all_active_extensions = g_settings_get_strv (data->settings, PREF_GENERAL_ACTIVE_EXTENSIONS); + for (i = 0; all_active_extensions[i] != NULL; i++) { + char *name = all_active_extensions[i]; GthExtensionDescription *description; description = gth_extension_manager_get_description (manager, name); if ((description == NULL) || description->mandatory || description->hidden) continue; - data->active_extensions = g_slist_prepend (data->active_extensions, g_strdup (name)); + data->active_extensions = g_list_prepend (data->active_extensions, g_strdup (name)); } - data->active_extensions = g_slist_reverse (data->active_extensions); - g_slist_foreach (all_active_extensions, (GFunc) g_free, NULL); - g_slist_free (all_active_extensions); + data->active_extensions = g_list_reverse (data->active_extensions); + g_strfreev (all_active_extensions); notebook = _gtk_builder_get_widget (dialog_builder, "notebook"); page = _gtk_builder_get_widget (data->builder, "preferences_page"); @@ -784,9 +784,9 @@ GtkBuilder *dialog_builder) { BrowserData *data; - GSList *active_extensions; + GList *active_extensions; GthExtensionManager *manager; - GList *names; + GList *extension_names; GList *scan; data = g_object_get_data (G_OBJECT (dialog), BROWSER_DATA_KEY); @@ -794,20 +794,20 @@ active_extensions = NULL; manager = gth_main_get_default_extension_manager (); - names = gth_extension_manager_get_extensions (manager); - for (scan = names; scan; scan = scan->next) { - char *name = scan->data; + extension_names = gth_extension_manager_get_extensions (manager); + for (scan = extension_names; scan; scan = scan->next) { + char *extension_name = scan->data; GthExtensionDescription *description; - description = gth_extension_manager_get_description (manager, name); + description = gth_extension_manager_get_description (manager, extension_name); if ((description == NULL) || description->mandatory || description->hidden) continue; if (gth_extension_description_is_active (description)) - active_extensions = g_slist_prepend (active_extensions, g_strdup (name)); + active_extensions = g_list_prepend (active_extensions, g_strdup (extension_name)); } - active_extensions = g_slist_reverse (active_extensions); - eel_gconf_set_string_list (PREF_ACTIVE_EXTENSIONS, active_extensions); + active_extensions = g_list_reverse (active_extensions); + _g_settings_set_string_list (data->settings, PREF_GENERAL_ACTIVE_EXTENSIONS, active_extensions); if (! list_equal (active_extensions, data->active_extensions)) { GtkWidget *dialog; @@ -828,6 +828,7 @@ gth_quit (TRUE); } - g_slist_foreach (active_extensions, (GFunc) g_free, NULL); - g_slist_free (active_extensions); + g_list_foreach (active_extensions, (GFunc) g_free, NULL); + g_list_free (active_extensions); + g_list_free (extension_names); } diff -Nru gthumb-2.14.3/gthumb/dom.c gthumb-3.0.0/gthumb/dom.c --- gthumb-2.14.3/gthumb/dom.c 2011-11-06 09:39:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/dom.c 2012-02-19 15:01:32.000000000 +0000 @@ -35,11 +35,6 @@ }; -static gpointer dom_element_parent_class = NULL; -static gpointer dom_text_node_parent_class = NULL; -static gpointer dom_document_parent_class = NULL; - - GQuark dom_error_quark (void) { @@ -103,6 +98,9 @@ /* -- DomElement -- */ +G_DEFINE_TYPE (DomElement, dom_element, G_TYPE_INITIALLY_UNOWNED) + + static void dom_attribute_dump (gpointer key, gpointer value, @@ -186,7 +184,7 @@ static void -dom_element_instance_init (DomElement *self) +dom_element_init (DomElement *self) { self->tag_name = NULL; self->prefix = NULL; @@ -221,38 +219,11 @@ static void dom_element_class_init (DomElementClass *klass) { - dom_element_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = dom_element_finalize; DOM_ELEMENT_CLASS (klass)->dump = dom_element_real_dump; } -GType -dom_element_get_type (void) -{ - static GType dom_element_type_id = 0; - if (dom_element_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (DomElementClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) dom_element_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (DomElement), - 0, - (GInstanceInitFunc) dom_element_instance_init, - NULL - }; - dom_element_type_id = g_type_register_static (G_TYPE_INITIALLY_UNOWNED, - "DomElement", - &g_define_type_info, - 0); - } - return dom_element_type_id; -} - - static DomElement * dom_element_new (const char *a_tag_name) { @@ -417,6 +388,9 @@ /* -- DomTextNode -- */ +G_DEFINE_TYPE (DomTextNode, dom_text_node, DOM_TYPE_ELEMENT) + + static char * dom_text_node_real_dump (DomElement *base, int level) @@ -443,46 +417,19 @@ static void dom_text_node_class_init (DomTextNodeClass *klass) { - dom_text_node_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = dom_text_node_finalize; DOM_ELEMENT_CLASS (klass)->dump = dom_text_node_real_dump; } static void -dom_text_node_instance_init (DomTextNode *self) +dom_text_node_init (DomTextNode *self) { DOM_ELEMENT (self)->tag_name = g_strdup (XML_TEXT_NODE_TAG_NAME); self->data = NULL; } -GType -dom_text_node_get_type (void) -{ - static GType dom_text_node_type_id = 0; - if (dom_text_node_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (DomTextNodeClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) dom_text_node_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (DomTextNode), - 0, - (GInstanceInitFunc) dom_text_node_instance_init, - NULL - }; - dom_text_node_type_id = g_type_register_static (DOM_TYPE_ELEMENT, - "DomTextNode", - &g_define_type_info, - 0); - } - return dom_text_node_type_id; -} - - static DomTextNode * dom_text_node_new (const char *a_data) { @@ -498,6 +445,9 @@ /* -- DomDocument -- */ +G_DEFINE_TYPE (DomDocument, dom_document, DOM_TYPE_ELEMENT) + + static void dom_document_finalize (GObject *obj) { @@ -517,13 +467,12 @@ static void dom_document_class_init (DomDocumentClass *klass) { - dom_document_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = dom_document_finalize; } static void -dom_document_instance_init (DomDocument *self) +dom_document_init (DomDocument *self) { DOM_ELEMENT (self)->tag_name = g_strdup (XML_DOCUMENT_TAG_NAME); @@ -532,32 +481,6 @@ } -GType -dom_document_get_type (void) -{ - static GType dom_document_type_id = 0; - if (dom_document_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (DomDocumentClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) dom_document_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (DomDocument), - 0, - (GInstanceInitFunc) dom_document_instance_init, - NULL - }; - dom_document_type_id = g_type_register_static (DOM_TYPE_ELEMENT, - "DomDocument", - &g_define_type_info, - 0); - } - return dom_document_type_id; -} - - DomDocument * dom_document_new (void) { @@ -751,6 +674,16 @@ /* -- DomDomizable -- */ +G_DEFINE_INTERFACE (DomDomizable, dom_domizable, 0) + + +static void +dom_domizable_default_init (DomDomizableInterface *iface) +{ + /* void */ +} + + DomElement * dom_domizable_create_element (DomDomizable *self, DomDocument *doc) @@ -767,34 +700,9 @@ } -GType -dom_domizable_get_type (void) -{ - static GType dom_domizable_type_id = 0; - if (dom_domizable_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (DomDomizableIface), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) NULL, - (GClassFinalizeFunc) NULL, - NULL, - 0, - 0, - (GInstanceInitFunc) NULL, - NULL - }; - dom_domizable_type_id = g_type_register_static (G_TYPE_INTERFACE, - "DomDomizable", - &g_define_type_info, - 0); - } - return dom_domizable_type_id; -} - - /* -- Utilities -- */ + /* GMarkupParser converts \r into \n, this function compares two strings * treating \r characters as they were equal to \n */ gboolean diff -Nru gthumb-2.14.3/gthumb/dom.h gthumb-3.0.0/gthumb/dom.h --- gthumb-2.14.3/gthumb/dom.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/dom.h 2012-02-19 15:01:32.000000000 +0000 @@ -69,10 +69,10 @@ #define DOM_TYPE_DOMIZABLE (dom_domizable_get_type ()) #define DOM_DOMIZABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DOM_TYPE_DOMIZABLE, DomDomizable)) #define DOM_IS_DOMIZABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DOM_TYPE_DOMIZABLE)) -#define DOM_DOMIZABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), DOM_TYPE_DOMIZABLE, DomDomizableIface)) +#define DOM_DOMIZABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), DOM_TYPE_DOMIZABLE, DomDomizableInterface)) typedef struct _DomDomizable DomDomizable; -typedef struct _DomDomizableIface DomDomizableIface; +typedef struct _DomDomizableInterface DomDomizableInterface; struct _DomElement { GInitiallyUnowned parent_instance; @@ -116,7 +116,7 @@ DomElementClass parent_class; }; -struct _DomDomizableIface { +struct _DomDomizableInterface { GTypeInterface parent_iface; DomElement * (*create_element) (DomDomizable *self, diff -Nru gthumb-2.14.3/gthumb/gconf-utils.c gthumb-3.0.0/gthumb/gconf-utils.c --- gthumb-2.14.3/gthumb/gconf-utils.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gconf-utils.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,981 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * gThumb - * - * Copyright (C) 2001, 2002 The Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* eel-gconf-extensions.c - Stuff to make GConf easier to use. - - Copyright (C) 2000, 2001 Eazel, Inc. - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. - If not, see . - - Authors: Ramiro Estrugo -*/ - -/* Modified by Paolo Bacchilega for gThumb. */ - -#include -#include -#include -#include -#include -#include "gconf-utils.h" -#include "gtk-utils.h" -#include "gth-error.h" -#include "glib-utils.h" - -#define HOME_DIR "~" - - -static GConfClient *global_gconf_client = NULL; - - -void -eel_global_client_free (void) -{ - if (global_gconf_client == NULL) { - return; - } - - g_object_unref (global_gconf_client); - global_gconf_client = NULL; -} - - -GConfClient * -eel_gconf_client_get_global (void) -{ - /* Initialize gconf if needed */ - if (!gconf_is_initialized ()) { - char *argv[] = { "eel-preferences", NULL }; - GError *error = NULL; - - if (!gconf_init (1, argv, &error)) { - if (eel_gconf_handle_error (&error)) { - return NULL; - } - } - } - - if (global_gconf_client == NULL) - global_gconf_client = gconf_client_get_default (); - - return global_gconf_client; -} - - -gboolean -eel_gconf_handle_error (GError **error) -{ - static gboolean shown_dialog = FALSE; - - g_return_val_if_fail (error != NULL, FALSE); - - if (*error != NULL) { - g_warning ("GConf error:\n %s", (*error)->message); - if (! shown_dialog) { - shown_dialog = TRUE; - _gtk_error_dialog_run (NULL, - "GConf error:\n %s\n" - "All further errors " - "shown only on terminal", - (*error)->message); - } - g_error_free (*error); - *error = NULL; - - return TRUE; - } - - return FALSE; -} - - -static gboolean -check_type (const char *key, - GConfValue *val, - GConfValueType t, - GError **err) -{ - if (val->type != t) { - g_set_error (err, - GTH_ERROR, - errno, - "Type mismatch for key %s", - key); - return FALSE; - } else - return TRUE; -} - - -void -eel_gconf_set_boolean (const char *key, - gboolean boolean_value) -{ - GConfClient *client; - GError *error = NULL; - - g_return_if_fail (key != NULL); - - client = eel_gconf_client_get_global (); - g_return_if_fail (client != NULL); - - gconf_client_set_bool (client, key, boolean_value, &error); - eel_gconf_handle_error (&error); -} - - -gboolean -eel_gconf_get_boolean (const char *key, - gboolean def) -{ - GError *error = NULL; - gboolean result = def; - GConfClient *client; - GConfValue *val; - - g_return_val_if_fail (key != NULL, def); - - client = eel_gconf_client_get_global (); - g_return_val_if_fail (client != NULL, def); - - val = gconf_client_get (client, key, &error); - - if (val != NULL) { - if (check_type (key, val, GCONF_VALUE_BOOL, &error)) - result = gconf_value_get_bool (val); - else - eel_gconf_handle_error (&error); - gconf_value_free (val); - - } else if (error != NULL) - eel_gconf_handle_error (&error); - - return result; -} - - -void -eel_gconf_set_integer (const char *key, - int int_value) -{ - GConfClient *client; - GError *error = NULL; - - g_return_if_fail (key != NULL); - - client = eel_gconf_client_get_global (); - g_return_if_fail (client != NULL); - - gconf_client_set_int (client, key, int_value, &error); - eel_gconf_handle_error (&error); -} - - -int -eel_gconf_get_integer (const char *key, - int def) -{ - GError *error = NULL; - int result = def; - GConfClient *client; - GConfValue *val; - - g_return_val_if_fail (key != NULL, def); - - client = eel_gconf_client_get_global (); - g_return_val_if_fail (client != NULL, def); - - val = gconf_client_get (client, key, &error); - - if (val != NULL) { - if (check_type (key, val, GCONF_VALUE_INT, &error)) - result = gconf_value_get_int (val); - else - eel_gconf_handle_error (&error); - gconf_value_free (val); - - } else if (error != NULL) - eel_gconf_handle_error (&error); - - return result; -} - - -int -eel_gconf_get_enum (const char *key, - GType enum_type, - int def_val) -{ - GEnumValue *def_enum_val; - char *value_nick; - GEnumValue *value; - - def_enum_val = _g_enum_type_get_value (enum_type, def_val); - value_nick = eel_gconf_get_string (key, def_enum_val->value_nick); - value = _g_enum_type_get_value_by_nick (enum_type, value_nick); - g_free (value_nick); - - return (value != NULL) ? value->value : 0; -} - - -void -eel_gconf_set_enum (const char *key, - GType enum_type, - int value) -{ - GEnumValue *enum_value; - - enum_value = _g_enum_type_get_value (enum_type, value); - if (enum_value != NULL) - eel_gconf_set_string (key, enum_value->value_nick); -} - - -void -eel_gconf_set_float (const char *key, - float float_value) -{ - GConfClient *client; - GError *error = NULL; - - g_return_if_fail (key != NULL); - - client = eel_gconf_client_get_global (); - g_return_if_fail (client != NULL); - - gconf_client_set_float (client, key, float_value, &error); - eel_gconf_handle_error (&error); -} - - -float -eel_gconf_get_float (const char *key, - float def) -{ - GError *error = NULL; - float result = def; - GConfClient *client; - GConfValue *val; - - g_return_val_if_fail (key != NULL, def); - - client = eel_gconf_client_get_global (); - g_return_val_if_fail (client != NULL, def); - - val = gconf_client_get (client, key, &error); - - if (val != NULL) { - if (check_type (key, val, GCONF_VALUE_FLOAT, &error)) - result = gconf_value_get_float (val); - else - eel_gconf_handle_error (&error); - gconf_value_free (val); - - } else if (error != NULL) - eel_gconf_handle_error (&error); - - return result; -} - - -void -eel_gconf_set_string (const char *key, - const char *string_value) -{ - GConfClient *client; - GError *error = NULL; - - g_return_if_fail (key != NULL); - - client = eel_gconf_client_get_global (); - g_return_if_fail (client != NULL); - - gconf_client_set_string (client, key, string_value, &error); - eel_gconf_handle_error (&error); -} - - -char * -eel_gconf_get_string (const char *key, - const char *def) -{ - GError *error = NULL; - char *result; - GConfClient *client; - char *val; - - if (def != NULL) - result = g_strdup (def); - else - result = NULL; - - g_return_val_if_fail (key != NULL, result); - - client = eel_gconf_client_get_global (); - g_return_val_if_fail (client != NULL, result); - - val = gconf_client_get_string (client, key, &error); - - /* Return the default value if the key does not exist, - or if it is empty. */ - if (val != NULL && strcmp (val, "")) { - g_return_val_if_fail (error == NULL, result); - g_free (result); - result = g_strdup (val); - - } else if (error != NULL) - eel_gconf_handle_error (&error); - - return result; -} - - -void -eel_gconf_set_locale_string (const char *key, - const char *string_value) -{ - char *utf8; - - utf8 = g_locale_to_utf8 (string_value, -1, 0, 0, 0); - - if (utf8 != NULL) { - eel_gconf_set_string (key, utf8); - g_free (utf8); - } -} - - -char * -eel_gconf_get_locale_string (const char *key, - const char *def) -{ - char *utf8; - char *result; - - utf8 = eel_gconf_get_string (key, def); - - if (utf8 == NULL) - return NULL; - - result = g_locale_from_utf8 (utf8, -1, 0, 0, 0); - g_free (utf8); - - return result; -} - - -void -eel_gconf_set_string_list (const char *key, - const GSList *slist) -{ - GConfClient *client; - GError *error = NULL; - - g_return_if_fail (key != NULL); - - client = eel_gconf_client_get_global (); - g_return_if_fail (client != NULL); - - gconf_client_set_list (client, key, GCONF_VALUE_STRING, - /* Need cast cause of GConf api bug */ - (GSList *) slist, - &error); - eel_gconf_handle_error (&error); -} - - -GSList * -eel_gconf_get_string_list (const char *key) -{ - GSList *slist; - GConfClient *client; - GError *error = NULL; - - g_return_val_if_fail (key != NULL, NULL); - - client = eel_gconf_client_get_global (); - g_return_val_if_fail (client != NULL, NULL); - - slist = gconf_client_get_list (client, key, GCONF_VALUE_STRING, &error); - if (eel_gconf_handle_error (&error)) { - slist = NULL; - } - - return slist; -} - - -GSList * -eel_gconf_get_string_list_with_error (const char *key, - GError **error) -{ - GSList *slist; - GConfClient *client; - - g_return_val_if_fail (key != NULL, NULL); - - client = eel_gconf_client_get_global (); - if (client == NULL) { - if (error != NULL) - *error = g_error_new_literal (GCONF_ERROR, GCONF_ERROR_NO_SERVER, ""); - return NULL; - } - - if (error) - *error = NULL; - slist = gconf_client_get_list (client, key, GCONF_VALUE_STRING, error); - - if (*error != NULL) - slist = NULL; - - return slist; -} - - -GSList * -eel_gconf_get_path_list (const char *key) -{ - GSList *str_slist, *slist, *scan; - - str_slist = eel_gconf_get_string_list (key); - - slist = NULL; - for (scan = str_slist; scan; scan = scan->next) { - char *str = scan->data; - char *path = _g_replace (str, HOME_DIR, g_get_home_dir ()); - slist = g_slist_prepend (slist, path); - } - - g_slist_foreach (str_slist, (GFunc) g_free, NULL); - g_slist_free (str_slist); - - return g_slist_reverse (slist); -} - - -void -eel_gconf_set_path_list (const char *key, - const GSList *string_list_value) -{ - GSList *path_slist; - const GSList *scan; - - path_slist = NULL; - for (scan = string_list_value; scan; scan = scan->next) { - char *value = scan->data; - char *path = _g_replace (value, g_get_home_dir (), HOME_DIR); - path_slist = g_slist_prepend (path_slist, path); - } - path_slist = g_slist_reverse (path_slist); - - eel_gconf_set_string_list (key, path_slist); - - g_slist_foreach (path_slist, (GFunc) g_free, NULL); - g_slist_free (path_slist); -} - - -GSList * -eel_gconf_get_locale_string_list (const char *key) -{ - GSList *utf8_slist, *slist, *scan; - - utf8_slist = eel_gconf_get_string_list (key); - - slist = NULL; - for (scan = utf8_slist; scan; scan = scan->next) { - char *utf8 = scan->data; - char *locale = g_locale_from_utf8 (utf8, -1, 0, 0, 0); - slist = g_slist_prepend (slist, locale); - } - - g_slist_foreach (utf8_slist, (GFunc) g_free, NULL); - g_slist_free (utf8_slist); - - return g_slist_reverse (slist); -} - - -void -eel_gconf_set_locale_string_list (const char *key, - const GSList *string_list_value) -{ - GSList *utf8_slist; - const GSList *scan; - - utf8_slist = NULL; - for (scan = string_list_value; scan; scan = scan->next) { - char *locale = scan->data; - char *utf8 = g_locale_to_utf8 (locale, -1, 0, 0, 0); - utf8_slist = g_slist_prepend (utf8_slist, utf8); - } - - utf8_slist = g_slist_reverse (utf8_slist); - - eel_gconf_set_string_list (key, utf8_slist); - - g_slist_foreach (utf8_slist, (GFunc) g_free, NULL); - g_slist_free (utf8_slist); -} - - -char * -eel_gconf_get_path (const char *key, - const char *def_val) -{ - char *value; - char *path; - - value = eel_gconf_get_string (key, def_val); - path = _g_replace (value, HOME_DIR, g_get_home_dir ()); - g_free (value); - - return path; -} - - -void -eel_gconf_set_path (const char *key, - const char *path) -{ - char *value; - - value = _g_replace (path, g_get_home_dir (), HOME_DIR); - eel_gconf_set_string (key, value); - g_free (value); -} - - -gboolean -eel_gconf_is_default (const char *key) -{ - gboolean result; - GConfValue *value; - GError *error = NULL; - - g_return_val_if_fail (key != NULL, FALSE); - - value = gconf_client_get_without_default (eel_gconf_client_get_global (), key, &error); - - if (eel_gconf_handle_error (&error)) { - if (value != NULL) { - gconf_value_free (value); - } - return FALSE; - } - - result = (value == NULL); - eel_gconf_value_free (value); - return result; -} - - -gboolean -eel_gconf_monitor_add (const char *directory) -{ - GError *error = NULL; - GConfClient *client; - - g_return_val_if_fail (directory != NULL, FALSE); - - client = gconf_client_get_default (); - g_return_val_if_fail (client != NULL, FALSE); - - gconf_client_add_dir (client, - directory, - GCONF_CLIENT_PRELOAD_NONE, - &error); - - if (eel_gconf_handle_error (&error)) { - return FALSE; - } - - return TRUE; -} - - -gboolean -eel_gconf_monitor_remove (const char *directory) -{ - GError *error = NULL; - GConfClient *client; - - if (directory == NULL) { - return FALSE; - } - - client = gconf_client_get_default (); - g_return_val_if_fail (client != NULL, FALSE); - - gconf_client_remove_dir (client, - directory, - &error); - - if (eel_gconf_handle_error (&error)) { - return FALSE; - } - - return TRUE; -} - - -void -eel_gconf_preload_cache (const char *directory, - GConfClientPreloadType preload_type) -{ - GError *error = NULL; - GConfClient *client; - - if (directory == NULL) { - return; - } - - client = gconf_client_get_default (); - g_return_if_fail (client != NULL); - - gconf_client_preload (client, - directory, - preload_type, - &error); - - eel_gconf_handle_error (&error); -} - - -void -eel_gconf_suggest_sync (void) -{ - GConfClient *client; - GError *error = NULL; - - client = eel_gconf_client_get_global (); - g_return_if_fail (client != NULL); - - gconf_client_suggest_sync (client, &error); - eel_gconf_handle_error (&error); -} - - -GConfValue* -eel_gconf_get_value (const char *key) -{ - GConfValue *value = NULL; - GConfClient *client; - GError *error = NULL; - - g_return_val_if_fail (key != NULL, NULL); - - client = eel_gconf_client_get_global (); - g_return_val_if_fail (client != NULL, NULL); - - value = gconf_client_get (client, key, &error); - - if (eel_gconf_handle_error (&error)) { - if (value != NULL) { - gconf_value_free (value); - value = NULL; - } - } - - return value; -} - - -GConfValue* -eel_gconf_get_default_value (const char *key) -{ - GConfValue *value = NULL; - GConfClient *client; - GError *error = NULL; - - g_return_val_if_fail (key != NULL, NULL); - - client = eel_gconf_client_get_global (); - g_return_val_if_fail (client != NULL, NULL); - - value = gconf_client_get_default_from_schema (client, key, &error); - - if (eel_gconf_handle_error (&error)) { - if (value != NULL) { - gconf_value_free (value); - value = NULL; - } - } - - return value; -} - - -static int -eel_strcmp (const char *string_a, const char *string_b) -{ - /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this - * treat 'NULL < ""', or have a flavor that does that. If we - * didn't have code that already relies on 'NULL == ""', I - * would change it right now. - */ - return strcmp (string_a == NULL ? "" : string_a, - string_b == NULL ? "" : string_b); -} - - -static gboolean -eel_str_is_equal (const char *string_a, const char *string_b) -{ - /* FIXME bugzilla.eazel.com 5450: Maybe we need to make this - * treat 'NULL != ""', or have a flavor that does that. If we - * didn't have code that already relies on 'NULL == ""', I - * would change it right now. - */ - return eel_strcmp (string_a, string_b) == 0; -} - - -static gboolean -simple_value_is_equal (const GConfValue *a, - const GConfValue *b) -{ - g_return_val_if_fail (a != NULL, FALSE); - g_return_val_if_fail (b != NULL, FALSE); - - switch (a->type) { - case GCONF_VALUE_STRING: - return eel_str_is_equal (gconf_value_get_string (a), - gconf_value_get_string (b)); - break; - - case GCONF_VALUE_INT: - return gconf_value_get_int (a) == - gconf_value_get_int (b); - break; - - case GCONF_VALUE_FLOAT: - return gconf_value_get_float (a) == - gconf_value_get_float (b); - break; - - case GCONF_VALUE_BOOL: - return gconf_value_get_bool (a) == - gconf_value_get_bool (b); - break; - default: - g_assert_not_reached (); - break; - } - - return FALSE; -} - - -gboolean -eel_gconf_value_is_equal (const GConfValue *a, - const GConfValue *b) -{ - GSList *node_a; - GSList *node_b; - - if (a == NULL && b == NULL) { - return TRUE; - } - - if (a == NULL || b == NULL) { - return FALSE; - } - - if (a->type != b->type) { - return FALSE; - } - - switch (a->type) { - case GCONF_VALUE_STRING: - case GCONF_VALUE_INT: - case GCONF_VALUE_FLOAT: - case GCONF_VALUE_BOOL: - return simple_value_is_equal (a, b); - break; - - case GCONF_VALUE_LIST: - if (gconf_value_get_list_type (a) != - gconf_value_get_list_type (b)) { - return FALSE; - } - - node_a = gconf_value_get_list (a); - node_b = gconf_value_get_list (b); - - if (node_a == NULL && node_b == NULL) { - return TRUE; - } - - if (g_slist_length (node_a) != - g_slist_length (node_b)) { - return FALSE; - } - - for (; - node_a != NULL && node_b != NULL; - node_a = node_a->next, node_b = node_b->next) { - g_assert (node_a->data != NULL); - g_assert (node_b->data != NULL); - if (!simple_value_is_equal (node_a->data, node_b->data)) { - return FALSE; - } - } - - return TRUE; - default: - /* FIXME: pair ? */ - g_assert (0); - break; - } - - g_assert_not_reached (); - return FALSE; -} - - -void -eel_gconf_value_free (GConfValue *value) -{ - if (value == NULL) { - return; - } - - gconf_value_free (value); -} - - -guint -eel_gconf_notification_add (const char *key, - GConfClientNotifyFunc notification_callback, - gpointer callback_data) -{ - guint notification_id; - GConfClient *client; - GError *error = NULL; - - g_return_val_if_fail (key != NULL, EEL_GCONF_UNDEFINED_CONNECTION); - g_return_val_if_fail (notification_callback != NULL, EEL_GCONF_UNDEFINED_CONNECTION); - - client = eel_gconf_client_get_global (); - g_return_val_if_fail (client != NULL, EEL_GCONF_UNDEFINED_CONNECTION); - - notification_id = gconf_client_notify_add (client, - key, - notification_callback, - callback_data, - NULL, - &error); - - if (eel_gconf_handle_error (&error)) { - if (notification_id != EEL_GCONF_UNDEFINED_CONNECTION) { - gconf_client_notify_remove (client, notification_id); - notification_id = EEL_GCONF_UNDEFINED_CONNECTION; - } - } - - return notification_id; -} - - -void -eel_gconf_notification_remove (guint notification_id) -{ - GConfClient *client; - - if (notification_id == EEL_GCONF_UNDEFINED_CONNECTION) { - return; - } - - client = eel_gconf_client_get_global (); - g_return_if_fail (client != NULL); - - gconf_client_notify_remove (client, notification_id); -} - - -GSList * -eel_gconf_value_get_string_list (const GConfValue *value) -{ - GSList *result; - const GSList *slist; - const GSList *node; - const char *string; - const GConfValue *next_value; - - if (value == NULL) { - return NULL; - } - - g_return_val_if_fail (value->type == GCONF_VALUE_LIST, NULL); - g_return_val_if_fail (gconf_value_get_list_type (value) == GCONF_VALUE_STRING, NULL); - - slist = gconf_value_get_list (value); - result = NULL; - for (node = slist; node != NULL; node = node->next) { - next_value = node->data; - g_return_val_if_fail (next_value != NULL, NULL); - g_return_val_if_fail (next_value->type == GCONF_VALUE_STRING, NULL); - string = gconf_value_get_string (next_value); - result = g_slist_append (result, g_strdup (string)); - } - return result; -} - - -void -eel_gconf_value_set_string_list (GConfValue *value, - const GSList *string_list) -{ - const GSList *node; - GConfValue *next_value; - GSList *value_list; - - g_return_if_fail (value->type == GCONF_VALUE_LIST); - g_return_if_fail (gconf_value_get_list_type (value) == GCONF_VALUE_STRING); - - value_list = NULL; - for (node = string_list; node != NULL; node = node->next) { - next_value = gconf_value_new (GCONF_VALUE_STRING); - gconf_value_set_string (next_value, node->data); - value_list = g_slist_append (value_list, next_value); - } - - gconf_value_set_list (value, value_list); - - for (node = value_list; node != NULL; node = node->next) { - gconf_value_free (node->data); - } - g_slist_free (value_list); -} diff -Nru gthumb-2.14.3/gthumb/gconf-utils.h gthumb-3.0.0/gthumb/gconf-utils.h --- gthumb-2.14.3/gthumb/gconf-utils.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gconf-utils.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,122 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * gThumb - * - * Copyright (C) 2001, 2002 The Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* eel-gconf-extensions.h - Stuff to make GConf easier to use. - - Copyright (C) 2000, 2001 Eazel, Inc. - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. - If not, see . - - Authors: Ramiro Estrugo -*/ - -/* Modified by Paolo Bacchilega for gThumb. */ - -#ifndef GCONF_UTILS_H -#define GCONF_UTILS_H - -#include -#include -#include - -G_BEGIN_DECLS - -#define EEL_GCONF_UNDEFINED_CONNECTION 0 - -GConfClient *eel_gconf_client_get_global (void); -void eel_global_client_free (void); -gboolean eel_gconf_handle_error (GError **error); -gboolean eel_gconf_get_boolean (const char *key, - gboolean def_val); -void eel_gconf_set_boolean (const char *key, - gboolean value); -int eel_gconf_get_integer (const char *key, - int def_val); -void eel_gconf_set_integer (const char *key, - int value); -int eel_gconf_get_enum (const char *key, - GType enum_type, - int def_val); -void eel_gconf_set_enum (const char *key, - GType enum_type, - int value); -float eel_gconf_get_float (const char *key, - float def_val); -void eel_gconf_set_float (const char *key, - float value); -char * eel_gconf_get_string (const char *key, - const char *def_val); -void eel_gconf_set_string (const char *key, - const char *value); -char * eel_gconf_get_path (const char *key, - const char *def_val); -void eel_gconf_set_path (const char *key, - const char *value); -char * eel_gconf_get_locale_string (const char *key, - const char *def_val); -void eel_gconf_set_locale_string (const char *key, - const char *value); -GSList * eel_gconf_get_string_list (const char *key); -GSList * eel_gconf_get_string_list_with_error - (const char *key, - GError **error); -void eel_gconf_set_string_list (const char *key, - const GSList *string_list_value); -GSList * eel_gconf_get_path_list (const char *key); -void eel_gconf_set_path_list (const char *key, - const GSList *string_list_value); -GSList * eel_gconf_get_locale_string_list(const char *key); -void eel_gconf_set_locale_string_list(const char *key, - const GSList *string_list_value); -gboolean eel_gconf_is_default (const char *key); -gboolean eel_gconf_monitor_add (const char *directory); -gboolean eel_gconf_monitor_remove (const char *directory); -void eel_gconf_preload_cache (const char *directory, - GConfClientPreloadType preload_type); -void eel_gconf_suggest_sync (void); -GConfValue* eel_gconf_get_value (const char *key); -GConfValue* eel_gconf_get_default_value (const char *key); -gboolean eel_gconf_value_is_equal (const GConfValue *a, - const GConfValue *b); -void eel_gconf_value_free (GConfValue *value); -guint eel_gconf_notification_add (const char *key, - GConfClientNotifyFunc notification_callback, - gpointer callback_data); -void eel_gconf_notification_remove (guint notification_id); -GSList * eel_gconf_value_get_string_list (const GConfValue *value); -void eel_gconf_value_set_string_list (GConfValue *value, - const GSList *string_list); - -G_END_DECLS - -#endif /* GCONF_UTILS_H */ diff -Nru gthumb-2.14.3/gthumb/gedit-message-area.c gthumb-3.0.0/gthumb/gedit-message-area.c --- gthumb-2.14.3/gthumb/gedit-message-area.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gedit-message-area.c 2012-03-06 15:26:06.000000000 +0000 @@ -69,18 +69,7 @@ static guint signals[LAST_SIGNAL]; -G_DEFINE_TYPE(GeditMessageArea, gedit_message_area, GTK_TYPE_HBOX) - - -static void -gedit_message_area_finalize (GObject *object) -{ - /* - GeditMessageArea *message_area = GEDIT_MESSAGE_AREA (object); - */ - - G_OBJECT_CLASS (gedit_message_area_parent_class)->finalize (object); -} +G_DEFINE_TYPE(GeditMessageArea, gedit_message_area, GTK_TYPE_BOX) static ResponseData * get_response_data (GtkWidget *widget, @@ -89,8 +78,7 @@ ResponseData *ad = g_object_get_data (G_OBJECT (widget), "gedit-message-area-response-data"); - if (ad == NULL && create) - { + if (ad == NULL && create) { ad = g_new (ResponseData, 1); g_object_set_data_full (G_OBJECT (widget), @@ -146,12 +134,10 @@ GtkBindingSet *binding_set; object_class = G_OBJECT_CLASS (klass); - object_class->finalize = gedit_message_area_finalize; + g_type_class_add_private (object_class, sizeof(GeditMessageAreaPrivate)); klass->close = gedit_message_area_close; - g_type_class_add_private (object_class, sizeof(GeditMessageAreaPrivate)); - signals[RESPONSE] = g_signal_new ("response", G_OBJECT_CLASS_TYPE (klass), G_SIGNAL_RUN_LAST, @@ -180,15 +166,19 @@ { GtkWidget *vbox; + gtk_orientable_set_orientation (GTK_ORIENTABLE (message_area), GTK_ORIENTATION_HORIZONTAL); gtk_widget_push_composite_child (); message_area->priv = GEDIT_MESSAGE_AREA_GET_PRIVATE (message_area); - message_area->priv->main_hbox = gtk_hbox_new (FALSE, 3); /* FIXME: use style properties */ + message_area->priv->main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); /* FIXME: use style properties */ gtk_widget_show (message_area->priv->main_hbox); - gtk_container_set_border_width (GTK_CONTAINER (message_area->priv->main_hbox), 3); /* FIXME: use style properties */ + gtk_container_set_border_width (GTK_CONTAINER (message_area->priv->main_hbox), 0); /* FIXME: use style properties */ + gtk_widget_set_margin_top (message_area->priv->main_hbox, 3); + gtk_widget_set_margin_bottom (message_area->priv->main_hbox, 3); + gtk_widget_set_margin_right (message_area->priv->main_hbox, 3); - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox); gtk_box_pack_end (GTK_BOX (message_area->priv->main_hbox), vbox, @@ -196,7 +186,7 @@ FALSE, 0); - message_area->priv->action_area = gtk_hbox_new (FALSE, 3); /* FIXME: use style properties */ + message_area->priv->action_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); /* FIXME: use style properties */ gtk_widget_show (message_area->priv->action_area); gtk_box_pack_end (GTK_BOX (vbox), message_area->priv->action_area, diff -Nru gthumb-2.14.3/gthumb/gedit-message-area.h gthumb-3.0.0/gthumb/gedit-message-area.h --- gthumb-2.14.3/gthumb/gedit-message-area.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gedit-message-area.h 2012-03-06 15:26:06.000000000 +0000 @@ -53,7 +53,7 @@ struct _GeditMessageArea { - GtkHBox parent; + GtkBox parent; /*< private >*/ GeditMessageAreaPrivate *priv; @@ -66,7 +66,7 @@ struct _GeditMessageAreaClass { - GtkHBoxClass parent_class; + GtkBoxClass parent_class; /* Signals */ void (* response) (GeditMessageArea *message_area, gint response_id); diff -Nru gthumb-2.14.3/gthumb/gio-utils.c gthumb-3.0.0/gthumb/gio-utils.c --- gthumb-2.14.3/gthumb/gio-utils.c 2012-03-24 16:39:44.000000000 +0000 +++ gthumb-3.0.0/gthumb/gio-utils.c 2012-03-26 16:40:00.000000000 +0000 @@ -183,7 +183,7 @@ ChildData *current; GHashTable *already_visited; GList *to_visit; - const char *attributes; + char *attributes; GCancellable *cancellable; GFileEnumerator *enumerator; GError *error; @@ -204,6 +204,7 @@ if (fec->already_visited != NULL) g_hash_table_destroy (fec->already_visited); clear_child_data (&(fec->current)); + g_free (fec->attributes); if (fec->to_visit != NULL) { g_list_foreach (fec->to_visit, (GFunc) child_data_free, NULL); g_list_free (fec->to_visit); @@ -1138,13 +1139,8 @@ { GError *error = NULL; - if (! copy_file_data->move) { - copy_file_data->ready_callback (copy_file_data->default_response, NULL, copy_file_data->user_data); - copy_file_data_free (copy_file_data); - return; - } - - g_file_delete (copy_file_data->source->file, copy_file_data->cancellable, &error); + if (copy_file_data->move) + g_file_delete (copy_file_data->source->file, copy_file_data->cancellable, &error); copy_file_data->ready_callback (copy_file_data->default_response, error, copy_file_data->user_data); copy_file_data_free (copy_file_data); @@ -1349,8 +1345,8 @@ if (copy_file_data->progress_callback == NULL) return; - s1 = g_format_size_for_display (copy_file_data->copied_size + current_num_bytes); - s2 = g_format_size_for_display (copy_file_data->tot_size); + s1 = g_format_size (copy_file_data->copied_size + current_num_bytes); + s2 = g_format_size (copy_file_data->tot_size); /* For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB */ details = g_strdup_printf (_("%s of %s"), s1, s2); @@ -1506,7 +1502,7 @@ GList *files; /* GthFileData list */ GList *current; - GList *copied_files; /* GFile list */ + GList *copied_directories; /* GFile list */ GFile *source_base; GFile *current_destination; @@ -1542,7 +1538,7 @@ _g_object_list_unref (copy_data->destination_sidecars); _g_object_list_unref (copy_data->source_sidecars); _g_object_unref (copy_data->current_destination); - _g_object_list_unref (copy_data->copied_files); + _g_object_list_unref (copy_data->copied_directories); _g_object_list_unref (copy_data->files); _g_object_unref (copy_data->source_base); g_hash_table_destroy (copy_data->source_hash); @@ -1553,24 +1549,9 @@ static void -copy_data__delete_source (CopyData *copy_data) +copy_data__done (CopyData *copy_data, + GError *error) { - GError *error = NULL; - GList *scan; - - if (! copy_data->move) { - copy_data->done_callback (NULL, copy_data->user_data); - copy_data_free (copy_data); - return; - } - - for (scan = copy_data->copied_files; scan; scan = scan->next) { - GFile *file = scan->data; - - if (! g_file_delete (file, copy_data->cancellable, &error)) - break; - } - copy_data->done_callback (error, copy_data->user_data); copy_data_free (copy_data); } @@ -1598,12 +1579,18 @@ CopyData *copy_data = user_data; if (error == NULL) { - GthFileData *source = (GthFileData *) copy_data->current->data; - copy_data->copied_files = g_list_prepend (copy_data->copied_files, g_file_dup (source->file)); + /* save the correctly copied directories in order to delete + * them after moving their content. */ + if (copy_data->move) { + GthFileData *source; + + source = (GthFileData *) copy_data->current->data; + if (g_file_info_get_file_type (source->info) == G_FILE_TYPE_DIRECTORY) + copy_data->copied_directories = g_list_prepend (copy_data->copied_directories, g_file_dup (source->file)); + } } else if ((response == GTH_OVERWRITE_RESPONSE_ALWAYS_NO) || ! g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS)) { - copy_data->done_callback (error, copy_data->user_data); - copy_data_free (copy_data); + copy_data__done (copy_data, error); return; } @@ -1613,19 +1600,53 @@ static void +copy_data__delete_source_directories (CopyData *copy_data) +{ + GError *error = NULL; + + if (copy_data->move) { + GList *scan; + + for (scan = copy_data->copied_directories; scan; scan = scan->next) { + GFile *file = scan->data; + + if (! g_file_delete (file, copy_data->cancellable, &error)) + break; + } + } + + copy_data__done (copy_data, error); +} + + +static void copy_data__copy_current_file (CopyData *copy_data) { - GthFileData *source; - GFile *destination; - GFileCopyFlags flags; + GthFileData *source; + gboolean explicitly_requested; + GFile *destination; if (copy_data->current == NULL) { - copy_data__delete_source (copy_data); + copy_data__delete_source_directories (copy_data); return; } source = (GthFileData *) copy_data->current->data; - if (g_hash_table_lookup (copy_data->source_hash, source->file) != NULL) { + explicitly_requested = (g_hash_table_lookup (copy_data->source_hash, source->file) != NULL); + + /* Ignore non-existent files that weren't explicitly requested, + * they are children of some requested directory and if they don't + * exist anymore they have been already moved to the destination + * because they are metadata of other files. */ + if (! explicitly_requested) { + if (! g_file_query_exists (source->file, copy_data->cancellable)) { + call_when_idle ((DataFunc) copy_data__copy_next_file, copy_data); + return; + } + } + + /* compute the destination */ + if (explicitly_requested) { _g_object_unref (copy_data->source_base); copy_data->source_base = g_file_get_parent (source->file); } @@ -1637,14 +1658,10 @@ return; } - flags = copy_data->flags; - if ((flags & G_FILE_COPY_ALL_METADATA) && (g_hash_table_lookup (copy_data->source_hash, source->file) == NULL)) - flags = flags ^ G_FILE_COPY_ALL_METADATA; - _g_copy_file_async_private (source, destination, - FALSE, - flags, + copy_data->move, + copy_data->flags, copy_data->default_response, copy_data->io_priority, copy_data->tot_size, @@ -1671,8 +1688,7 @@ GList *scan; if (error != NULL) { - copy_data->done_callback (error, copy_data->user_data); - copy_data_free (copy_data); + copy_data__done (copy_data, error); return; } @@ -1724,6 +1740,7 @@ copy_data->user_data = user_data; copy_data->default_response = default_response; + /* save the explicitly requested files */ copy_data->source_hash = g_hash_table_new_full ((GHashFunc) g_file_hash, (GEqualFunc) g_file_equal, (GDestroyNotify) g_object_unref, NULL); for (scan = sources; scan; scan = scan->next) g_hash_table_insert (copy_data->source_hash, g_object_ref (scan->data), GINT_TO_POINTER (1)); @@ -1736,6 +1753,8 @@ 0.0, copy_data->progress_callback_data); + /* for each directory in 'source' this query will add all of its content + * to the file list. */ _g_query_info_async (sources, GTH_LIST_RECURSIVE, "standard::name,standard::display-name,standard::type,standard::size", diff -Nru gthumb-2.14.3/gthumb/glib-utils.c gthumb-3.0.0/gthumb/glib-utils.c --- gthumb-2.14.3/gthumb/glib-utils.c 2012-03-24 16:28:46.000000000 +0000 +++ gthumb-3.0.0/gthumb/glib-utils.c 2012-04-07 15:27:15.000000000 +0000 @@ -89,38 +89,13 @@ } -GType -g_object_list_get_type (void) -{ - static GType type = 0; - - if (type == 0) - type = g_boxed_type_register_static ("GObjectList", - (GBoxedCopyFunc) _g_object_list_ref, - (GBoxedFreeFunc) _g_object_list_unref); - - return type; -} - - -#if NEED_G_TYPE_ERROR - - -GType -g_error_get_type (void) -{ - static GType type = 0; - - if (type == 0) - type = g_boxed_type_register_static ("GError", - (GBoxedCopyFunc) g_error_copy, - (GBoxedFreeFunc) g_error_free); - - return type; -} +typedef GList GObjectList; -#endif +G_DEFINE_BOXED_TYPE (GObjectList, + g_object_list, + (GBoxedCopyFunc) _g_object_list_ref, + (GBoxedFreeFunc) _g_object_list_unref) GEnumValue * @@ -550,9 +525,8 @@ static int _g_time_get_timezone_offset (struct tm *tm) { - int offset; + int offset = 0; - offset = -timezone; #if defined (HAVE_TM_GMTOFF) offset = tm->tm_gmtoff; #elif defined (HAVE_TIMEZONE) @@ -1054,6 +1028,103 @@ } +static int +remove_from_file_list_and_get_position (GList **file_list, + GFile *file) +{ + GList *scan; + int i = 0; + + for (scan = *file_list; scan; scan = scan->next, i++) + if (g_file_equal ((GFile *) scan->data, file)) + break; + + if (scan == NULL) + return -1; + + *file_list = g_list_remove_link (*file_list, scan); + + return i; +} + + +void +_g_list_reorder (GList *all_files, + GList *visible_files, + GList *files_to_move, + int dest_pos, + int **new_order_p, + GList **new_file_list_p) +{ + GHashTable *positions; + GList *new_visible_files; + GList *scan; + int *new_order; + int pos; + GList *new_file_list; + GHashTable *visibles; + + /* save the original positions */ + + positions = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, (GDestroyNotify) g_object_unref, NULL); + for (scan = visible_files, pos = 0; scan; scan = scan->next, pos++) + g_hash_table_insert (positions, g_object_ref ((GFile *) scan->data), GINT_TO_POINTER (pos)); + + /* create the new visible list */ + + new_visible_files = g_list_copy (visible_files); + + for (scan = files_to_move; scan; scan = scan->next) { + int file_pos = remove_from_file_list_and_get_position (&new_visible_files, (GFile *) scan->data); + if (file_pos < dest_pos) + dest_pos--; + } + + for (scan = files_to_move; scan; scan = scan->next) { + new_visible_files = g_list_insert (new_visible_files, (GFile *) scan->data, dest_pos); + dest_pos++; + } + + /* compute the new order */ + + new_order = g_new0 (int, g_list_length (new_visible_files)); + for (scan = new_visible_files, pos = 0; scan; scan = scan->next, pos++) + new_order[pos] = GPOINTER_TO_INT (g_hash_table_lookup (positions, (GFile *) scan->data)); + + /* save the new order in the catalog, appending the hidden files at + * the end. */ + + new_file_list = _g_object_list_ref (new_visible_files); + + visibles = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, (GDestroyNotify) g_object_unref, NULL); + for (scan = new_visible_files; scan; scan = scan->next) + g_hash_table_insert (visibles, g_object_ref ((GFile *) scan->data), GINT_TO_POINTER (1)); + + new_file_list = g_list_reverse (new_file_list); + for (scan = all_files; scan; scan = scan->next) { + GFile *file = scan->data; + + if (g_hash_table_lookup (visibles, file) == NULL) + new_file_list = g_list_prepend (new_file_list, g_object_ref (file)); + } + new_file_list = g_list_reverse (new_file_list); + + if (new_order_p != NULL) + *new_order_p = new_order; + else + g_free (new_order); + + if (new_file_list_p != NULL) + *new_file_list_p = new_file_list; + else + _g_object_list_unref (new_file_list); + + g_hash_table_destroy (visibles); + g_list_free (new_visible_files); + g_hash_table_destroy (positions); +} + + GList * _g_list_insert_list_before (GList *list1, GList *sibling, @@ -1158,6 +1229,49 @@ } +char ** +_g_strv_prepend (char **str_array, + const char *str) +{ + char **result; + int i; + int j; + + result = g_new (char *, g_strv_length (str_array) + 1); + i = 0; + result[i++] = g_strdup (str); + for (j = 0; str_array[j] != NULL; j++) + result[i++] = g_strdup (str_array[j]); + result[i] = NULL; + + return result; +} + + +gboolean +_g_strv_remove (char **str_array, + const char *str) +{ + int i; + int j; + + if (str == NULL) + return FALSE; + + for (i = 0; str_array[i] != NULL; i++) + if (strcmp (str_array[i], str) == 0) + break; + + if (str_array[i] == NULL) + return FALSE; + + for (j = i; str_array[j] != NULL; j++) + str_array[j] = str_array[j + 1]; + + return TRUE; +} + + char * _g_str_remove_suffix (const char *s, const char *suffix) @@ -1473,18 +1587,13 @@ } -GType -g_string_list_get_type (void) -{ - static GType type = 0; +typedef GList GStringList; - if (type == 0) - type = g_boxed_type_register_static ("GStringList", - (GBoxedCopyFunc) _g_string_list_dup, - (GBoxedFreeFunc) _g_string_list_free); - return type; -} +G_DEFINE_BOXED_TYPE (GStringList, + g_string_list, + (GBoxedCopyFunc) _g_string_list_dup, + (GBoxedFreeFunc) _g_string_list_free) GList * @@ -2737,6 +2846,81 @@ } +char * +_g_settings_get_uri (GSettings *settings, + const char *key) +{ + char *value; + char *uri; + + value = g_settings_get_string (settings, key); + if ((value == NULL) || (strcmp (value, "") == 0)) { + g_free (value); + return NULL; + } + + uri = _g_replace (value, "~", g_get_home_dir ()); + g_free (value); + + return uri; +} + + +void +_g_settings_set_uri (GSettings *settings, + const char *key, + const char *uri) +{ + char *value; + + value = _g_replace (uri, g_get_home_dir (), "~"); + g_settings_set_string (settings, key, value); + + g_free (value); +} + + +void +_g_settings_set_string_list (GSettings *settings, + const char *key, + GList *list) +{ + int len; + char **strv; + int i; + GList *scan; + + len = g_list_length (list); + strv = g_new (char *, len + 1); + for (i = 0, scan = list; scan; scan = scan->next) + strv[i++] = scan->data; + strv[i] = NULL; + + g_settings_set_strv (settings, key, (const char *const *) strv); + + g_free (strv); +} + + +GList * +_g_settings_get_string_list (GSettings *settings, + const char *key) +{ + char **strv; + int i; + GList *list; + + strv = g_settings_get_strv (settings, key); + list = NULL; + for (i = 0; strv[i] != NULL; i++) + list = g_list_prepend (list, g_strdup (strv[i])); + + g_strfreev (strv); + + return g_list_reverse (list); +} + + /* this is totem_time_to_string renamed, thanks to the authors :) */ char * _g_format_duration_for_display (gint64 msecs) @@ -2769,3 +2953,13 @@ */ return g_strdup_printf (C_("short time format", "%d:%02d"), min, sec); } + + +GList * +_g_list_prepend_link (GList *list, + GList *link) +{ + link->next = list; + if (list != NULL) list->prev = link; + return link; +} diff -Nru gthumb-2.14.3/gthumb/glib-utils.h gthumb-3.0.0/gthumb/glib-utils.h --- gthumb-2.14.3/gthumb/glib-utils.h 2011-12-11 16:09:39.000000000 +0000 +++ gthumb-3.0.0/gthumb/glib-utils.h 2012-04-09 18:29:50.000000000 +0000 @@ -55,6 +55,7 @@ #define GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE (DEFINE_STANDARD_ATTRIBUTES(",standard::fast-content-type")) #define GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE (DEFINE_STANDARD_ATTRIBUTES(",standard::fast-content-type,standard::content-type")) #define GIO_ATTRIBUTES ("standard::*,etag::*,id::*,access::*,mountable::*,time::*,unix::*,dos::*,owner::*,thumbnail::*,filesystem::*,gvfs::*,xattr::*,xattr-sys::*,selinux::*") +#define GTH_FILE_ATTRIBUTE_EMBLEMS "gth::file::emblems" #define GNOME_COPIED_FILES (gdk_atom_intern_static_string ("x-special/gnome-copied-files")) #define IROUND(x) ((int)floor(((double)x) + 0.5)) @@ -175,26 +176,36 @@ const char *replacement); char * _g_utf8_strndup (const char *str, gsize n); -char ** _g_utf8_strsplit (const char *string, - const char *delimiter, - int max_tokens); +char ** _g_utf8_strsplit (const char *string, + const char *delimiter, + int max_tokens); char * _g_utf8_strstrip (const char *str); gboolean _g_utf8_all_spaces (const char *utf8_string); char * _g_utf8_remove_extension (const char *str); GList * _g_list_insert_list_before (GList *list1, GList *sibling, GList *list2); +void _g_list_reorder (GList *all_files, + GList *visible_files, + GList *files_to_move, + int dest_pos, + int **new_order_p, + GList **new_file_list_p); const char * get_static_string (const char *s); char * _g_rand_string (int len); -int _g_strv_find (char **v, - const char *s); -char * _g_str_remove_suffix (const char *s, - const char *suffix); -void _g_string_append_for_html (GString *str, - const char *text, - gssize length); -char * _g_escape_for_html (const char *text, - gssize length); +int _g_strv_find (char **v, + const char *s); +char ** _g_strv_prepend (char **str_array, + const char *str); +gboolean _g_strv_remove (char **str_array, + const char *str); +char * _g_str_remove_suffix (const char *s, + const char *suffix); +void _g_string_append_for_html (GString *str, + const char *text, + gssize length); +char * _g_escape_for_html (const char *text, + gssize length); /* Array utils*/ @@ -297,9 +308,24 @@ gboolean _g_mime_type_is_video (const char *mime_type); gboolean _g_mime_type_is_audio (const char *mime_type); +/* GSettings utils */ + +char * _g_settings_get_uri (GSettings *settings, + const char *key); +void _g_settings_set_uri (GSettings *settings, + const char *key, + const char *uri); +void _g_settings_set_string_list (GSettings *settings, + const char *key, + GList *list); +GList * _g_settings_get_string_list (GSettings *settings, + const char *key); + /* Other */ -char * _g_format_duration_for_display (gint64 msecs); +char * _g_format_duration_for_display (gint64 msecs); +GList * _g_list_prepend_link (GList *list, + GList *link); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/gnome-desktop-thumbnail.c gthumb-3.0.0/gthumb/gnome-desktop-thumbnail.c --- gthumb-2.14.3/gthumb/gnome-desktop-thumbnail.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gnome-desktop-thumbnail.c 2012-03-24 15:05:01.000000000 +0000 @@ -58,8 +58,6 @@ #include #define GDK_PIXBUF_ENABLE_BACKEND #include -#include -#include #include #define GNOME_DESKTOP_USE_UNSTABLE_API #include "gnome-desktop-thumbnail.h" @@ -73,8 +71,6 @@ GMutex *lock; -#ifdef HAVE_GNOME_3 - GList *thumbnailers; GHashTable *mime_types_map; GList *monitors; @@ -83,14 +79,6 @@ gboolean loaded : 1; gboolean disabled : 1; gchar **disabled_types; - -#else /* ! HAVE_GNOME_3 */ - - GHashTable *scripts_hash; - guint thumbnailers_notify; - guint reread_scheduled; - -#endif }; static const char *appname = "gnome-thumbnail-factory"; @@ -288,10 +276,6 @@ return pixbuf; } - -#ifdef HAVE_GNOME_3 - - #define LOAD_BUFFER_SIZE 4096 #define THUMBNAILER_ENTRY_GROUP "Thumbnailer Entry" @@ -776,205 +760,6 @@ } -#else /* ! HAVE_GNOME_3 */ - - -/* Must be called on main thread */ -static GHashTable * -read_scripts (void) -{ - GHashTable *scripts_hash; - GConfClient *client; - GSList *subdirs, *l; - char *subdir, *enable, *escape, *commandkey, *command, *mimetype; - - client = gconf_client_get_default (); - - if (gconf_client_get_bool (client, - "/desktop/gnome/thumbnailers/disable_all", - NULL)) - { - g_object_unref (G_OBJECT (client)); - return NULL; - } - - scripts_hash = g_hash_table_new_full (g_str_hash, - g_str_equal, - g_free, g_free); - - - subdirs = gconf_client_all_dirs (client, "/desktop/gnome/thumbnailers", NULL); - - for (l = subdirs; l != NULL; l = l->next) - { - subdir = l->data; - - enable = g_strdup_printf ("%s/enable", subdir); - if (gconf_client_get_bool (client, - enable, - NULL)) - { - commandkey = g_strdup_printf ("%s/command", subdir); - command = gconf_client_get_string (client, commandkey, NULL); - g_free (commandkey); - - if (command != NULL) { - mimetype = strrchr (subdir, '/'); - if (mimetype != NULL) - { - mimetype++; /* skip past slash */ - - /* Convert '@' to slash in mimetype */ - escape = strchr (mimetype, '@'); - if (escape != NULL) - *escape = '/'; - - /* Convert any remaining '@' to '+' in mimetype */ - while ((escape = strchr (mimetype, '@')) != NULL) - *escape = '+'; - - g_hash_table_insert (scripts_hash, - g_strdup (mimetype), command); - } - else - { - g_free (command); - } - } - } - g_free (enable); - - g_free (subdir); - } - - g_slist_free(subdirs); - - g_object_unref (G_OBJECT (client)); - - return scripts_hash; -} - - -/* Must be called on main thread */ -static void -gnome_desktop_thumbnail_factory_reread_scripts (GnomeDesktopThumbnailFactory *factory) -{ - GnomeDesktopThumbnailFactoryPrivate *priv = factory->priv; - GHashTable *scripts_hash; - - scripts_hash = read_scripts (); - - g_mutex_lock (priv->lock); - - if (priv->scripts_hash != NULL) - g_hash_table_destroy (priv->scripts_hash); - - priv->scripts_hash = scripts_hash; - - g_mutex_unlock (priv->lock); -} - - -static gboolean -reread_idle_callback (gpointer user_data) -{ - GnomeDesktopThumbnailFactory *factory = user_data; - GnomeDesktopThumbnailFactoryPrivate *priv = factory->priv; - - gnome_desktop_thumbnail_factory_reread_scripts (factory); - - g_mutex_lock (priv->lock); - priv->reread_scheduled = 0; - g_mutex_unlock (priv->lock); - - return FALSE; -} - -static void -schedule_reread (GConfClient* client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) -{ - GnomeDesktopThumbnailFactory *factory = user_data; - GnomeDesktopThumbnailFactoryPrivate *priv = factory->priv; - - g_mutex_lock (priv->lock); - - if (priv->reread_scheduled == 0) - { - priv->reread_scheduled = g_idle_add (reread_idle_callback, - factory); - } - - g_mutex_unlock (priv->lock); -} - - -static void -gnome_desktop_thumbnail_factory_init_scripts (GnomeDesktopThumbnailFactory *factory) -{ - GConfClient *client; - - factory->priv->scripts_hash = NULL; - - client = gconf_client_get_default (); - gconf_client_add_dir (client, - "/desktop/gnome/thumbnailers", - GCONF_CLIENT_PRELOAD_RECURSIVE, NULL); - - gnome_desktop_thumbnail_factory_reread_scripts (factory); - - factory->priv->thumbnailers_notify = gconf_client_notify_add (client, "/desktop/gnome/thumbnailers", - schedule_reread, factory, NULL, - NULL); - - g_object_unref (G_OBJECT (client)); -} - - -static void -gnome_desktop_thumbnail_factory_finalize_scripts (GnomeDesktopThumbnailFactory *factory) -{ - if (factory->priv->scripts_hash) { - g_hash_table_destroy (factory->priv->scripts_hash); - factory->priv->scripts_hash = NULL; - } - - if (factory->priv->reread_scheduled != 0) { - g_source_remove (factory->priv->reread_scheduled); - factory->priv->reread_scheduled = 0; - } - - if (factory->priv->thumbnailers_notify != 0) { - GConfClient *client; - - client = gconf_client_get_default (); - gconf_client_notify_remove (client, factory->priv->thumbnailers_notify); - factory->priv->thumbnailers_notify = 0; - g_object_unref (client); - } -} - - -static char * -gnome_desktop_thumbnail_factory_get_script (GnomeDesktopThumbnailFactory *factory, - const char *mime_type) -{ - char *script = NULL; - - if (factory->priv->scripts_hash != NULL) { - script = g_hash_table_lookup (factory->priv->scripts_hash, mime_type); - if (script) - script = g_strdup (script); - } - - return script; -} - -#endif - - static void gnome_desktop_thumbnail_factory_finalize (GObject *object) { diff -Nru gthumb-2.14.3/gthumb/gth-async-task.c gthumb-3.0.0/gthumb/gth-async-task.c --- gthumb-2.14.3/gthumb/gth-async-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-async-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -53,7 +53,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthAsyncTask, gth_async_task, GTH_TYPE_TASK) static void @@ -74,7 +74,7 @@ g_mutex_free (self->priv->data_mutex); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_async_task_parent_class)->finalize (object); } @@ -250,7 +250,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthAsyncTaskPrivate)); object_class = G_OBJECT_CLASS (class); @@ -308,34 +307,6 @@ } -GType -gth_async_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthAsyncTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_async_task_class_init, - NULL, - NULL, - sizeof (GthAsyncTask), - 0, - (GInstanceInitFunc) gth_async_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthAsyncTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_async_task_new (GthAsyncInitFunc before_func, GthAsyncThreadFunc exec_func, diff -Nru gthumb-2.14.3/gthumb/gth-auto-paned.c gthumb-3.0.0/gthumb/gth-auto-paned.c --- gthumb-2.14.3/gthumb/gth-auto-paned.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-auto-paned.c 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,109 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include "gth-auto-paned.h" + + +G_DEFINE_TYPE (GthAutoPaned, gth_auto_paned, GTK_TYPE_PANED) + + +struct _GthAutoPanedPrivate { + gboolean child1_visible; + gboolean child2_visible; +}; + + +static gboolean +_gtk_widget_get_visible (GtkWidget *widget) +{ + return (widget != NULL) && gtk_widget_get_visible (widget); +} + + +static void +gth_auto_paned_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + GthAutoPaned *self = GTH_AUTO_PANED (widget); + GtkWidget *child1; + GtkWidget *child2; + gboolean reset_position; + + child1 = gtk_paned_get_child1 (GTK_PANED (self)); + child2 = gtk_paned_get_child2 (GTK_PANED (self)); + + reset_position = FALSE; + if ((self->priv->child1_visible != _gtk_widget_get_visible (child1)) + || (self->priv->child2_visible != _gtk_widget_get_visible (child2))) + { + reset_position = TRUE; + self->priv->child1_visible = _gtk_widget_get_visible (child1); + self->priv->child2_visible = _gtk_widget_get_visible (child2); + } + + if (reset_position) { + int position; + + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (self))) { + case GTK_ORIENTATION_HORIZONTAL: + position = allocation->width / 2; + break; + case GTK_ORIENTATION_VERTICAL: + position = allocation->height / 2; + break; + } + gtk_paned_set_position (GTK_PANED (self), position); + } + + GTK_WIDGET_CLASS (gth_auto_paned_parent_class)->size_allocate (widget, allocation); +} + + +static void +gth_auto_paned_class_init (GthAutoPanedClass *klass) +{ + GtkWidgetClass *widget_class; + + g_type_class_add_private (klass, sizeof (GthAutoPanedPrivate)); + + widget_class = GTK_WIDGET_CLASS (klass); + widget_class->size_allocate = gth_auto_paned_size_allocate; +} + + +static void +gth_auto_paned_init (GthAutoPaned *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_PANED, GthAutoPanedPrivate); + self->priv->child1_visible = FALSE; + self->priv->child2_visible = FALSE; +} + + +GtkWidget * +gth_auto_paned_new (GtkOrientation orientation) +{ + return g_object_new (GTH_TYPE_PANED, + "orientation", orientation, + NULL); +} diff -Nru gthumb-2.14.3/gthumb/gth-auto-paned.h gthumb-3.0.0/gthumb/gth-auto-paned.h --- gthumb-2.14.3/gthumb/gth-auto-paned.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-auto-paned.h 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,56 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_AUTO_PANED_H +#define GTH_AUTO_PANED_H + +#include +#include +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_PANED (gth_auto_paned_get_type ()) +#define GTH_AUTO_PANED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_PANED, GthAutoPaned)) +#define GTH_AUTO_PANED_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_PANED, GthAutoPanedClass)) +#define GTH_IS_PANED(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_PANED)) +#define GTH_IS_PANED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_PANED)) +#define GTH_AUTO_PANED_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_PANED, GthAutoPanedClass)) + +typedef struct _GthAutoPaned GthAutoPaned; +typedef struct _GthAutoPanedClass GthAutoPanedClass; +typedef struct _GthAutoPanedPrivate GthAutoPanedPrivate; + +struct _GthAutoPaned { + GtkPaned parent_instance; + GthAutoPanedPrivate *priv; +}; + +struct _GthAutoPanedClass { + GtkPanedClass parent_class; +}; + +GType gth_auto_paned_get_type (void); +GtkWidget * gth_auto_paned_new (GtkOrientation orientation); + +G_END_DECLS + +#endif /* GTH_AUTO_PANED_H */ diff -Nru gthumb-2.14.3/gthumb/gth-browser-actions-callbacks.c gthumb-3.0.0/gthumb/gth-browser-actions-callbacks.c --- gthumb-2.14.3/gthumb/gth-browser-actions-callbacks.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-browser-actions-callbacks.c 2012-03-31 09:42:24.000000000 +0000 @@ -21,10 +21,10 @@ #include #include +#include "dlg-location.h" #include "dlg-personalize-filters.h" #include "dlg-preferences.h" #include "dlg-sort-order.h" -#include "gconf-utils.h" #include "glib-utils.h" #include "gth-browser.h" #include "gth-file-list.h" @@ -103,8 +103,7 @@ { GtkWidget *window; - window = gth_browser_new (NULL); - gth_browser_go_to (GTH_BROWSER (window), gth_browser_get_location (browser), NULL); + window = gth_browser_new (gth_browser_get_location (browser), NULL); gtk_window_present (GTK_WINDOW (window)); } @@ -142,6 +141,14 @@ void +gth_browser_activate_action_go_location (GtkAction *action, + GthBrowser *browser) +{ + dlg_location (browser); +} + + +void gth_browser_activate_action_go_home (GtkAction *action, GthBrowser *browser) { @@ -201,7 +208,12 @@ gth_browser_activate_action_view_toolbar (GtkAction *action, GthBrowser *browser) { - eel_gconf_set_boolean (PREF_UI_TOOLBAR_VISIBLE, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + GSettings *settings; + + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + g_settings_set_boolean (settings, PREF_BROWSER_TOOLBAR_VISIBLE, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + + g_object_unref (settings); } @@ -209,7 +221,12 @@ gth_browser_activate_action_view_show_hidden_files (GtkAction *action, GthBrowser *browser) { - eel_gconf_set_boolean (PREF_SHOW_HIDDEN_FILES, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + GSettings *settings; + + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + g_settings_set_boolean (settings, PREF_BROWSER_SHOW_HIDDEN_FILES, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + + g_object_unref (settings); } @@ -217,7 +234,12 @@ gth_browser_activate_action_view_statusbar (GtkAction *action, GthBrowser *browser) { - eel_gconf_set_boolean (PREF_UI_STATUSBAR_VISIBLE, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + GSettings *settings; + + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + g_settings_set_boolean (settings, PREF_BROWSER_STATUSBAR_VISIBLE, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + + g_object_unref (settings); } @@ -225,7 +247,12 @@ gth_browser_activate_action_view_sidebar (GtkAction *action, GthBrowser *browser) { - eel_gconf_set_boolean (PREF_UI_SIDEBAR_VISIBLE, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + GSettings *settings; + + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + g_settings_set_boolean (settings, PREF_BROWSER_SIDEBAR_VISIBLE, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + + g_object_unref (settings); } @@ -233,7 +260,12 @@ gth_browser_activate_action_view_thumbnail_list (GtkAction *action, GthBrowser *browser) { - eel_gconf_set_boolean (PREF_UI_THUMBNAIL_LIST_VISIBLE, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + GSettings *settings; + + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + g_settings_set_boolean (settings, PREF_BROWSER_THUMBNAIL_LIST_VISIBLE, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + + g_object_unref (settings); } @@ -296,9 +328,8 @@ if (file_data == NULL) return; - new_browser = gth_browser_new (NULL); + new_browser = gth_browser_new (file_data->file, NULL); gtk_window_present (GTK_WINDOW (new_browser)); - gth_browser_load_location (GTH_BROWSER (new_browser), file_data->file); g_object_unref (file_data); } @@ -322,7 +353,7 @@ gth_browser_activate_action_viewer_properties (GtkAction *action, GthBrowser *browser) { - gth_browser_show_viewer_properties (GTH_BROWSER (browser), gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); + gth_browser_show_file_properties (GTH_BROWSER (browser), gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); } @@ -335,6 +366,14 @@ void +gth_browser_activate_action_view_shrink_wrap (GtkAction *action, + GthBrowser *browser) +{ + gth_browser_set_shrink_wrap_viewer (GTH_BROWSER (browser), gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); +} + + +void gth_browser_activate_action_edit_select_all (GtkAction *action, GthBrowser *browser) { diff -Nru gthumb-2.14.3/gthumb/gth-browser-actions-callbacks.h gthumb-3.0.0/gthumb/gth-browser-actions-callbacks.h --- gthumb-2.14.3/gthumb/gth-browser-actions-callbacks.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-browser-actions-callbacks.h 2012-03-31 09:42:24.000000000 +0000 @@ -29,7 +29,7 @@ DEFINE_ACTION(gth_browser_activate_action_bookmarks_add) DEFINE_ACTION(gth_browser_activate_action_bookmarks_edit) DEFINE_ACTION(gth_browser_activate_action_browser_mode) -DEFINE_ACTION(gth_browser_activate_action_edit_metadata) +DEFINE_ACTION(gth_browser_activate_action_edit_comment) DEFINE_ACTION(gth_browser_activate_action_edit_preferences) DEFINE_ACTION(gth_browser_activate_action_edit_select_all) DEFINE_ACTION(gth_browser_activate_action_file_open) @@ -43,6 +43,7 @@ DEFINE_ACTION(gth_browser_activate_action_go_back) DEFINE_ACTION(gth_browser_activate_action_go_forward) DEFINE_ACTION(gth_browser_activate_action_go_up) +DEFINE_ACTION(gth_browser_activate_action_go_location) DEFINE_ACTION(gth_browser_activate_action_go_clear_history) DEFINE_ACTION(gth_browser_activate_action_go_home) DEFINE_ACTION(gth_browser_activate_action_help_help) @@ -64,5 +65,6 @@ DEFINE_ACTION(gth_browser_activate_action_view_prev) DEFINE_ACTION(gth_browser_activate_action_viewer_properties) DEFINE_ACTION(gth_browser_activate_action_viewer_tools) +DEFINE_ACTION(gth_browser_activate_action_view_shrink_wrap) #endif /* GTH_BROWSER_ACTIONS_CALLBACK_H */ diff -Nru gthumb-2.14.3/gthumb/gth-browser-actions-entries.h gthumb-3.0.0/gthumb/gth-browser-actions-entries.h --- gthumb-2.14.3/gthumb/gth-browser-actions-entries.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-browser-actions-entries.h 2012-03-31 09:42:24.000000000 +0000 @@ -25,8 +25,9 @@ #include #include #include "gth-stock.h" +#include "gtk-utils.h" -static GtkActionEntry gth_browser_action_entries[] = { +static GthActionEntryExt gth_browser_action_entries[] = { { "FileMenu", NULL, N_("_File") }, { "EditMenu", NULL, N_("_Edit") }, { "ViewMenu", NULL, N_("_View") }, @@ -39,134 +40,165 @@ { "File_NewWindow", "window-new", N_("New _Window"), "N", N_("Open another window"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_file_new_window) }, { "File_Open", GTK_STOCK_OPEN, NULL, NULL, NULL, + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_file_open) }, { "File_Save", GTK_STOCK_SAVE, NULL, "S", NULL, + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_file_save) }, { "File_SaveAs", GTK_STOCK_SAVE_AS, NULL, NULL, NULL, + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_file_save_as) }, { "File_Revert", GTK_STOCK_REVERT_TO_SAVED, NULL, "F4", NULL, + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_file_revert) }, { "Folder_Open", GTK_STOCK_OPEN, N_("Open"), "", NULL, + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_folder_open) }, { "Folder_OpenInNewWindow", NULL, N_("Open in New Window"), "", NULL, + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_folder_open_in_new_window) }, { "Edit_Preferences", GTK_STOCK_PREFERENCES, NULL, NULL, N_("Edit various preferences"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_edit_preferences) }, { "Edit_SelectAll", GTK_STOCK_SELECT_ALL, - NULL, NULL, + NULL, "A", NULL, + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_edit_select_all) }, { "View_Sort_By", NULL, N_("_Sort By..."), NULL, NULL, + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_view_sort_by) }, { "View_Filters", NULL, N_("_Filter..."), NULL, NULL, + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_view_filter) }, { "View_Stop", GTK_STOCK_STOP, NULL, "Escape", N_("Stop loading the current location"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_view_stop) }, { "View_Reload", GTK_STOCK_REFRESH, NULL, "R", N_("Reload the current location"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_view_reload) }, { "View_Prev", GTK_STOCK_GO_UP, N_("Previous"), NULL, N_("View previous image"), + GTH_ACTION_FLAG_IS_IMPORTANT, G_CALLBACK (gth_browser_activate_action_view_prev) }, { "View_Next", GTK_STOCK_GO_DOWN, N_("Next"), NULL, N_("View next image"), + GTH_ACTION_FLAG_IS_IMPORTANT, G_CALLBACK (gth_browser_activate_action_view_next) }, { "View_Fullscreen", GTK_STOCK_FULLSCREEN, NULL, "F11", N_("Switch to fullscreen"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_view_fullscreen) }, { "View_Leave_Fullscreen", GTK_STOCK_LEAVE_FULLSCREEN, NULL, NULL, N_("Leave Fullscreen"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_view_fullscreen) }, { "Go_Back", GTK_STOCK_GO_BACK, NULL, "Left", N_("Go to the previous visited location"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_go_back) }, { "Go_Forward", GTK_STOCK_GO_FORWARD, NULL, "Right", N_("Go to the next visited location"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_go_forward) }, { "Go_Up", GTK_STOCK_GO_UP, NULL, "Up", N_("Go up one level"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_go_up) }, + { "Go_Location", NULL, + N_("_Location..."), "L", + N_("Specify a location to open"), + GTH_ACTION_FLAG_NONE, + G_CALLBACK (gth_browser_activate_action_go_location) }, + { "Go_Home", NULL, NULL, "Home", NULL, + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_go_home) }, { "Go_Clear_History", GTK_STOCK_CLEAR, N_("_Delete History"), NULL, N_("Delete the list of visited locations"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_go_clear_history) }, { "View_BrowserMode", GTH_STOCK_BROWSER_MODE, N_("Browser"), "Escape", N_("View the folders"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_browser_mode) }, { "Help_About", GTK_STOCK_ABOUT, NULL, NULL, N_("Show information about gthumb"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_help_about) }, { "Help_Help", GTK_STOCK_HELP, N_("Contents"), "F1", N_("Display the gthumb Manual"), + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_help_help) }, { "Help_Shortcuts", NULL, N_("_Keyboard Shortcuts"), NULL, " ", + GTH_ACTION_FLAG_NONE, G_CALLBACK (gth_browser_activate_action_help_shortcuts) }, }; -static guint gth_browser_action_entries_size = G_N_ELEMENTS (gth_browser_action_entries); static GtkToggleActionEntry gth_browser_action_toggle_entries[] = { @@ -210,12 +242,21 @@ N_("View file properties"), G_CALLBACK (gth_browser_activate_action_viewer_properties), FALSE }, + { "Browser_Properties", GTK_STOCK_PROPERTIES, + NULL, NULL, + N_("View file properties"), + G_CALLBACK (gth_browser_activate_action_viewer_properties), + FALSE }, { "Viewer_Tools", "palette", N_("Edit"), NULL, N_("Edit file"), G_CALLBACK (gth_browser_activate_action_viewer_tools), FALSE }, + { "View_ShrinkWrap", NULL, + N_("_Fit Window to Image"), "e", + N_("Resize the window to the size of the image"), + G_CALLBACK (gth_browser_activate_action_view_shrink_wrap), + FALSE }, }; -static guint gth_browser_action_toggle_entries_size = G_N_ELEMENTS (gth_browser_action_toggle_entries); #endif /* GTH_BROWSER_ACTION_ENTRIES_H */ diff -Nru gthumb-2.14.3/gthumb/gth-browser.c gthumb-3.0.0/gthumb/gth-browser.c --- gthumb-2.14.3/gthumb/gth-browser.c 2012-03-24 16:39:31.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-browser.c 2012-04-23 17:31:47.000000000 +0000 @@ -20,12 +20,13 @@ */ #include +#include #include #include #include "dlg-personalize-filters.h" -#include "gconf-utils.h" #include "glib-utils.h" #include "gtk-utils.h" +#include "gth-auto-paned.h" #include "gth-browser.h" #include "gth-browser-actions-callbacks.h" #include "gth-browser-actions-entries.h" @@ -40,14 +41,14 @@ #include "gth-filter.h" #include "gth-filterbar.h" #include "gth-folder-tree.h" +#include "gth-grid-view.h" #include "gth-icon-cache.h" -#include "gth-icon-view.h" #include "gth-info-bar.h" #include "gth-image-preloader.h" -#include "gth-list-view.h" #include "gth-location-chooser.h" #include "gth-main.h" #include "gth-marshal.h" +#include "gth-menu-action.h" #include "gth-metadata-provider.h" #include "gth-preferences.h" #include "gth-progress-dialog.h" @@ -61,15 +62,7 @@ #include "main.h" #define GTH_BROWSER_CALLBACK(f) ((GthBrowserCallback) (f)) -#define GO_BACK_HISTORY_POPUP "/GoBackHistoryPopup" -#define GO_FORWARD_HISTORY_POPUP "/GoForwardHistoryPopup" -#define GO_PARENT_POPUP "/GoParentPopup" #define MAX_HISTORY_LENGTH 15 -#define GCONF_NOTIFICATIONS 13 -#define DEF_SIDEBAR_WIDTH 255 -#define DEF_VIEWER_SIDEBAR_WIDTH 285 -#define DEF_PROPERTIES_HEIGHT 128 -#define DEF_THUMBNAIL_SIZE 128 #define LOAD_FILE_DELAY 150 #define HIDE_MOUSE_DELAY 1000 #define MOTION_THRESHOLD 0 @@ -77,6 +70,11 @@ #define MIN_SIDEBAR_SIZE 100 #define MIN_VIEWER_SIZE 256 #define STATUSBAR_SEPARATOR " · " +#define SHIRNK_WRAP_WIDTH_OFFSET 100 +#define SHIRNK_WRAP_HEIGHT_OFFSET 125 +#define FILE_PROPERTIES_MINIMUM_HEIGHT 100 + +G_DEFINE_TYPE (GthBrowser, gth_browser, GTH_TYPE_WINDOW) enum { @@ -84,7 +82,7 @@ LAST_SIGNAL }; -struct _GthBrowserPrivateData { +struct _GthBrowserPrivate { /* UI staff */ GtkUIManager *ui; @@ -92,10 +90,9 @@ GtkWidget *infobar; GtkWidget *statusbar; GtkWidget *browser_toolbar; - GtkWidget *browser_container; + GtkWidget *browser_right_container; + GtkWidget *browser_left_container; GtkWidget *browser_sidebar; - GtkWidget *location_chooser_container; - GtkWidget *location_chooser; GtkWidget *folder_tree; GtkWidget *history_list_popup_menu; GtkWidget *folder_popup; @@ -132,6 +129,7 @@ gulong folder_changed_id; gulong file_renamed_id; gulong metadata_changed_id; + gulong emblems_changed_id; gulong entry_points_changed_id; gulong order_changed_id; GthFileData *location; @@ -142,7 +140,6 @@ GFile *monitor_location; gboolean activity_ref; GthIconCache *menu_icon_cache; - guint cnxn_id[GCONF_NOTIFICATIONS]; GthFileDataSort *current_sort_type; gboolean current_sort_inverse; GthFileDataSort *default_sort_type; @@ -159,11 +156,20 @@ guint load_file_timeout; char *list_attributes; gboolean constructed; + guint construct_step2_event; guint selection_changed_event; GthFileData *folder_popup_file_data; gboolean properties_on_screen; char *location_free_space; gboolean recalc_location_free_space; + gboolean shrink_wrap_viewer; + gboolean file_properties_on_the_right; + + /* settings */ + + GSettings *browser_settings; + GSettings *messages_settings; + GSettings *desktop_interface_settings; /* fulscreen */ @@ -185,12 +191,13 @@ GList *history; GList *history_current; + GtkWidget *back_history_menu; + GtkWidget *forward_history_menu; + GtkWidget *go_parent_menu; }; -static GthWindowClass *parent_class = NULL; static guint gth_browser_signals[LAST_SIGNAL] = { 0 }; -static GList *browser_list = NULL; /* -- monitor_event_data -- */ @@ -455,7 +462,7 @@ int i; GFile *parent; - menu = gtk_ui_manager_get_widget (browser->priv->ui, GO_PARENT_POPUP); + menu = browser->priv->go_parent_menu; _gtk_container_remove_children (GTK_CONTAINER (menu), NULL, NULL); if (browser->priv->location == NULL) @@ -582,10 +589,7 @@ gth_browser_update_extra_widget (GthBrowser *browser) { gedit_message_area_clear_action_area (GEDIT_MESSAGE_AREA (browser->priv->list_extra_widget)); - if (g_file_info_get_icon (browser->priv->location->info) != NULL) - gth_embedded_dialog_set_gicon (GTH_EMBEDDED_DIALOG (browser->priv->list_extra_widget), g_file_info_get_icon (browser->priv->location->info), GTK_ICON_SIZE_BUTTON); - if (g_file_info_get_display_name (browser->priv->location->info) != NULL) - gth_embedded_dialog_set_primary_text (GTH_EMBEDDED_DIALOG (browser->priv->list_extra_widget), g_file_info_get_display_name (browser->priv->location->info)); + gth_embedded_dialog_set_from_file (GTH_EMBEDDED_DIALOG (browser->priv->list_extra_widget), browser->priv->location->file); gth_hook_invoke ("gth-browser-update-extra-widget", browser); } @@ -594,6 +598,8 @@ _gth_browser_set_location (GthBrowser *browser, GthFileData *location) { + GtkWidget *location_chooser; + if (location == NULL) return; @@ -604,11 +610,11 @@ gth_browser_update_title (browser); _gth_browser_update_parent_list (browser); gth_browser_update_sensitivity (browser); - gth_browser_update_extra_widget (browser); - g_signal_handlers_block_by_data (browser->priv->location_chooser, browser); - gth_location_chooser_set_current (GTH_LOCATION_CHOOSER (browser->priv->location_chooser), browser->priv->location->file); - g_signal_handlers_unblock_by_data (browser->priv->location_chooser, browser); + location_chooser = gth_embedded_dialog_get_chooser (GTH_EMBEDDED_DIALOG (browser->priv->list_extra_widget)); + g_signal_handlers_block_by_data (location_chooser, browser); + gth_browser_update_extra_widget (browser); + g_signal_handlers_unblock_by_data (location_chooser, browser); } @@ -707,7 +713,7 @@ /* Update the back history menu. */ - menu = gtk_ui_manager_get_widget (browser->priv->ui, GO_BACK_HISTORY_POPUP); + menu = browser->priv->back_history_menu; _gtk_container_remove_children (GTK_CONTAINER (menu), NULL, NULL); if ((browser->priv->history != NULL) @@ -732,7 +738,7 @@ /* Update the forward history menu. */ - menu = gtk_ui_manager_get_widget (browser->priv->ui, GO_FORWARD_HISTORY_POPUP); + menu = browser->priv->forward_history_menu; _gtk_container_remove_children (GTK_CONTAINER (menu), NULL, NULL); if ((browser->priv->history != NULL) @@ -790,10 +796,20 @@ if (file == NULL) return; - if ((browser->priv->history_current == NULL) || ! g_file_equal (file, browser->priv->history_current->data)) { + if ((browser->priv->history_current == NULL) || ! _g_file_equal_uris (file, browser->priv->history_current->data)) { GList *scan; - /* remove all the occurrences of file from the history */ + /* remove all files after the current position */ + for (scan = browser->priv->history; scan && (scan != browser->priv->history_current); /* void */) { + GList *next = scan->next; + + browser->priv->history = g_list_remove_link (browser->priv->history, scan); + _g_object_list_unref (scan); + + scan = next; + } + + /* remove all the occurrences of 'file' from the history */ for (scan = browser->priv->history; scan; /* void */) { GList *next = scan->next; GFile *file_in_history = scan->data; @@ -844,7 +860,7 @@ separator2 = gtk_ui_manager_get_widget (browser->priv->ui, "/MenuBar/Go/EntryPointListSeparator"); _gtk_container_remove_children (GTK_CONTAINER (menu), separator1, separator2); - position = 5; + position = 6; entry_points = gth_main_get_all_entry_points (); for (scan = entry_points; scan; scan = scan->next) { GthFileData *file_data = scan->data; @@ -985,8 +1001,8 @@ /**/ - size_total_formatted = g_format_size_for_display (size_total); - size_selected_formatted = g_format_size_for_display (size_selected); + size_total_formatted = g_format_size (size_total); + size_selected_formatted = g_format_size (size_selected); text_total = g_strdup_printf (g_dngettext (NULL, "%d file (%s)", "%d files (%s)", n_total), n_total, size_total_formatted); text_selected = g_strdup_printf (g_dngettext (NULL, "%d file selected (%s)", "%d files selected (%s)", n_selected), n_selected, size_selected_formatted); @@ -1022,7 +1038,7 @@ if (error == NULL) { char *free_space_formatted; - free_space_formatted = g_format_size_for_display (free_space); + free_space_formatted = g_format_size (free_space); free_space_text = g_strdup_printf (_("%s of free space"), free_space_formatted); g_free (free_space_formatted); @@ -1070,7 +1086,7 @@ GthBrowser *browser; GthFileData *requested_folder; GFile *requested_folder_parent; - GFile *scroll_to_file; + GFile *file_to_select; GthAction action; gboolean automatic; GList *list; @@ -1084,7 +1100,7 @@ static LoadData * load_data_new (GthBrowser *browser, GFile *location, - GFile *scroll_to_file, + GFile *file_to_select, GthAction action, gboolean automatic, GFile *entry_point) @@ -1096,10 +1112,10 @@ load_data->browser = browser; load_data->requested_folder = gth_file_data_new (location, NULL); load_data->requested_folder_parent = g_file_get_parent (load_data->requested_folder->file); - if (scroll_to_file != NULL) - load_data->scroll_to_file = g_file_dup (scroll_to_file); + if (file_to_select != NULL) + load_data->file_to_select = g_file_dup (file_to_select); else if (browser->priv->current_file != NULL) - load_data->scroll_to_file = g_file_dup (browser->priv->current_file->file); + load_data->file_to_select = g_file_dup (browser->priv->current_file->file); load_data->action = action; load_data->automatic = automatic; load_data->cancellable = g_cancellable_new (); @@ -1137,7 +1153,7 @@ g_object_unref (data->requested_folder); _g_object_unref (data->requested_folder_parent); - _g_object_unref (data->scroll_to_file); + _g_object_unref (data->file_to_select); _g_object_unref (data->file_source); _g_object_list_unref (data->list); _g_object_unref (data->entry_point); @@ -1146,7 +1162,7 @@ } -static void _gth_browser_load (GthBrowser *browser, GFile *location, GFile *scroll_to_file, GthAction action, gboolean automatic); +static void _gth_browser_load (GthBrowser *browser, GFile *location, GFile *file_to_select, GthAction action, gboolean automatic); static char * @@ -1182,21 +1198,19 @@ g_free (uri); } - if (error == NULL) { - _g_object_unref (browser->priv->location_source); - browser->priv->location_source = g_object_ref (load_data->file_source); - } - /* moving the "gth-browser-load-location-after" after the * LOCATION_READY signal emition can brake the extensions */ if ((load_data->action == GTH_ACTION_GO_TO) - || (load_data->action == GTH_ACTION_GO_INTO) || (load_data->action == GTH_ACTION_GO_BACK) || (load_data->action == GTH_ACTION_GO_FORWARD) || (load_data->action == GTH_ACTION_GO_UP) || (load_data->action == GTH_ACTION_VIEW)) { + if (error == NULL) { + _g_object_unref (browser->priv->location_source); + browser->priv->location_source = g_object_ref (load_data->file_source); + } gth_browser_update_extra_widget (browser); gth_hook_invoke ("gth-browser-load-location-after", browser, browser->priv->location, error); } @@ -1317,13 +1331,20 @@ /* attributes required for the thumbnail caption */ - thumbnail_caption = eel_gconf_get_string (PREF_THUMBNAIL_CAPTION, DEFAULT_THUMBNAIL_CAPTION); + thumbnail_caption = g_settings_get_string (browser->priv->browser_settings, PREF_BROWSER_THUMBNAIL_CAPTION); if ((thumbnail_caption[0] != '\0') && (strcmp (thumbnail_caption, "none") != 0)) { g_string_append (attributes, ","); g_string_append (attributes, thumbnail_caption); g_free (thumbnail_caption); } + /* other attributes */ + + g_string_append (attributes, ","); + g_string_append (attributes, GTH_FILE_ATTRIBUTE_EMBLEMS); + + /* save in a variable to avoid recalculation */ + browser->priv->list_attributes = g_string_free (attributes, FALSE); return browser->priv->list_attributes; @@ -1540,7 +1561,6 @@ GFile *loaded_folder; gboolean loaded_requested_folder; GtkTreePath *path; - GthTest *filter; gboolean changed_current_location; if ((load_data->action != GTH_ACTION_LIST_CHILDREN) @@ -1576,7 +1596,6 @@ case GTH_ACTION_GO_FORWARD: case GTH_ACTION_GO_UP: case GTH_ACTION_VIEW: - case GTH_ACTION_LIST_CHILDREN: if (path != NULL) { GList *entry_points; GList *scan; @@ -1589,22 +1608,20 @@ GthFileData *file_data = scan->data; if (g_file_equal (file_data->file, load_data->requested_folder->file)) { - gtk_tree_view_collapse_all (GTK_TREE_VIEW (browser->priv->folder_tree)); + gth_folder_tree_collapse_all (GTH_FOLDER_TREE (browser->priv->folder_tree)); gtk_tree_view_expand_row (GTK_TREE_VIEW (browser->priv->folder_tree), path, FALSE); is_entry_point = TRUE; break; } } - if (load_data->action != GTH_ACTION_LIST_CHILDREN) { - gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (browser->priv->folder_tree), - path, - NULL, - is_entry_point, - 0.0, - 0.0); - gth_folder_tree_select_path (GTH_FOLDER_TREE (browser->priv->folder_tree), path); - } + gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (browser->priv->folder_tree), + path, + NULL, + is_entry_point, + 0.0, + 0.0); + gth_folder_tree_select_path (GTH_FOLDER_TREE (browser->priv->folder_tree), path); _g_object_list_unref (entry_points); } @@ -1627,62 +1644,54 @@ } if (changed_current_location) { + GthTest *filter; + filter = _gth_browser_get_file_filter (browser); gth_file_list_set_filter (GTH_FILE_LIST (browser->priv->file_list), filter); gth_file_list_set_files (GTH_FILE_LIST (browser->priv->file_list), files); gth_file_list_set_filter (GTH_FILE_LIST (browser->priv->thumbnail_list), filter); gth_file_list_set_files (GTH_FILE_LIST (browser->priv->thumbnail_list), files); g_object_unref (filter); - } - if (load_data->scroll_to_file != NULL) { - int pos; + if (gth_window_get_current_page (GTH_WINDOW (browser)) == GTH_BROWSER_PAGE_BROWSER) + gtk_widget_grab_focus (browser->priv->file_list); - pos = gth_file_store_get_pos (gth_browser_get_file_store (browser), load_data->scroll_to_file); - if (pos >= 0) { - GtkWidget *file_view; + if (load_data->file_to_select != NULL) + gth_file_list_make_file_visible (GTH_FILE_LIST (browser->priv->file_list), load_data->file_to_select); - file_view = gth_browser_get_file_list_view (browser); - gth_file_view_scroll_to (GTH_FILE_VIEW (file_view), pos, 0.5); - gth_file_selection_select (GTH_FILE_SELECTION (file_view), pos); - } - } - gth_browser_update_sensitivity (browser); - _gth_browser_update_statusbar_list_info (browser); + gth_browser_update_sensitivity (browser); + _gth_browser_update_statusbar_list_info (browser); - if (browser->priv->monitor_location != NULL) - g_object_unref (browser->priv->monitor_location); - browser->priv->monitor_location = g_file_dup (browser->priv->location->file); - gth_file_source_monitor_directory (browser->priv->location_source, - browser->priv->monitor_location, - TRUE); + g_assert (browser->priv->location_source != NULL); - if (browser->priv->current_file != NULL) { - gth_browser_update_title (browser); - gth_browser_update_statusbar_file_info (browser); - if (gth_window_get_current_page (GTH_WINDOW (browser)) == GTH_BROWSER_PAGE_VIEWER) { - _gth_browser_make_file_visible (browser, browser->priv->current_file); - if (browser->priv->viewer_page != NULL) { - gth_viewer_page_update_info (browser->priv->viewer_page, browser->priv->current_file); - gth_viewer_page_focus (browser->priv->viewer_page); + if (browser->priv->monitor_location != NULL) + g_object_unref (browser->priv->monitor_location); + browser->priv->monitor_location = g_file_dup (browser->priv->location->file); + gth_file_source_monitor_directory (browser->priv->location_source, + browser->priv->monitor_location, + TRUE); + + if (browser->priv->current_file != NULL) { + gth_browser_update_title (browser); + gth_browser_update_statusbar_file_info (browser); + if (gth_window_get_current_page (GTH_WINDOW (browser)) == GTH_BROWSER_PAGE_VIEWER) { + _gth_browser_make_file_visible (browser, browser->priv->current_file); + if (browser->priv->viewer_page != NULL) { + gth_viewer_page_update_info (browser->priv->viewer_page, browser->priv->current_file); + gth_viewer_page_focus (browser->priv->viewer_page); + } } } - else if (gth_window_get_current_page (GTH_WINDOW (browser)) == GTH_BROWSER_PAGE_BROWSER) { - if (changed_current_location && ! _gth_browser_make_file_visible (browser, browser->priv->current_file)) - gtk_widget_hide (browser->priv->file_properties); - } - } - else if (changed_current_location) - gtk_widget_hide (browser->priv->file_properties); - if (StartSlideshow) { - StartSlideshow = FALSE; - gth_hook_invoke ("slideshow", browser); - } + if (StartSlideshow) { + StartSlideshow = FALSE; + gth_hook_invoke ("slideshow", browser); + } - if (StartInFullscreen) { - StartInFullscreen = FALSE; - gth_browser_fullscreen (browser); + if (StartInFullscreen) { + StartInFullscreen = FALSE; + gth_browser_fullscreen (browser); + } } if (path != NULL) @@ -1817,12 +1826,12 @@ /* try to load again */ - gth_monitor_file_entry_points_changed (gth_main_get_default_monitor()); + gth_monitor_entry_points_changed (gth_main_get_default_monitor()); _gth_browser_update_entry_point_list (load_data->browser); _gth_browser_load (load_data->browser, load_data->requested_folder->file, - load_data->scroll_to_file, + load_data->file_to_select, load_data->action, load_data->automatic); @@ -1841,7 +1850,7 @@ static void _gth_browser_load (GthBrowser *browser, GFile *location, - GFile *scroll_to_file, + GFile *file_to_select, GthAction action, gboolean automatic) { @@ -1853,16 +1862,14 @@ switch (action) { case GTH_ACTION_GO_TO: - case GTH_ACTION_GO_INTO: case GTH_ACTION_GO_BACK: case GTH_ACTION_GO_FORWARD: case GTH_ACTION_GO_UP: case GTH_ACTION_VIEW: - if (browser->priv->location_source != NULL) { + if ((browser->priv->location_source != NULL) && (browser->priv->monitor_location != NULL)) { gth_file_source_monitor_directory (browser->priv->location_source, browser->priv->monitor_location, FALSE); - _g_clear_object (&browser->priv->location_source); _g_clear_object (&browser->priv->monitor_location); } break; @@ -1871,7 +1878,7 @@ } entry_point = get_nearest_entry_point (location); - load_data = load_data_new (browser, location, scroll_to_file, action, automatic, entry_point); + load_data = load_data_new (browser, location, file_to_select, action, automatic, entry_point); if (entry_point == NULL) { GMountOperation *mount_op; @@ -1887,7 +1894,6 @@ } if ((load_data->action == GTH_ACTION_GO_TO) - || (load_data->action == GTH_ACTION_GO_INTO) || (load_data->action == GTH_ACTION_GO_BACK) || (load_data->action == GTH_ACTION_GO_FORWARD) || (load_data->action == GTH_ACTION_GO_UP) @@ -1938,7 +1944,6 @@ } switch (load_data->action) { - case GTH_ACTION_GO_INTO: case GTH_ACTION_GO_TO: case GTH_ACTION_VIEW: _gth_browser_set_location_from_file (browser, load_data->requested_folder->file); @@ -2082,6 +2087,7 @@ gth_viewer_page_deactivate (browser->priv->viewer_page); gtk_ui_manager_ensure_update (browser->priv->ui); gth_browser_set_viewer_widget (browser, NULL); + _gth_browser_set_action_sensitive (browser, "Viewer_Tools", FALSE); g_object_unref (browser->priv->viewer_page); browser->priv->viewer_page = NULL; } @@ -2094,8 +2100,7 @@ GthBrowser *browser = user_data; gboolean last_window; - browser_list = g_list_remove (browser_list, browser); - last_window = gth_window_get_n_windows () == 1; + last_window = g_list_length (gtk_application_get_windows (gtk_window_get_application (GTK_WINDOW (browser)))) == 1; /* Save visualization options only if the window is not maximized. */ @@ -2121,22 +2126,18 @@ &height); if (size_set) { - eel_gconf_set_integer (PREF_UI_WINDOW_WIDTH, width); - eel_gconf_set_integer (PREF_UI_WINDOW_HEIGHT, height); + g_settings_set_int (browser->priv->browser_settings, PREF_BROWSER_WINDOW_WIDTH, width); + g_settings_set_int (browser->priv->browser_settings, PREF_BROWSER_WINDOW_HEIGHT, height); } } gtk_widget_get_allocation (browser->priv->browser_sidebar, &allocation); if (allocation.width > MIN_SIDEBAR_SIZE) - eel_gconf_set_integer (PREF_UI_BROWSER_SIDEBAR_WIDTH, allocation.width); + g_settings_set_int (browser->priv->browser_settings, PREF_BROWSER_BROWSER_SIDEBAR_WIDTH, allocation.width); gtk_widget_get_allocation (browser->priv->viewer_sidebar_alignment, &allocation); if (allocation.width > MIN_SIDEBAR_SIZE) - eel_gconf_set_integer (PREF_UI_VIEWER_SIDEBAR_WIDTH, allocation.width); - - gtk_widget_get_allocation (browser->priv->file_properties, &allocation); - if (allocation.height > MIN_SIDEBAR_SIZE) - eel_gconf_set_integer (PREF_UI_PROPERTIES_HEIGHT, allocation.height); + g_settings_set_int (browser->priv->browser_settings, PREF_BROWSER_VIEWER_SIDEBAR_WIDTH, allocation.width); } /**/ @@ -2146,27 +2147,27 @@ gth_hook_invoke ("gth-browser-close", browser); if (gtk_widget_get_realized (GTK_WIDGET (browser)) && last_window) { - if (eel_gconf_get_boolean (PREF_GO_TO_LAST_LOCATION, TRUE) + if (g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_GO_TO_LAST_LOCATION) && (browser->priv->location != NULL)) { char *uri; uri = g_file_get_uri (browser->priv->location->file); - eel_gconf_set_path (PREF_STARTUP_LOCATION, uri); + _g_settings_set_uri (browser->priv->browser_settings, PREF_BROWSER_STARTUP_LOCATION, uri); g_free (uri); if (browser->priv->current_file != NULL) { uri = g_file_get_uri (browser->priv->current_file->file); - eel_gconf_set_path (PREF_STARTUP_CURRENT_FILE, uri); + _g_settings_set_uri (browser->priv->browser_settings, PREF_BROWSER_STARTUP_CURRENT_FILE, uri); g_free (uri); } else - eel_gconf_set_path (PREF_STARTUP_CURRENT_FILE, ""); + _g_settings_set_uri (browser->priv->browser_settings, PREF_BROWSER_STARTUP_CURRENT_FILE, ""); } if (browser->priv->default_sort_type != NULL) { - eel_gconf_set_string (PREF_SORT_TYPE, browser->priv->default_sort_type->name); - eel_gconf_set_boolean (PREF_SORT_INVERSE, browser->priv->default_sort_inverse); + g_settings_set_string (browser->priv->browser_settings, PREF_BROWSER_SORT_TYPE, browser->priv->default_sort_type->name); + g_settings_set_boolean (browser->priv->browser_settings, PREF_BROWSER_SORT_INVERSE, browser->priv->default_sort_inverse); } gth_hook_invoke ("gth-browser-close-last-window", browser); @@ -2218,18 +2219,16 @@ static void _gth_browser_real_close (GthBrowser *browser) { - int i; - if (browser->priv->closing) return; browser->priv->closing = TRUE; - /* remove gconf notifications */ + /* disconnect from the settings */ - for (i = 0; i < GCONF_NOTIFICATIONS; i++) - if (browser->priv->cnxn_id[i] != 0) - eel_gconf_notification_remove (browser->priv->cnxn_id[i]); + g_signal_handlers_disconnect_by_data (browser->priv->browser_settings, browser); + g_signal_handlers_disconnect_by_data (browser->priv->messages_settings, browser); + g_signal_handlers_disconnect_by_data (browser->priv->desktop_interface_settings, browser); /* disconnect from the monitor */ @@ -2240,12 +2239,19 @@ g_signal_handler_disconnect (gth_main_get_default_monitor (), browser->priv->metadata_changed_id); g_signal_handler_disconnect (gth_main_get_default_monitor (), + browser->priv->emblems_changed_id); + g_signal_handler_disconnect (gth_main_get_default_monitor (), browser->priv->entry_points_changed_id); g_signal_handler_disconnect (gth_main_get_default_monitor (), browser->priv->order_changed_id); /* remove timeouts */ + if (browser->priv->construct_step2_event != 0) { + g_source_remove (browser->priv->construct_step2_event); + browser->priv->construct_step2_event = 0; + } + if (browser->priv->selection_changed_event != 0) { g_source_remove (browser->priv->selection_changed_event); browser->priv->selection_changed_event = 0; @@ -2277,7 +2283,7 @@ return; } - if (eel_gconf_get_boolean (PREF_MSG_SAVE_MODIFIED_IMAGE, DEFAULT_MSG_SAVE_MODIFIED_IMAGE) + if (g_settings_get_boolean (browser->priv->messages_settings, PREF_MSG_SAVE_MODIFIED_IMAGE) && gth_browser_get_file_modified (browser)) { gth_browser_ask_whether_to_save (browser, @@ -2303,10 +2309,12 @@ g_warning ("ui building failed: %s", error->message); g_clear_error (&error); } + gtk_ui_manager_ensure_update (gth_browser_get_ui_manager (browser)); } else if (browser->priv->viewer_ui_merge_id != 0) { gtk_ui_manager_remove_ui (browser->priv->ui, browser->priv->viewer_ui_merge_id); browser->priv->viewer_ui_merge_id = 0; + gtk_ui_manager_ensure_update (gth_browser_get_ui_manager (browser)); } if (browser->priv->viewer_page != NULL) { @@ -2332,10 +2340,12 @@ g_warning ("ui building failed: %s", error->message); g_clear_error (&error); } + gtk_ui_manager_ensure_update (gth_browser_get_ui_manager (browser)); } else if (browser->priv->browser_ui_merge_id != 0) { gtk_ui_manager_remove_ui (browser->priv->ui, browser->priv->browser_ui_merge_id); browser->priv->browser_ui_merge_id = 0; + gtk_ui_manager_ensure_update (gth_browser_get_ui_manager (browser)); } } @@ -2343,14 +2353,13 @@ /* --- _gth_browser_set_current_page --- */ -static void -_gth_browser_show_properties_in_browser_mode (GthBrowser *browser) +static GtkWidget * +_gth_browser_get_browser_file_properties_container (GthBrowser *browser) { - GtkAllocation allocation; - - gtk_widget_get_allocation (browser->priv->browser_sidebar, &allocation); - gtk_paned_set_position (GTK_PANED (browser->priv->browser_sidebar), allocation.height / 2); - gtk_widget_show (browser->priv->file_properties); + if (browser->priv->file_properties_on_the_right) + return browser->priv->browser_right_container; + else + return browser->priv->browser_sidebar; } @@ -2367,7 +2376,7 @@ if (page == prev_page) return; - GTH_WINDOW_CLASS (parent_class)->set_current_page (window, page); + GTH_WINDOW_CLASS (gth_browser_parent_class)->set_current_page (window, page); /* update the ui commands */ @@ -2377,21 +2386,28 @@ /* move the sidebar from the browser to the viewer and vice-versa */ - if (page == GTH_BROWSER_PAGE_BROWSER) - gtk_widget_reparent (browser->priv->file_properties, browser->priv->browser_sidebar); + gtk_widget_unrealize (browser->priv->file_properties); + if (page == GTH_BROWSER_PAGE_BROWSER) { + GtkWidget *file_properties_parent; + + file_properties_parent = _gth_browser_get_browser_file_properties_container (browser); + gtk_widget_reparent (browser->priv->file_properties, file_properties_parent); + /* restore the child properties that gtk_widget_reparent doesn't preserve. */ + gtk_container_child_set (GTK_CONTAINER (file_properties_parent), + browser->priv->file_properties, + "resize", ! browser->priv->file_properties_on_the_right, + "shrink", FALSE, + NULL); + } else gtk_widget_reparent (browser->priv->file_properties, browser->priv->viewer_sidebar_alignment); /* update the sidebar state depending on the current visible page */ if (page == GTH_BROWSER_PAGE_BROWSER) { + gth_browser_show_viewer_tools (browser, FALSE); gth_sidebar_show_properties (GTH_SIDEBAR (browser->priv->file_properties)); - if (browser->priv->current_file != NULL) - _gth_browser_show_properties_in_browser_mode (browser); - else { - gth_sidebar_set_file (GTH_SIDEBAR (browser->priv->file_properties), NULL); - gtk_widget_hide (browser->priv->file_properties); - } + gth_browser_show_file_properties (browser, _gth_browser_get_action_active (browser, "Browser_Properties")); } else if (page == GTH_BROWSER_PAGE_VIEWER) { if (_gth_browser_get_action_active (browser, "Viewer_Properties")) { @@ -2403,7 +2419,7 @@ gtk_widget_show (browser->priv->file_properties); } else - gtk_widget_hide (browser->priv->file_properties); + gth_browser_show_file_properties (browser, FALSE); } /* save the browser window size */ @@ -2430,7 +2446,7 @@ /* set the focus */ if (page == GTH_BROWSER_PAGE_BROWSER) - gtk_widget_grab_focus (gth_browser_get_file_list_view (browser)); + gtk_widget_grab_focus (browser->priv->file_list); else if (page == GTH_BROWSER_PAGE_VIEWER) _gth_browser_make_file_visible (browser, browser->priv->current_file); @@ -2468,7 +2484,7 @@ if (page == gth_window_get_current_page (window)) return; - if (eel_gconf_get_boolean (PREF_MSG_SAVE_MODIFIED_IMAGE, DEFAULT_MSG_SAVE_MODIFIED_IMAGE) + if (g_settings_get_boolean (browser->priv->messages_settings, PREF_MSG_SAVE_MODIFIED_IMAGE) && gth_browser_get_file_modified (browser)) { gth_browser_ask_whether_to_save (browser, @@ -2481,62 +2497,46 @@ static void -gth_browser_init (GthBrowser *browser) -{ - int i; - - browser->priv = g_new0 (GthBrowserPrivateData, 1); - browser->priv->menu_icon_cache = gth_icon_cache_new_for_widget (GTK_WIDGET (browser), GTK_ICON_SIZE_MENU); - browser->priv->named_dialogs = g_hash_table_new (g_str_hash, g_str_equal); - browser->priv->selection_changed_event = 0; - - for (i = 0; i < GCONF_NOTIFICATIONS; i++) - browser->priv->cnxn_id[i] = 0; - - browser->priv->location_free_space = NULL; - browser->priv->recalc_location_free_space = TRUE; -} - - -static void gth_browser_finalize (GObject *object) { GthBrowser *browser = GTH_BROWSER (object); - if (browser->priv != NULL) { - g_free (browser->priv->location_free_space); - _g_object_unref (browser->priv->location_source); - _g_object_unref (browser->priv->monitor_location); - _g_object_unref (browser->priv->location); - _g_object_unref (browser->priv->current_file); - _g_object_unref (browser->priv->viewer_page); - _g_object_unref (browser->priv->image_preloader); - _g_object_list_unref (browser->priv->viewer_pages); - _g_object_list_unref (browser->priv->history); - gth_icon_cache_free (browser->priv->menu_icon_cache); - g_hash_table_unref (browser->priv->named_dialogs); - g_free (browser->priv->list_attributes); - _g_object_unref (browser->priv->folder_popup_file_data); - g_free (browser->priv); - browser->priv = NULL; - } + _g_object_unref (browser->priv->browser_settings); + _g_object_unref (browser->priv->messages_settings); + _g_object_unref (browser->priv->desktop_interface_settings); + g_free (browser->priv->location_free_space); + _g_object_unref (browser->priv->location_source); + _g_object_unref (browser->priv->monitor_location); + _g_object_unref (browser->priv->location); + _g_object_unref (browser->priv->current_file); + _g_object_unref (browser->priv->viewer_page); + _g_object_unref (browser->priv->image_preloader); + _g_object_list_unref (browser->priv->viewer_pages); + _g_object_list_unref (browser->priv->history); + gth_icon_cache_free (browser->priv->menu_icon_cache); + g_hash_table_unref (browser->priv->named_dialogs); + g_free (browser->priv->list_attributes); + _g_object_unref (browser->priv->folder_popup_file_data); + _g_object_unref (browser->priv->back_history_menu); + _g_object_unref (browser->priv->forward_history_menu); + _g_object_unref (browser->priv->go_parent_menu); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_browser_parent_class)->finalize (object); } static void -gth_browser_class_init (GthBrowserClass *class) +gth_browser_class_init (GthBrowserClass *klass) { GObjectClass *gobject_class; GthWindowClass *window_class; - parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (klass, sizeof (GthBrowserPrivate)); - gobject_class = G_OBJECT_CLASS (class); + gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = gth_browser_finalize; - window_class = GTH_WINDOW_CLASS (class); + window_class = GTH_WINDOW_CLASS (klass); window_class->close = _gth_browser_close; window_class->set_current_page = _gth_browser_set_current_page; @@ -2544,7 +2544,7 @@ gth_browser_signals[LOCATION_READY] = g_signal_new ("location-ready", - G_TYPE_FROM_CLASS (class), + G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GthBrowserClass, location_ready), NULL, NULL, @@ -2556,34 +2556,6 @@ } -GType -gth_browser_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthBrowserClass), - NULL, - NULL, - (GClassInitFunc) gth_browser_class_init, - NULL, - NULL, - sizeof (GthBrowser), - 0, - (GInstanceInitFunc) gth_browser_init - }; - - type = g_type_register_static (GTH_TYPE_WINDOW, - "GthBrowser", - &type_info, - 0); - } - - return type; -} - - static void menu_item_select_cb (GtkMenuItem *proxy, GthBrowser *browser) @@ -2837,9 +2809,10 @@ return; path = gth_folder_tree_get_path (GTH_FOLDER_TREE (browser->priv->folder_tree), browser->priv->location->file); - gth_folder_tree_select_path (GTH_FOLDER_TREE (browser->priv->folder_tree), path); - - gtk_tree_path_free (path); + if (path != NULL) { + gth_folder_tree_select_path (GTH_FOLDER_TREE (browser->priv->folder_tree), path); + gtk_tree_path_free (path); + } } @@ -2878,14 +2851,6 @@ static void -location_changed_cb (GthLocationChooser *chooser, - GthBrowser *browser) -{ - gth_browser_go_to (browser, gth_location_chooser_get_current (chooser), NULL); -} - - -static void filterbar_changed_cb (GthFilterbar *filterbar, GthBrowser *browser) { @@ -3147,18 +3112,9 @@ if (new_file != NULL) { if (gth_window_get_current_page (GTH_WINDOW (browser)) == GTH_BROWSER_PAGE_VIEWER) gth_browser_load_file (browser, new_file, FALSE); - else if (gth_window_get_current_page (GTH_WINDOW (browser)) == GTH_BROWSER_PAGE_BROWSER) { - int file_pos; + else if (gth_window_get_current_page (GTH_WINDOW (browser)) == GTH_BROWSER_PAGE_BROWSER) + gth_file_list_make_file_visible (GTH_FILE_LIST (browser->priv->file_list), new_file->file); - file_pos = gth_file_store_get_pos (GTH_FILE_STORE (gth_browser_get_file_store (browser)), new_file->file); - if (file_pos >= 0) { - GtkWidget *view; - - view = gth_browser_get_file_list_view (browser); - gth_file_selection_select (GTH_FILE_SELECTION (view), file_pos); - gth_file_view_set_cursor (GTH_FILE_VIEW (view), file_pos); - } - } _g_object_unref (new_file); } else { @@ -3352,6 +3308,64 @@ } +typedef struct { + GthBrowser *browser; + GthFileSource *file_source; + GList *files; +} EmblemsData; + + +static void +emblems_data_free (EmblemsData *data) +{ + _g_object_list_unref (data->files); + g_object_unref (data->file_source); + g_free (data); +} + + +static void +emblems_attributes_ready_cb (GthFileSource *file_source, + GList *files, + GError *error, + gpointer user_data) +{ + EmblemsData *data = user_data; + + if (error == NULL) { + GthBrowser *browser = data->browser; + + gth_file_list_update_emblems (GTH_FILE_LIST (browser->priv->file_list), files); + gth_file_list_update_emblems (GTH_FILE_LIST (browser->priv->thumbnail_list), files); + } + + emblems_data_free (data); +} + + +static void +emblems_changed_cb (GthMonitor *monitor, + GList *files, /* GFile list */ + GthBrowser *browser) +{ + EmblemsData *data; + + if (browser->priv->location_source == NULL) + return; + + data = g_new0 (EmblemsData, 1); + data->browser = browser; + data->file_source = g_object_ref (browser->priv->location_source); + data->files = _g_object_list_ref (files); + + gth_file_source_read_attributes (browser->priv->location_source, + files, + GTH_FILE_ATTRIBUTE_EMBLEMS, + emblems_attributes_ready_cb, + data); +} + + static void entry_points_changed_cb (GthMonitor *monitor, GthBrowser *browser) @@ -3372,10 +3386,9 @@ static void -pref_general_filter_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_general_filter_changed (GSettings *settings, + const char *key, + gpointer user_data) { GthBrowser *browser = user_data; GthTest *filter; @@ -3416,6 +3429,14 @@ } +static void +location_chooser_changed_cb (GthLocationChooser *chooser, + gpointer user_data) +{ + gth_browser_go_to (GTH_BROWSER (user_data), gth_location_chooser_get_current (chooser), NULL); +} + + static gboolean gth_file_list_button_press_cb (GtkWidget *widget, GdkEventButton *event, @@ -3432,10 +3453,11 @@ if ((pos >= 0) && ! gth_file_selection_is_selected (GTH_FILE_SELECTION (file_view), pos)) { gth_file_selection_unselect_all (GTH_FILE_SELECTION (file_view)); gth_file_selection_select (GTH_FILE_SELECTION (file_view), pos); + gth_file_view_set_cursor (GTH_FILE_VIEW (file_view), pos); } gth_file_list_popup_menu (browser, event); - return TRUE; + return FALSE; } else if ((event->type == GDK_BUTTON_PRESS) && (event->button == 2)) { GtkWidget *file_view; @@ -3446,8 +3468,9 @@ if ((pos >= 0) && ! gth_file_selection_is_selected (GTH_FILE_SELECTION (file_view), pos)) { gth_file_selection_unselect_all (GTH_FILE_SELECTION (file_view)); gth_file_selection_select (GTH_FILE_SELECTION (file_view), pos); + gth_file_view_set_cursor (GTH_FILE_VIEW (file_view), pos); } - return TRUE; + return FALSE; } else if ((event->type == GDK_2BUTTON_PRESS) && (event->button == 2)) { gth_browser_fullscreen (browser); @@ -3592,10 +3615,13 @@ break; case GDK_KEY_e: - if (browser->priv->viewer_page != NULL) { - gth_window_set_current_page (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER); + if (browser->priv->viewer_page != NULL) gth_browser_show_viewer_tools (GTH_BROWSER (browser), TRUE); - } + result = TRUE; + break; + + case GDK_KEY_i: + gth_browser_show_file_properties (GTH_BROWSER (browser), ! _gth_browser_get_action_active (browser, "Browser_Properties")); result = TRUE; break; @@ -3612,87 +3638,104 @@ static void -add_browser_toolbar_menu_buttons (GthBrowser *browser) +_gth_browser_add_custom_actions (GthBrowser *browser, + GtkActionGroup *actions) { - int tool_pos; - GtkToolItem *tool_item; - GtkAction *action; - - tool_pos = 0; - - /* toolbar back button */ + GtkAction *action; - tool_item = gtk_menu_tool_button_new_from_stock (GTK_STOCK_GO_BACK); - gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), - gtk_ui_manager_get_widget (browser->priv->ui, GO_BACK_HISTORY_POPUP)); - gtk_tool_item_set_homogeneous (tool_item, FALSE); - gtk_widget_set_tooltip_text (GTK_WIDGET (tool_item), _("Go to the previous visited location")); - gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (tool_item), _("View the list of visited locations")); + /* Go Back */ - action = gtk_action_new ("Toolbar_Go_Back", NULL, NULL, GTK_STOCK_GO_BACK); - g_object_set (action, "is_important", TRUE, NULL); + browser->priv->back_history_menu = gtk_menu_new (); + action = g_object_new (GTH_TYPE_MENU_ACTION, + "name", "Toolbar_Go_Back", + "stock-id", GTK_STOCK_GO_BACK, + "button-tooltip", _("Go to the previous visited location"), + "arrow-tooltip", _("View the list of visited locations"), + "is-important", TRUE, + "menu", browser->priv->back_history_menu, + NULL); g_signal_connect (action, "activate", G_CALLBACK (gth_browser_activate_action_go_back), browser); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_item), action); - gtk_action_group_add_action (browser->priv->actions, action); + gtk_action_group_add_action (actions, action); + g_object_unref (action); - gtk_widget_show (GTK_WIDGET (tool_item)); - gtk_toolbar_insert (GTK_TOOLBAR (browser->priv->browser_toolbar), tool_item, tool_pos++); + /* Go Forward */ - /* toolbar forward button */ - - tool_item = gtk_menu_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD); - gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), - gtk_ui_manager_get_widget (browser->priv->ui, GO_FORWARD_HISTORY_POPUP)); - gtk_tool_item_set_homogeneous (tool_item, FALSE); - gtk_widget_set_tooltip_text (GTK_WIDGET (tool_item), _("Go to the next visited location")); - gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (tool_item), _("View the list of visited locations")); - - action = gtk_action_new ("Toolbar_Go_Forward", NULL, NULL, GTK_STOCK_GO_FORWARD); - g_object_set (action, "is_important", TRUE, NULL); + browser->priv->forward_history_menu = gtk_menu_new (); + action = g_object_new (GTH_TYPE_MENU_ACTION, + "name", "Toolbar_Go_Forward", + "stock-id", GTK_STOCK_GO_FORWARD, + "button-tooltip", _("Go to the next visited location"), + "arrow-tooltip", _("View the list of visited locations"), + "is-important", TRUE, + "menu", browser->priv->forward_history_menu, + NULL); g_signal_connect (action, "activate", G_CALLBACK (gth_browser_activate_action_go_forward), browser); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_item), action); - gtk_action_group_add_action (browser->priv->actions, action); - - gtk_widget_show (GTK_WIDGET (tool_item)); - gtk_toolbar_insert (GTK_TOOLBAR (browser->priv->browser_toolbar), tool_item, tool_pos++); + gtk_action_group_add_action (actions, action); + g_object_unref (action); - /* toolbar up button */ + /* Go Up */ - tool_item = gtk_menu_tool_button_new_from_stock (GTK_STOCK_GO_UP); - gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), - gtk_ui_manager_get_widget (browser->priv->ui, GO_PARENT_POPUP)); - gtk_tool_item_set_homogeneous (tool_item, FALSE); - gtk_widget_set_tooltip_text (GTK_WIDGET (tool_item), _("Go up one level")); - gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (tool_item), _("View the list of upper locations")); - - action = gtk_action_new ("Toolbar_Go_Up", NULL, NULL, GTK_STOCK_GO_UP); - g_object_set (action, "is_important", FALSE, NULL); + browser->priv->go_parent_menu = gtk_menu_new (); + action = g_object_new (GTH_TYPE_MENU_ACTION, + "name", "Toolbar_Go_Up", + "stock-id", GTK_STOCK_GO_UP, + "button-tooltip", _("Go up one level"), + "arrow-tooltip", _("View the list of upper locations"), + "is-important", FALSE, + "menu", browser->priv->go_parent_menu, + NULL); g_signal_connect (action, "activate", G_CALLBACK (gth_browser_activate_action_go_up), browser); - gtk_activatable_set_related_action (GTK_ACTIVATABLE (tool_item), action); - gtk_action_group_add_action (browser->priv->actions, action); + gtk_action_group_add_action (actions, action); + g_object_unref (action); +} + + +typedef struct { + GthBrowser *browser; + GFile *location; + GFile *file_to_select; +} NewWindowData; + + +static void +new_window_data_free (gpointer user_data) +{ + NewWindowData *data = user_data; - gtk_widget_show (GTK_WIDGET (tool_item)); - gtk_toolbar_insert (GTK_TOOLBAR (browser->priv->browser_toolbar), tool_item, tool_pos++); + _g_object_unref (data->location); + _g_object_unref (data->file_to_select); + g_free (data); } static void -_gth_browser_construct_step2 (gpointer data) +_gth_browser_construct_step2 (gpointer user_data) { - GthBrowser *browser = data; + NewWindowData *data = user_data; + GthBrowser *browser = data->browser; - gth_hook_invoke ("gth-browser-construct-idle-callback", browser); + browser->priv->construct_step2_event = 0; + + _gth_browser_update_entry_point_list (browser); _gth_browser_monitor_entry_points (browser); - gtk_widget_grab_focus (gth_browser_get_file_list_view (browser)); + + gth_hook_invoke ("gth-browser-construct-idle-callback", browser); + + if (data->file_to_select != NULL) + gth_browser_go_to (browser, data->location, data->file_to_select); + else + gth_browser_load_location (browser, data->location); + + new_window_data_free (data); } @@ -3703,7 +3746,6 @@ GtkToolbarStyle prop = GTK_TOOLBAR_BOTH; toolbar_style = gth_pref_get_real_toolbar_style (); - switch (toolbar_style) { case GTH_TOOLBAR_STYLE_TEXT_BELOW: prop = GTK_TOOLBAR_BOTH; @@ -3727,10 +3769,9 @@ static void -pref_ui_toolbar_style_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_ui_toolbar_style_changed (GSettings *settings, + const char *key, + gpointer user_data) { GthBrowser *browser = user_data; _gth_browser_update_toolbar_style (browser); @@ -3738,10 +3779,36 @@ static void -pref_ui_viewer_thumbnails_orient_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_browser_properties_on_the_right_changed (GSettings *settings, + const char *key, + gpointer user_data) +{ + GthBrowser *browser = user_data; + GtkWidget *old_parent; + GtkWidget *new_parent; + + old_parent = _gth_browser_get_browser_file_properties_container (browser); + browser->priv->file_properties_on_the_right = g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_PROPERTIES_ON_THE_RIGHT); + new_parent = _gth_browser_get_browser_file_properties_container (browser); + + if (old_parent == new_parent) + return; + + gtk_widget_unrealize (browser->priv->file_properties); + gtk_widget_reparent (browser->priv->file_properties, new_parent); + /* restore the child properties that gtk_widget_reparent doesn't preserve. */ + gtk_container_child_set (GTK_CONTAINER (new_parent), + browser->priv->file_properties, + "resize", ! browser->priv->file_properties_on_the_right, + "shrink", FALSE, + NULL); +} + + +static void +pref_ui_viewer_thumbnails_orient_changed (GSettings *settings, + const char *key, + gpointer user_data) { GthBrowser *browser = user_data; GtkOrientation viewer_thumbnails_orientation; @@ -3749,11 +3816,11 @@ GtkWidget *child1; GtkWidget *child2; - viewer_thumbnails_orientation = eel_gconf_get_enum (PREF_UI_VIEWER_THUMBNAILS_ORIENT, GTK_TYPE_ORIENTATION, GTK_ORIENTATION_HORIZONTAL); + viewer_thumbnails_orientation = g_settings_get_enum (browser->priv->browser_settings, PREF_BROWSER_VIEWER_THUMBNAILS_ORIENT); if (viewer_thumbnails_orientation == GTK_ORIENTATION_HORIZONTAL) - viewer_thumbnails_pane = gtk_vpaned_new (); + viewer_thumbnails_pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL); else - viewer_thumbnails_pane = gtk_hpaned_new (); + viewer_thumbnails_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); child1 = gtk_paned_get_child1 (GTK_PANED (browser->priv->viewer_thumbnails_pane)); child2 = gtk_paned_get_child2 (GTK_PANED (browser->priv->viewer_thumbnails_pane)); @@ -3817,18 +3884,17 @@ static void -pref_ui_toolbar_visible_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_ui_toolbar_visible_changed (GSettings *settings, + const char *key, + gpointer user_data) { GthBrowser *browser = user_data; - _gth_browser_set_toolbar_visibility (browser, gconf_value_get_bool (gconf_entry_get_value (entry))); + _gth_browser_set_toolbar_visibility (browser, g_settings_get_boolean (settings, key)); } static void -_gth_browser_set_statusbar_visibility (GthBrowser *browser, +_gth_browser_set_statusbar_visibility (GthBrowser *browser, gboolean visible) { g_return_if_fail (browser != NULL); @@ -3842,13 +3908,12 @@ static void -pref_ui_statusbar_visible_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_ui_statusbar_visible_changed (GSettings *settings, + const char *key, + gpointer user_data) { GthBrowser *browser = user_data; - _gth_browser_set_statusbar_visibility (browser, gconf_value_get_bool (gconf_entry_get_value (entry))); + _gth_browser_set_statusbar_visibility (browser, g_settings_get_boolean (settings, key)); } @@ -3860,12 +3925,9 @@ _gth_browser_set_action_active (browser, "View_Sidebar", visible); if (visible) { - GtkAllocation allocation; - gtk_widget_show (browser->priv->browser_sidebar); - gtk_paned_set_position (GTK_PANED (browser->priv->browser_container), eel_gconf_get_integer (PREF_UI_BROWSER_SIDEBAR_WIDTH, DEF_SIDEBAR_WIDTH)); - gtk_widget_get_allocation (browser->priv->browser_sidebar, &allocation); - gtk_paned_set_position (GTK_PANED (browser->priv->browser_sidebar), allocation.height / 2); + gtk_paned_set_position (GTK_PANED (browser->priv->browser_left_container), + g_settings_get_int (browser->priv->browser_settings, PREF_BROWSER_BROWSER_SIDEBAR_WIDTH)); } else gtk_widget_hide (browser->priv->browser_sidebar); @@ -3873,13 +3935,12 @@ static void -pref_ui_sidebar_visible_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_ui_sidebar_visible_changed (GSettings *settings, + const char *key, + gpointer user_data) { GthBrowser *browser = user_data; - _gth_browser_set_sidebar_visibility (browser, gconf_value_get_bool (gconf_entry_get_value (entry))); + _gth_browser_set_sidebar_visibility (browser, g_settings_get_boolean (settings, key)); } @@ -3887,9 +3948,8 @@ _gth_browser_make_file_visible (GthBrowser *browser, GthFileData *file_data) { - int file_pos; - GtkWidget *view; - GthVisibility visibility; + int file_pos; + GtkWidget *view; if (file_data == NULL) return FALSE; @@ -3907,27 +3967,6 @@ gth_file_view_set_cursor (GTH_FILE_VIEW (view), file_pos); gth_hook_invoke ("gth-browser-selection-changed", browser); g_signal_handlers_unblock_by_func (view, gth_file_view_selection_changed_cb, browser); - visibility = gth_file_view_get_visibility (GTH_FILE_VIEW (view), file_pos); - if (visibility != GTH_VISIBILITY_FULL) { - double align = 0.0; - - switch (visibility) { - case GTH_VISIBILITY_NONE: - case GTH_VISIBILITY_FULL: - case GTH_VISIBILITY_PARTIAL: - align = 0.5; - break; - - case GTH_VISIBILITY_PARTIAL_TOP: - align = 0.0; - break; - - case GTH_VISIBILITY_PARTIAL_BOTTOM: - align = 1.0; - break; - } - gth_file_view_scroll_to (GTH_FILE_VIEW (view), file_pos, align); - } /* the thumbnail list in viewer mode */ @@ -3937,27 +3976,6 @@ gth_file_selection_select (GTH_FILE_SELECTION (view), file_pos); gth_file_view_set_cursor (GTH_FILE_VIEW (view), file_pos); g_signal_handlers_unblock_by_func (view, gth_thumbnail_view_selection_changed_cb, browser); - visibility = gth_file_view_get_visibility (GTH_FILE_VIEW (view), file_pos); - if (visibility != GTH_VISIBILITY_FULL) { - double align = 0.0; - - switch (visibility) { - case GTH_VISIBILITY_NONE: - case GTH_VISIBILITY_FULL: - case GTH_VISIBILITY_PARTIAL: - align = 0.5; - break; - - case GTH_VISIBILITY_PARTIAL_TOP: - align = 0.0; - break; - - case GTH_VISIBILITY_PARTIAL_BOTTOM: - align = 1.0; - break; - } - gth_file_view_scroll_to (GTH_FILE_VIEW (view), file_pos, align); - } return TRUE; } @@ -3980,26 +3998,24 @@ static void -pref_ui_thumbnail_list_visible_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_ui_thumbnail_list_visible_changed (GSettings *settings, + const char *key, + gpointer user_data) { GthBrowser *browser = user_data; - _gth_browser_set_thumbnail_list_visibility (browser, gconf_value_get_bool (gconf_entry_get_value (entry))); + _gth_browser_set_thumbnail_list_visibility (browser, g_settings_get_boolean (settings, key)); } static void -pref_show_hidden_files_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_show_hidden_files_changed (GSettings *settings, + const char *key, + gpointer user_data) { GthBrowser *browser = user_data; gboolean show_hidden_files; - show_hidden_files = eel_gconf_get_boolean (PREF_SHOW_HIDDEN_FILES, FALSE); + show_hidden_files = g_settings_get_boolean (settings, key); if (show_hidden_files == browser->priv->show_hidden_files) return; @@ -4011,41 +4027,38 @@ static void -pref_fast_file_type_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_fast_file_type_changed (GSettings *settings, + const char *key, + gpointer user_data) { GthBrowser *browser = user_data; - browser->priv->fast_file_type = eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE); + browser->priv->fast_file_type = g_settings_get_boolean (settings, key); gth_browser_reload (browser); } static void -pref_thumbnail_size_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_thumbnail_size_changed (GSettings *settings, + const char *key, + gpointer user_data) { GthBrowser *browser = user_data; - gth_file_list_set_thumb_size (GTH_FILE_LIST (browser->priv->file_list), eel_gconf_get_integer (PREF_THUMBNAIL_SIZE, DEF_THUMBNAIL_SIZE)); + gth_file_list_set_thumb_size (GTH_FILE_LIST (browser->priv->file_list), g_settings_get_int (settings, key)); gth_browser_reload (browser); } static void -pref_thumbnail_caption_changed (GConfClient *client, - guint cnxn_id, - GConfEntry *entry, - gpointer user_data) +pref_thumbnail_caption_changed (GSettings *settings, + const char *key, + gpointer user_data) { GthBrowser *browser = user_data; char *caption; - caption = eel_gconf_get_string (PREF_THUMBNAIL_CAPTION, DEFAULT_THUMBNAIL_CAPTION); + caption = g_settings_get_string (settings, key); gth_file_list_set_caption (GTH_FILE_LIST (browser->priv->file_list), caption); if (_gth_browser_reload_required (browser)) @@ -4076,8 +4089,10 @@ static void -_gth_browser_construct (GthBrowser *browser) +gth_browser_init (GthBrowser *browser) { + int window_width; + int window_height; GError *error = NULL; GtkWidget *vbox; GtkWidget *scrolled_window; @@ -4088,40 +4103,107 @@ char *caption; int i; - { - int width; - int height; - - width = eel_gconf_get_integer (PREF_UI_WINDOW_WIDTH, 0); - height = eel_gconf_get_integer (PREF_UI_WINDOW_HEIGHT, 0); + g_object_set (browser, "n-pages", GTH_BROWSER_N_PAGES, NULL); - if ((width == 0) || (height == 0)) { - GdkScreen *screen; - int max_width; - int max_height; - int sidebar_width; - int thumb_size; - int n_cols; - - screen = gtk_widget_get_screen (GTK_WIDGET (browser)); - max_width = gdk_screen_get_width (screen) * 5 / 6; - max_height = gdk_screen_get_height (screen) * 2 / 3; - - sidebar_width = eel_gconf_get_integer (PREF_UI_BROWSER_SIDEBAR_WIDTH, DEF_SIDEBAR_WIDTH) + 10; - thumb_size = eel_gconf_get_integer (PREF_THUMBNAIL_SIZE, DEF_THUMBNAIL_SIZE) + 40; - - for (n_cols = 4; n_cols >= 1; n_cols--) { - width = sidebar_width + 40 + (n_cols * thumb_size); - if (width < max_width) - break; - } - if (n_cols == 0) - width = max_width; - height = max_height; + browser->priv = G_TYPE_INSTANCE_GET_PRIVATE (browser, GTH_TYPE_BROWSER, GthBrowserPrivate); + browser->priv->viewer_pages = NULL; + browser->priv->viewer_page = NULL; + browser->priv->image_preloader = gth_image_preloader_new (GTH_LOAD_POLICY_TWO_STEPS, 10); + browser->priv->progress_dialog = NULL; + browser->priv->named_dialogs = g_hash_table_new (g_str_hash, g_str_equal); + for (i = 0; i < GTH_BROWSER_N_PAGES; i++) + browser->priv->toolbar_menu_buttons[i] = NULL; + browser->priv->browser_ui_merge_id = 0; + browser->priv->viewer_ui_merge_id = 0; + browser->priv->location = NULL; + browser->priv->current_file = NULL; + browser->priv->location_source = NULL; + browser->priv->n_visibles = 0; + browser->priv->current_file_position = -1; + browser->priv->monitor_location = NULL; + browser->priv->activity_ref = 0; + browser->priv->menu_icon_cache = gth_icon_cache_new_for_widget (GTK_WIDGET (browser), GTK_ICON_SIZE_MENU); + browser->priv->current_sort_type = NULL; + browser->priv->current_sort_inverse = FALSE; + browser->priv->default_sort_type = NULL; + browser->priv->default_sort_inverse = FALSE; + browser->priv->show_hidden_files = FALSE; + browser->priv->fast_file_type = FALSE; + browser->priv->closing = FALSE; + browser->priv->task = NULL; + browser->priv->task_completed = 0; + browser->priv->task_progress = 0; + browser->priv->background_tasks = NULL; + browser->priv->load_data_queue = NULL; + browser->priv->load_file_data_queue = NULL; + browser->priv->load_file_timeout = 0; + browser->priv->list_attributes = NULL; + browser->priv->constructed = FALSE; + browser->priv->selection_changed_event = 0; + browser->priv->folder_popup_file_data = NULL; + browser->priv->properties_on_screen = FALSE; + browser->priv->location_free_space = NULL; + browser->priv->recalc_location_free_space = TRUE; + browser->priv->fullscreen = FALSE; + browser->priv->fullscreen_toolbar = NULL; + browser->priv->fullscreen_controls = NULL; + browser->priv->hide_mouse_timeout = 0; + browser->priv->motion_signal = 0; + browser->priv->last_mouse_x = 0.0; + browser->priv->last_mouse_y = 0.0; + browser->priv->history = NULL; + browser->priv->history_current = NULL; + browser->priv->back_history_menu = NULL; + browser->priv->forward_history_menu = NULL; + browser->priv->go_parent_menu = NULL; + browser->priv->shrink_wrap_viewer = FALSE; + browser->priv->browser_settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + browser->priv->messages_settings = g_settings_new (GTHUMB_MESSAGES_SCHEMA); + browser->priv->desktop_interface_settings = g_settings_new (GNOME_DESKTOP_INTERFACE_SCHEMA); + browser->priv->file_properties_on_the_right = g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_PROPERTIES_ON_THE_RIGHT); + + /* find a suitable size for the window */ + + window_width = g_settings_get_int (browser->priv->browser_settings, PREF_BROWSER_WINDOW_WIDTH); + window_height = g_settings_get_int (browser->priv->browser_settings, PREF_BROWSER_WINDOW_HEIGHT); + + if ((window_width == 0) || (window_height == 0)) { + GdkScreen *screen; + int max_width; + int max_height; + int sidebar_width; + int thumb_size; + int thumb_spacing; + int default_columns_of_thumbnails; + int n_cols; + + screen = gtk_widget_get_screen (GTK_WIDGET (browser)); + max_width = gdk_screen_get_width (screen) * 5 / 6; + max_height = gdk_screen_get_height (screen) * 3 / 4; + + sidebar_width = g_settings_get_int (browser->priv->browser_settings, PREF_BROWSER_BROWSER_SIDEBAR_WIDTH) + 10; + thumb_size = g_settings_get_int (browser->priv->browser_settings, PREF_BROWSER_THUMBNAIL_SIZE); + thumb_spacing = 40; + default_columns_of_thumbnails = 5; + + for (n_cols = default_columns_of_thumbnails; n_cols >= 1; n_cols--) { + window_width = sidebar_width + (thumb_spacing + 20) + (n_cols * (thumb_size + thumb_spacing)); + if (window_width < max_width) + break; } - - gtk_window_set_default_size (GTK_WINDOW (browser), width, height); + if (n_cols == 0) + window_width = max_width; + window_height = max_height; } + gtk_window_set_default_size (GTK_WINDOW (browser), window_width, window_height); + + gtk_window_set_has_resize_grip (GTK_WINDOW (browser), TRUE); + + /* realize the widget before adding the ui to get the icons from the icon theme */ + + g_signal_connect (browser, "realize", G_CALLBACK (_gth_browser_realize), NULL); + g_signal_connect (browser, "unrealize", G_CALLBACK (_gth_browser_unrealize), NULL); + gtk_widget_realize (GTK_WIDGET (browser)); /* ui actions */ @@ -4129,16 +4211,17 @@ gtk_action_group_set_translation_domain (browser->priv->actions, NULL); gtk_action_group_add_actions (browser->priv->actions, gth_window_action_entries, - gth_window_action_entries_size, - browser); - gtk_action_group_add_actions (browser->priv->actions, - gth_browser_action_entries, - gth_browser_action_entries_size, + G_N_ELEMENTS (gth_window_action_entries), browser); + _gtk_action_group_add_actions_with_flags (browser->priv->actions, + gth_browser_action_entries, + G_N_ELEMENTS (gth_browser_action_entries), + browser); gtk_action_group_add_toggle_actions (browser->priv->actions, gth_browser_action_toggle_entries, - gth_browser_action_toggle_entries_size, + G_N_ELEMENTS (gth_browser_action_toggle_entries), browser); + _gth_browser_add_custom_actions (browser, browser->priv->actions); browser->priv->ui = gtk_ui_manager_new (); g_signal_connect (browser->priv->ui, @@ -4164,25 +4247,19 @@ browser->priv->viewer_toolbar = gtk_ui_manager_get_widget (browser->priv->ui, "/ViewerToolBar"); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->priv->viewer_toolbar), TRUE); - gtk_widget_show (browser->priv->viewer_toolbar); gth_window_attach_toolbar (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER, browser->priv->viewer_toolbar); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (gtk_ui_manager_get_widget (browser->priv->ui, "/ViewerToolBar/View_Prev")), TRUE); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (gtk_ui_manager_get_widget (browser->priv->ui, "/ViewerToolBar/View_Next")), TRUE); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (gtk_ui_manager_get_widget (browser->priv->ui, "/Fullscreen_ToolBar/View_Prev")), TRUE); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (gtk_ui_manager_get_widget (browser->priv->ui, "/Fullscreen_ToolBar/View_Next")), TRUE); - /* content */ - viewer_thumbnails_orientation = eel_gconf_get_enum (PREF_UI_VIEWER_THUMBNAILS_ORIENT, GTK_TYPE_ORIENTATION, GTK_ORIENTATION_HORIZONTAL); + viewer_thumbnails_orientation = g_settings_get_enum (browser->priv->browser_settings, PREF_BROWSER_VIEWER_THUMBNAILS_ORIENT); if (viewer_thumbnails_orientation == GTK_ORIENTATION_HORIZONTAL) - browser->priv->viewer_thumbnails_pane = gtk_vpaned_new (); + browser->priv->viewer_thumbnails_pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL); else - browser->priv->viewer_thumbnails_pane = gtk_hpaned_new (); + browser->priv->viewer_thumbnails_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_show (browser->priv->viewer_thumbnails_pane); gth_window_attach_content (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER, browser->priv->viewer_thumbnails_pane); - browser->priv->viewer_sidebar_pane = gtk_hpaned_new (); + browser->priv->viewer_sidebar_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_set_size_request (browser->priv->viewer_sidebar_pane, -1, MIN_VIEWER_SIZE); gtk_widget_show (browser->priv->viewer_sidebar_pane); if (viewer_thumbnails_orientation == GTK_ORIENTATION_HORIZONTAL) @@ -4196,18 +4273,18 @@ gtk_paned_pack1 (GTK_PANED (browser->priv->viewer_sidebar_pane), browser->priv->viewer_container, TRUE, FALSE); browser->priv->viewer_sidebar_alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); - gtk_widget_set_size_request (browser->priv->viewer_sidebar_alignment, DEF_VIEWER_SIDEBAR_WIDTH, -1); + _gtk_paned_set_position2 (GTK_PANED (browser->priv->viewer_sidebar_pane), g_settings_get_int (browser->priv->browser_settings, PREF_BROWSER_BROWSER_SIDEBAR_WIDTH)); gtk_paned_pack2 (GTK_PANED (browser->priv->viewer_sidebar_pane), browser->priv->viewer_sidebar_alignment, FALSE, FALSE); - browser->priv->thumbnail_list = gth_file_list_new (gth_icon_view_new (), (viewer_thumbnails_orientation == GTK_ORIENTATION_HORIZONTAL) ? GTH_FILE_LIST_TYPE_H_SIDEBAR : GTH_FILE_LIST_TYPE_V_SIDEBAR, TRUE); + browser->priv->thumbnail_list = gth_file_list_new (gth_grid_view_new (), (viewer_thumbnails_orientation == GTK_ORIENTATION_HORIZONTAL) ? GTH_FILE_LIST_TYPE_H_SIDEBAR : GTH_FILE_LIST_TYPE_V_SIDEBAR, TRUE); gth_file_list_set_caption (GTH_FILE_LIST (browser->priv->thumbnail_list), "none"); - gth_file_view_set_spacing (GTH_FILE_VIEW (gth_file_list_get_view (GTH_FILE_LIST (browser->priv->thumbnail_list))), 0); + gth_grid_view_set_cell_spacing (GTH_GRID_VIEW (gth_file_list_get_view (GTH_FILE_LIST (browser->priv->thumbnail_list))), 0); gth_file_list_set_thumb_size (GTH_FILE_LIST (browser->priv->thumbnail_list), 95); if (viewer_thumbnails_orientation == GTK_ORIENTATION_HORIZONTAL) gtk_paned_pack2 (GTK_PANED (browser->priv->viewer_thumbnails_pane), browser->priv->thumbnail_list, FALSE, FALSE); else gtk_paned_pack1 (GTK_PANED (browser->priv->viewer_thumbnails_pane), browser->priv->thumbnail_list, FALSE, FALSE); - _gth_browser_set_thumbnail_list_visibility (browser, eel_gconf_get_boolean (PREF_UI_THUMBNAIL_LIST_VISIBLE, TRUE)); + _gth_browser_set_thumbnail_list_visibility (browser, g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_THUMBNAIL_LIST_VISIBLE)); g_signal_connect (gth_file_list_get_view (GTH_FILE_LIST (browser->priv->thumbnail_list)), "file-selection-changed", @@ -4256,7 +4333,6 @@ browser->priv->browser_toolbar = gtk_ui_manager_get_widget (browser->priv->ui, "/ToolBar"); gtk_toolbar_set_show_arrow (GTK_TOOLBAR (browser->priv->browser_toolbar), TRUE); gth_window_attach_toolbar (GTH_WINDOW (browser), GTH_BROWSER_PAGE_BROWSER, browser->priv->browser_toolbar); - add_browser_toolbar_menu_buttons (browser); /* infobar */ @@ -4266,45 +4342,32 @@ /* statusbar */ browser->priv->statusbar = gth_statusbar_new (); - gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (browser->priv->statusbar), TRUE); browser->priv->help_message_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR (browser->priv->statusbar), "gth_help_message"); - _gth_browser_set_statusbar_visibility (browser, eel_gconf_get_boolean (PREF_UI_STATUSBAR_VISIBLE, TRUE)); + _gth_browser_set_statusbar_visibility (browser, g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_STATUSBAR_VISIBLE)); gth_window_attach (GTH_WINDOW (browser), browser->priv->statusbar, GTH_WINDOW_STATUSBAR); /* main content */ - browser->priv->browser_container = gtk_hpaned_new (); - gtk_widget_show (browser->priv->browser_container); - gth_window_attach_content (GTH_WINDOW (browser), GTH_BROWSER_PAGE_BROWSER, browser->priv->browser_container); + browser->priv->browser_right_container = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); + gtk_widget_show (browser->priv->browser_right_container); + gth_window_attach_content (GTH_WINDOW (browser), GTH_BROWSER_PAGE_BROWSER, browser->priv->browser_right_container); + + browser->priv->browser_left_container = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); + gtk_paned_set_position (GTK_PANED (browser->priv->browser_left_container), g_settings_get_int (browser->priv->browser_settings, PREF_BROWSER_BROWSER_SIDEBAR_WIDTH)); + gtk_widget_show (browser->priv->browser_left_container); + gtk_paned_pack1 (GTK_PANED (browser->priv->browser_right_container), browser->priv->browser_left_container, TRUE, TRUE); /* the browser sidebar */ - browser->priv->browser_sidebar = gtk_vpaned_new (); - gtk_widget_set_size_request (browser->priv->browser_sidebar, eel_gconf_get_integer (PREF_UI_BROWSER_SIDEBAR_WIDTH, DEF_SIDEBAR_WIDTH), -1); - gtk_widget_show (browser->priv->browser_sidebar); - gtk_paned_pack1 (GTK_PANED (browser->priv->browser_container), browser->priv->browser_sidebar, FALSE, TRUE); + browser->priv->browser_sidebar = gth_auto_paned_new (GTK_ORIENTATION_VERTICAL); + gtk_paned_pack1 (GTK_PANED (browser->priv->browser_left_container), browser->priv->browser_sidebar, FALSE, FALSE); - /* the box that contains the location and the folder list. */ + /* the box that contains the folder list. */ - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_widget_set_size_request (vbox, -1, FILE_PROPERTIES_MINIMUM_HEIGHT); gtk_widget_show (vbox); - gtk_paned_pack1 (GTK_PANED (browser->priv->browser_sidebar), vbox, TRUE, TRUE); - - /* the location combobox */ - - browser->priv->location_chooser_container = gtk_alignment_new (0, 0.5, 1.0, 1.0); - gtk_alignment_set_padding (GTK_ALIGNMENT (browser->priv->location_chooser_container), 0, 4, 0, 0); - gtk_widget_show (browser->priv->location_chooser_container); - gtk_box_pack_start (GTK_BOX (vbox), browser->priv->location_chooser_container, FALSE, FALSE, 0); - - browser->priv->location_chooser = gth_location_chooser_new (); - gtk_widget_show (browser->priv->location_chooser); - gtk_container_add (GTK_CONTAINER (browser->priv->location_chooser_container), browser->priv->location_chooser); - - g_signal_connect (browser->priv->location_chooser, - "changed", - G_CALLBACK (location_changed_cb), - browser); + gtk_paned_pack1 (GTK_PANED (browser->priv->browser_sidebar), vbox, TRUE, FALSE); /* the folder list */ @@ -4382,14 +4445,18 @@ /* the file property box */ browser->priv->file_properties = gth_sidebar_new ("file-tools"); + gtk_widget_set_size_request (browser->priv->file_properties, -1, FILE_PROPERTIES_MINIMUM_HEIGHT); gtk_widget_hide (browser->priv->file_properties); - gtk_paned_pack2 (GTK_PANED (browser->priv->browser_sidebar), browser->priv->file_properties, FALSE, TRUE); + gtk_paned_pack2 (GTK_PANED (_gth_browser_get_browser_file_properties_container (browser)), + browser->priv->file_properties, + ! browser->priv->file_properties_on_the_right, + FALSE); /* the box that contains the file list and the filter bar. */ - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox); - gtk_paned_pack2 (GTK_PANED (browser->priv->browser_container), vbox, TRUE, TRUE); + gtk_paned_pack2 (GTK_PANED (browser->priv->browser_left_container), vbox, TRUE, TRUE); /* the list extra widget container */ @@ -4402,16 +4469,22 @@ gtk_widget_show (browser->priv->list_extra_widget); gtk_container_add (GTK_CONTAINER (browser->priv->list_extra_widget_container), browser->priv->list_extra_widget); + g_signal_connect (gth_embedded_dialog_get_chooser (GTH_EMBEDDED_DIALOG (browser->priv->list_extra_widget)), + "changed", + G_CALLBACK (location_chooser_changed_cb), + browser); + /* the file list */ - browser->priv->file_list = gth_file_list_new (gth_icon_view_new (), GTH_FILE_LIST_TYPE_NORMAL, TRUE); - sort_type = eel_gconf_get_string (PREF_SORT_TYPE, "file::mtime"); + browser->priv->file_list = gth_file_list_new (gth_grid_view_new (), GTH_FILE_LIST_TYPE_NORMAL, TRUE); + sort_type = g_settings_get_string (browser->priv->browser_settings, PREF_BROWSER_SORT_TYPE); gth_browser_set_sort_order (browser, gth_main_get_sort_type (sort_type), - eel_gconf_get_boolean (PREF_SORT_INVERSE, FALSE)); - gth_browser_enable_thumbnails (browser, eel_gconf_get_boolean (PREF_SHOW_THUMBNAILS, TRUE)); - gth_file_list_set_thumb_size (GTH_FILE_LIST (browser->priv->file_list), eel_gconf_get_integer (PREF_THUMBNAIL_SIZE, DEF_THUMBNAIL_SIZE)); - caption = eel_gconf_get_string (PREF_THUMBNAIL_CAPTION, DEFAULT_THUMBNAIL_CAPTION); + g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_SORT_INVERSE)); + gth_browser_enable_thumbnails (browser, g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_SHOW_THUMBNAILS)); + gth_file_list_set_thumb_size (GTH_FILE_LIST (browser->priv->file_list), + g_settings_get_int (browser->priv->browser_settings, PREF_BROWSER_THUMBNAIL_SIZE)); + caption = g_settings_get_string (browser->priv->browser_settings, PREF_BROWSER_THUMBNAIL_CAPTION); gth_file_list_set_caption (GTH_FILE_LIST (browser->priv->file_list), caption); g_free (caption); @@ -4449,11 +4522,11 @@ /* the filter bar */ - general_filter = eel_gconf_get_string (PREF_GENERAL_FILTER, DEFAULT_GENERAL_FILTER); + general_filter = g_settings_get_string (browser->priv->browser_settings, PREF_BROWSER_GENERAL_FILTER); browser->priv->filterbar = gth_filterbar_new (general_filter); g_free (general_filter); - gth_browser_show_filterbar (browser, eel_gconf_get_boolean (PREF_UI_FILTERBAR_VISIBLE, TRUE)); + gth_browser_show_filterbar (browser, g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_FILTERBAR_VISIBLE)); gtk_box_pack_end (GTK_BOX (vbox), browser->priv->filterbar, FALSE, FALSE, 0); g_signal_connect (browser->priv->filterbar, @@ -4469,11 +4542,7 @@ G_CALLBACK (filterbar_close_button_clicked_cb), browser); - /* the image preloader */ - - browser->priv->image_preloader = gth_image_preloader_new (GTH_LOAD_POLICY_TWO_STEPS, 10); - - /**/ + /* monitor signals */ browser->priv->folder_changed_id = g_signal_connect (gth_main_get_default_monitor (), @@ -4490,6 +4559,11 @@ "metadata-changed", G_CALLBACK (metadata_changed_cb), browser); + browser->priv->emblems_changed_id = + g_signal_connect (gth_main_get_default_monitor (), + "emblems-changed", + G_CALLBACK (emblems_changed_cb), + browser); browser->priv->entry_points_changed_id = g_signal_connect (gth_main_get_default_monitor (), "entry-points-changed", @@ -4505,99 +4579,101 @@ browser->priv->file_popup = gtk_ui_manager_get_widget (browser->priv->ui, "/FilePopup"); - _gth_browser_set_sidebar_visibility (browser, eel_gconf_get_boolean (PREF_UI_SIDEBAR_VISIBLE, TRUE)); - - _gth_browser_set_toolbar_visibility (browser, eel_gconf_get_boolean (PREF_UI_TOOLBAR_VISIBLE, TRUE)); + _gth_browser_set_sidebar_visibility (browser, g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_SIDEBAR_VISIBLE)); + _gth_browser_set_toolbar_visibility (browser, g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_TOOLBAR_VISIBLE)); _gth_browser_update_toolbar_style (browser); - _gth_browser_update_entry_point_list (browser); - browser->priv->show_hidden_files = eel_gconf_get_boolean (PREF_SHOW_HIDDEN_FILES, FALSE); + browser->priv->show_hidden_files = g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_SHOW_HIDDEN_FILES); _gth_browser_set_action_active (browser, "View_ShowHiddenFiles", browser->priv->show_hidden_files); - browser->priv->fast_file_type = eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE); + browser->priv->shrink_wrap_viewer = g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_SHRINK_WRAP_VIEWER); + _gth_browser_set_action_active (browser, "View_ShrinkWrap", browser->priv->shrink_wrap_viewer); - gth_hook_invoke ("gth-browser-construct", browser); + _gth_browser_set_action_sensitive (browser, "Viewer_Tools", FALSE); + gth_browser_show_file_properties (browser, g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_PROPERTIES_VISIBLE)); - g_signal_connect (browser, "realize", G_CALLBACK (_gth_browser_realize), NULL); - g_signal_connect (browser, "unrealize", G_CALLBACK (_gth_browser_unrealize), NULL); + browser->priv->fast_file_type = g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_FAST_FILE_TYPE); + + gth_hook_invoke ("gth-browser-construct", browser); performance (DEBUG_INFO, "window initialized"); - /* gconf notifications */ + /* settings notifications */ - i = 0; - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_GENERAL_FILTER, - pref_general_filter_changed, - browser); - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_UI_TOOLBAR_STYLE, - pref_ui_toolbar_style_changed, - browser); - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_UI_VIEWER_THUMBNAILS_ORIENT, - pref_ui_viewer_thumbnails_orient_changed, - browser); - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - "/desktop/gnome/interface/toolbar_style", - pref_ui_toolbar_style_changed, - browser); - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_UI_TOOLBAR_VISIBLE, - pref_ui_toolbar_visible_changed, - browser); - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_UI_STATUSBAR_VISIBLE, - pref_ui_statusbar_visible_changed, - browser); - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_UI_SIDEBAR_VISIBLE, - pref_ui_sidebar_visible_changed, - browser); - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_UI_THUMBNAIL_LIST_VISIBLE, - pref_ui_thumbnail_list_visible_changed, - browser); - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_SHOW_HIDDEN_FILES, - pref_show_hidden_files_changed, - browser); - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_FAST_FILE_TYPE, - pref_fast_file_type_changed, - browser); - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_THUMBNAIL_SIZE, - pref_thumbnail_size_changed, - browser); - browser->priv->cnxn_id[i++] = eel_gconf_notification_add ( - PREF_THUMBNAIL_CAPTION, - pref_thumbnail_caption_changed, - browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_GENERAL_FILTER, + G_CALLBACK (pref_general_filter_changed), + browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_TOOLBAR_STYLE, + G_CALLBACK (pref_ui_toolbar_style_changed), + browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_VIEWER_THUMBNAILS_ORIENT, + G_CALLBACK (pref_ui_viewer_thumbnails_orient_changed), + browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_PROPERTIES_ON_THE_RIGHT, + G_CALLBACK (pref_browser_properties_on_the_right_changed), + browser); + g_signal_connect (browser->priv->desktop_interface_settings, + "changed::" PREF_BROWSER_TOOLBAR_STYLE, + G_CALLBACK (pref_ui_toolbar_style_changed), + browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_TOOLBAR_VISIBLE, + G_CALLBACK (pref_ui_toolbar_visible_changed), + browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_STATUSBAR_VISIBLE, + G_CALLBACK (pref_ui_statusbar_visible_changed), + browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_SIDEBAR_VISIBLE, + G_CALLBACK (pref_ui_sidebar_visible_changed), + browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_THUMBNAIL_LIST_VISIBLE, + G_CALLBACK (pref_ui_thumbnail_list_visible_changed), + browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_SHOW_HIDDEN_FILES, + G_CALLBACK (pref_show_hidden_files_changed), + browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_FAST_FILE_TYPE, + G_CALLBACK (pref_fast_file_type_changed), + browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_THUMBNAIL_SIZE, + G_CALLBACK (pref_thumbnail_size_changed), + browser); + g_signal_connect (browser->priv->browser_settings, + "changed::" PREF_BROWSER_THUMBNAIL_CAPTION, + G_CALLBACK (pref_thumbnail_caption_changed), + browser); - gth_window_set_current_page (GTH_WINDOW (browser), GTH_BROWSER_PAGE_BROWSER); browser->priv->constructed = TRUE; - - call_when_idle (_gth_browser_construct_step2, browser); } GtkWidget * -gth_browser_new (const char *uri) +gth_browser_new (GFile *location, + GFile *file_to_select) { - GthBrowser *browser; + GthBrowser *browser; + NewWindowData *data; - browser = (GthBrowser*) g_object_new (GTH_TYPE_BROWSER, "n-pages", GTH_BROWSER_N_PAGES, NULL); - _gth_browser_construct (browser); - browser_list = g_list_prepend (browser_list, browser); - - if (uri != NULL) { - GFile *location; - - location = g_file_new_for_uri ((uri != NULL) ? uri : gth_pref_get_startup_location ()); - gth_browser_go_to (browser, location, NULL); - g_object_unref (location); - } + browser = (GthBrowser*) g_object_new (GTH_TYPE_BROWSER, NULL); + + data = g_new0 (NewWindowData, 1); + data->browser = browser; + data->location = _g_object_ref (location); + if (data->location == NULL) + data->location = g_file_new_for_uri (gth_pref_get_startup_location ()); + data->file_to_select = _g_object_ref (file_to_select); + + browser->priv->construct_step2_event = call_when_idle (_gth_browser_construct_step2, data); return (GtkWidget*) browser; } @@ -4637,10 +4713,10 @@ void gth_browser_go_to (GthBrowser *browser, GFile *location, - GFile *scroll_to_file) + GFile *file_to_select) { gth_window_set_current_page (GTH_WINDOW (browser), GTH_BROWSER_PAGE_BROWSER); - _gth_browser_load (browser, location, scroll_to_file, GTH_ACTION_GO_TO, FALSE); + _gth_browser_load (browser, location, file_to_select, GTH_ACTION_GO_TO, FALSE); } @@ -4753,6 +4829,13 @@ } +GtkActionGroup * +gth_browser_get_actions (GthBrowser *browser) +{ + return browser->priv->actions; +} + + GthIconCache * gth_browser_get_menu_icon_cache (GthBrowser *browser) { @@ -5075,7 +5158,7 @@ gth_viewer_page_show_properties (browser->priv->viewer_page, browser->priv->properties_on_screen); } else - gth_browser_show_viewer_properties (browser, ! _gth_browser_get_action_active (browser, "Viewer_Properties")); + gth_browser_show_file_properties (browser, ! _gth_browser_get_action_active (browser, "Viewer_Properties")); } @@ -5443,27 +5526,12 @@ return; } + /* the mime type can be different for example when a jpeg image has a .png extension */ different_mime_type = ! g_str_equal (gth_file_data_get_mime_type (browser->priv->current_file), gth_file_data_get_mime_type (file_data)); g_file_info_copy_into (file_data->info, browser->priv->current_file->info); g_file_info_set_attribute_boolean (browser->priv->current_file->info, "gth::file::is-modified", FALSE); - if ((gth_window_get_current_page (GTH_WINDOW (browser)) == GTH_BROWSER_PAGE_BROWSER) - && ! gtk_widget_get_visible (browser->priv->file_properties)) - { - _gth_browser_show_properties_in_browser_mode (browser); - - if (browser->priv->location != NULL) { - GtkTreePath *path; - - path = gth_folder_tree_get_path (GTH_FOLDER_TREE (browser->priv->folder_tree), browser->priv->location->file); - if (path != NULL) { - gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (browser->priv->folder_tree), path, NULL, TRUE, .25, .0); - gtk_tree_path_free (path); - } - } - } - gth_browser_update_title (browser); gth_browser_update_statusbar_file_info (browser); gth_sidebar_set_file (GTH_SIDEBAR (browser->priv->file_properties), browser->priv->current_file); @@ -5492,6 +5560,8 @@ gth_viewer_page_update_info (browser->priv->viewer_page, browser->priv->current_file); } + /* location is NULL if the file has been loaded because requested + * from the command line */ if (browser->priv->location == NULL) { GFile *parent; @@ -5535,6 +5605,17 @@ g_file_info_set_attribute_boolean (browser->priv->current_file->info, "gth::file::is-modified", FALSE); + if (browser->priv->shrink_wrap_viewer) { + /* the frame::[width|height] properties have been set by the + * viewer, copy them in the current file. */ + + g_file_info_set_attribute_int32 (browser->priv->current_file->info, "frame::width", + g_file_info_get_attribute_int32 (file_data->info, "frame::width")); + g_file_info_set_attribute_int32 (browser->priv->current_file->info, "frame::height", + g_file_info_get_attribute_int32 (file_data->info, "frame::height")); + gth_browser_set_shrink_wrap_viewer (browser, TRUE); + } + data = load_file_data_new (browser, browser->priv->current_file, FALSE); files = g_list_prepend (NULL, browser->priv->current_file->file); _g_query_all_metadata_async (files, @@ -5641,7 +5722,7 @@ browser->priv->load_file_timeout = 0; } - if (eel_gconf_get_boolean (PREF_MSG_SAVE_MODIFIED_IMAGE, DEFAULT_MSG_SAVE_MODIFIED_IMAGE) + if (g_settings_get_boolean (browser->priv->messages_settings, PREF_MSG_SAVE_MODIFIED_IMAGE) && gth_browser_get_file_modified (browser)) { load_file_data_ref (data); @@ -5691,19 +5772,34 @@ void -gth_browser_show_viewer_properties (GthBrowser *browser, - gboolean show) +gth_browser_show_file_properties (GthBrowser *browser, + gboolean show) { - _gth_browser_set_action_active (browser, "Viewer_Properties", show); + switch (gth_window_get_current_page (GTH_WINDOW (browser))) { + case GTH_BROWSER_PAGE_BROWSER: + case GTH_WINDOW_PAGE_UNDEFINED: /* when called from gth_browser_init */ + g_settings_set_boolean (browser->priv->browser_settings, PREF_BROWSER_PROPERTIES_VISIBLE, show); + _gth_browser_set_action_active (browser, "Browser_Properties", show); + if (show) { + if (gth_window_get_current_page (GTH_WINDOW (browser)) != GTH_WINDOW_PAGE_UNDEFINED) + gtk_widget_show (browser->priv->file_properties); + } + else + gtk_widget_hide (browser->priv->file_properties); + break; - if (show) { - _gth_browser_set_action_active (browser, "Viewer_Tools", FALSE); - gtk_widget_show (browser->priv->viewer_sidebar_alignment); - gtk_widget_show (browser->priv->file_properties); - gth_sidebar_show_properties (GTH_SIDEBAR (browser->priv->file_properties)); + case GTH_BROWSER_PAGE_VIEWER: + _gth_browser_set_action_active (browser, "Viewer_Properties", show); + if (show) { + _gth_browser_set_action_active (browser, "Viewer_Tools", FALSE); + gtk_widget_show (browser->priv->viewer_sidebar_alignment); + gtk_widget_show (browser->priv->file_properties); + gth_sidebar_show_properties (GTH_SIDEBAR (browser->priv->file_properties)); + } + else + gtk_widget_hide (browser->priv->viewer_sidebar_alignment); + break; } - else - gtk_widget_hide (browser->priv->viewer_sidebar_alignment); } @@ -5711,8 +5807,13 @@ gth_browser_show_viewer_tools (GthBrowser *browser, gboolean show) { + if (show) + gth_window_set_current_page (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER); _gth_browser_set_action_active (browser, "Viewer_Tools", show); + if (gth_window_get_current_page (GTH_WINDOW (browser)) != GTH_BROWSER_PAGE_VIEWER) + return; + if (show) { _gth_browser_set_action_active (browser, "Viewer_Properties", FALSE); gtk_widget_show (browser->priv->viewer_sidebar_alignment); @@ -5724,12 +5825,103 @@ } +void +gth_browser_set_shrink_wrap_viewer (GthBrowser *browser, + gboolean value) +{ + int width; + int height; + double ratio; + int other_width; + int other_height; + GdkScreen *screen; + int max_width; + int max_height; + + browser->priv->shrink_wrap_viewer = value; + g_settings_set_boolean (browser->priv->browser_settings, PREF_BROWSER_SHRINK_WRAP_VIEWER, browser->priv->shrink_wrap_viewer); + + if (browser->priv->viewer_page == NULL) + return; + + if (! browser->priv->shrink_wrap_viewer) { + if (gth_window_get_page_size (GTH_WINDOW (browser), + GTH_BROWSER_PAGE_BROWSER, + &width, + &height)) + { + gth_window_save_page_size (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER, width, height); + gth_window_apply_saved_size (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER); + } + else + gth_window_clear_saved_size (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER); + gth_viewer_page_shrink_wrap (browser->priv->viewer_page, FALSE, NULL, NULL); + + return; + } + + if (browser->priv->current_file == NULL) + return; + + width = g_file_info_get_attribute_int32 (browser->priv->current_file->info, "frame::width"); + height = g_file_info_get_attribute_int32 (browser->priv->current_file->info, "frame::height"); + if ((width <= 0) || (height <= 0)) + return; + + ratio = (double) width / height; + + other_width = 0; + other_height = 0; + other_height += _gtk_widget_get_allocated_height (gth_window_get_area (GTH_WINDOW (browser), GTH_WINDOW_MENUBAR)); + other_height += _gtk_widget_get_allocated_height (gth_window_get_area (GTH_WINDOW (browser), GTH_WINDOW_TOOLBAR)); + other_height += _gtk_widget_get_allocated_height (gth_window_get_area (GTH_WINDOW (browser), GTH_WINDOW_STATUSBAR)); + other_height += _gtk_widget_get_allocated_height (gth_browser_get_viewer_toolbar (browser)); + if (g_settings_get_enum (browser->priv->browser_settings, PREF_BROWSER_VIEWER_THUMBNAILS_ORIENT) == GTK_ORIENTATION_HORIZONTAL) + other_height += _gtk_widget_get_allocated_height (gth_browser_get_thumbnail_list (browser)); + else + other_width += _gtk_widget_get_allocated_width (gth_browser_get_thumbnail_list (browser)); + other_width += _gtk_widget_get_allocated_width (gth_browser_get_viewer_sidebar (browser)); + other_width += 2; + other_height += 2; + + gth_viewer_page_shrink_wrap (browser->priv->viewer_page, TRUE, &other_width, &other_height); + + screen = gtk_widget_get_screen (GTK_WIDGET (browser)); + max_width = gdk_screen_get_width (screen) - SHIRNK_WRAP_WIDTH_OFFSET; + max_height = gdk_screen_get_height (screen)- SHIRNK_WRAP_HEIGHT_OFFSET; + + if (width + other_width > max_width) { + width = max_width - other_width; + height = width / ratio; + } + + if (height + other_height > max_height) { + height = max_height - other_height; + width = height * ratio; + } + + gth_window_save_page_size (GTH_WINDOW (browser), + GTH_BROWSER_PAGE_VIEWER, + width + other_width, + height + other_height); + if (gth_window_get_current_page (GTH_WINDOW (browser)) == GTH_BROWSER_PAGE_VIEWER) + gth_window_apply_saved_size (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER); +} + + +gboolean +gth_browser_get_shrink_wrap_viewer (GthBrowser *browser) +{ + return browser->priv->shrink_wrap_viewer; +} + + /* -- gth_browser_load_location -- */ typedef struct { GthFileSource *file_source; - GFile *location; + GthFileData *location_data; GthBrowser *browser; } LoadLocationData; @@ -5737,48 +5929,44 @@ static void load_location_data_free (LoadLocationData *data) { - g_object_unref (data->location); + g_object_unref (data->location_data); g_object_unref (data->file_source); g_free (data); } static void -load_file_attributes_ready_cb (GthFileSource *file_source, - GList *files, - GError *error, - gpointer user_data) +load_file_attributes_ready_cb (GObject *object, + GError *error, + gpointer user_data) { LoadLocationData *data = user_data; GthBrowser *browser = data->browser; if (error == NULL) { - GthFileData *file_data; - - file_data = files->data; - if (g_file_info_get_file_type (file_data->info) == G_FILE_TYPE_REGULAR) { + if (g_file_info_get_file_type (data->location_data->info) == G_FILE_TYPE_REGULAR) { GFile *parent; - parent = g_file_get_parent (file_data->file); + parent = g_file_get_parent (data->location_data->file); if ((browser->priv->location != NULL) && ! g_file_equal (parent, browser->priv->location->file)) { /* set location to NULL to force a folder reload */ _g_object_unref (browser->priv->location); browser->priv->location = NULL; } - gth_browser_load_file (browser, file_data, TRUE); + gth_browser_load_file (browser, data->location_data, TRUE); g_object_unref (parent); } - else if (g_file_info_get_file_type (file_data->info) == G_FILE_TYPE_DIRECTORY) { + else if (g_file_info_get_file_type (data->location_data->info) == G_FILE_TYPE_DIRECTORY) { gth_window_set_current_page (GTH_WINDOW (browser), GTH_BROWSER_PAGE_BROWSER); - gth_browser_go_to (browser, file_data->file, NULL); + gth_browser_go_to (browser, data->location_data->file, NULL); } else { char *title; GError *error; - title = file_format (_("Could not load the position \"%s\""), data->location); + title = file_format (_("Could not load the position \"%s\""), data->location_data->file); error = g_error_new (GTH_ERROR, 0, _("File type not supported")); _gtk_error_dialog_from_gerror_show (GTK_WINDOW (browser), title, error); g_clear_error (&error); @@ -5797,7 +5985,7 @@ else { char *title; - title = file_format (_("Could not load the position \"%s\""), data->location); + title = file_format (_("Could not load the position \"%s\""), data->location_data->file); _gtk_error_dialog_from_gerror_show (GTK_WINDOW (browser), title, error); g_free (title); @@ -5812,17 +6000,16 @@ GFile *location) { LoadLocationData *data; - GList *list; data = g_new0 (LoadLocationData, 1); data->browser = browser; - data->location = g_object_ref (location); - data->file_source = gth_main_get_file_source (data->location); + data->location_data = gth_file_data_new (location, NULL); + data->file_source = gth_main_get_file_source (data->location_data->file); if (data->file_source == NULL) { char *title; GError *error; - title = file_format (_("Could not load the position \"%s\""), data->location); + title = file_format (_("Could not load the position \"%s\""), data->location_data->file); error = g_error_new (GTH_ERROR, 0, _("No suitable module found")); _gtk_error_dialog_from_gerror_show (GTK_WINDOW (browser), title, error); g_clear_error (&error); @@ -5830,14 +6017,11 @@ g_free (title); } - list = g_list_prepend (NULL, g_object_ref (data->location)); - gth_file_source_read_attributes (data->file_source, - list, - GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE, - load_file_attributes_ready_cb, - data); - - _g_object_list_unref (list); + gth_file_source_read_metadata (data->file_source, + data->location_data, + GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE, + load_file_attributes_ready_cb, + data); } @@ -5940,7 +6124,7 @@ { gth_file_list_enable_thumbs (GTH_FILE_LIST (browser->priv->file_list), show); _gth_browser_set_action_active (browser, "View_Thumbnails", show); - eel_gconf_set_boolean (PREF_SHOW_THUMBNAILS, show); + g_settings_set_boolean (browser->priv->browser_settings, PREF_BROWSER_SHOW_THUMBNAILS, show); } @@ -5953,7 +6137,7 @@ else gtk_widget_hide (browser->priv->filterbar); _gth_browser_set_action_active (browser, "View_Filterbar", show); - eel_gconf_set_boolean (PREF_UI_FILTERBAR_VISIBLE, show); + g_settings_set_boolean (browser->priv->browser_settings, PREF_BROWSER_FILTERBAR_VISIBLE, show); } @@ -6001,19 +6185,30 @@ } +typedef struct { + GthBrowser *browser; + GdkDevice *device; +} HideMouseData; + + static gboolean hide_mouse_pointer_cb (gpointer data) { - GthBrowser *browser = data; - int px, py; - GList *scan; - - gdk_window_get_pointer (gtk_widget_get_window (GTK_WIDGET (browser)), &px, &py, 0); + HideMouseData *hmdata = data; + GthBrowser *browser = hmdata->browser; + int px, py; + GList *scan; + + gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (browser)), + hmdata->device, + &px, + &py, + 0); for (scan = browser->priv->fullscreen_controls; scan; scan = scan->next) { GtkWidget *widget = scan->data; int x, y, w, h; - gdk_window_get_geometry (gtk_widget_get_window (widget), &x, &y, &w, &h, NULL); + gdk_window_get_geometry (gtk_widget_get_window (widget), &x, &y, &w, &h); if ((px >= x) && (px <= x + w) && (py >= y) && (py <= y + h)) return FALSE; @@ -6036,7 +6231,8 @@ GdkEventMotion *event, gpointer data) { - GthBrowser *browser = data; + GthBrowser *browser = data; + HideMouseData *hmdata; if (browser->priv->last_mouse_x == 0.0) browser->priv->last_mouse_x = event->x; @@ -6063,9 +6259,15 @@ if (browser->priv->hide_mouse_timeout != 0) g_source_remove (browser->priv->hide_mouse_timeout); - browser->priv->hide_mouse_timeout = g_timeout_add (HIDE_MOUSE_DELAY, - hide_mouse_pointer_cb, - browser); + + hmdata = g_new0 (HideMouseData, 1); + hmdata->browser = browser; + hmdata->device = event->device; + browser->priv->hide_mouse_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, + HIDE_MOUSE_DELAY, + hide_mouse_pointer_cb, + hmdata, + g_free); browser->priv->last_mouse_x = event->x; browser->priv->last_mouse_y = event->y; @@ -6099,7 +6301,7 @@ browser->priv->before_fullscreen.viewer_tools = _gth_browser_get_action_active (browser, "Viewer_Tools"); browser->priv->before_fullscreen.thumbnail_list = _gth_browser_get_action_active (browser, "View_Thumbnail_List"); - gth_browser_show_viewer_properties (browser, FALSE); + gth_browser_show_file_properties (browser, FALSE); gth_browser_show_viewer_tools (browser, FALSE); _gth_browser_set_thumbnail_list_visibility (browser, FALSE); gth_window_set_current_page (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER); @@ -6142,11 +6344,11 @@ _gth_browser_set_thumbnail_list_visibility (browser, browser->priv->before_fullscreen.thumbnail_list); if (browser->priv->before_fullscreen.viewer_properties) - gth_browser_show_viewer_properties (browser, TRUE); + gth_browser_show_file_properties (browser, TRUE); else if (browser->priv->before_fullscreen.viewer_tools) gth_browser_show_viewer_tools (browser, TRUE); else { - gth_browser_show_viewer_properties (browser, FALSE); + gth_browser_show_file_properties (browser, FALSE); gth_browser_show_viewer_tools (browser, FALSE); } diff -Nru gthumb-2.14.3/gthumb/gth-browser.h gthumb-3.0.0/gthumb/gth-browser.h --- gthumb-2.14.3/gthumb/gth-browser.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-browser.h 2012-04-20 15:30:59.000000000 +0000 @@ -38,9 +38,9 @@ #define GTH_IS_BROWSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_BROWSER)) #define GTH_BROWSER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_BROWSER, GthBrowserClass)) -typedef struct _GthBrowser GthBrowser; -typedef struct _GthBrowserClass GthBrowserClass; -typedef struct _GthBrowserPrivateData GthBrowserPrivateData; +typedef struct _GthBrowser GthBrowser; +typedef struct _GthBrowserClass GthBrowserClass; +typedef struct _GthBrowserPrivate GthBrowserPrivate; typedef void (*GthBrowserCallback) (GthBrowser *, gboolean cancelled, gpointer user_data); @@ -52,7 +52,6 @@ typedef enum { GTH_ACTION_GO_TO, - GTH_ACTION_GO_INTO, GTH_ACTION_GO_BACK, GTH_ACTION_GO_FORWARD, GTH_ACTION_GO_UP, @@ -63,7 +62,7 @@ struct _GthBrowser { GthWindow __parent; - GthBrowserPrivateData *priv; + GthBrowserPrivate *priv; }; struct _GthBrowserClass @@ -76,14 +75,15 @@ }; GType gth_browser_get_type (void); -GtkWidget * gth_browser_new (const char *uri); +GtkWidget * gth_browser_new (GFile *location, + GFile *file_to_select); GFile * gth_browser_get_location (GthBrowser *browser); GthFileData * gth_browser_get_location_data (GthBrowser *browser); GthFileData * gth_browser_get_current_file (GthBrowser *browser); gboolean gth_browser_get_file_modified (GthBrowser *browser); void gth_browser_go_to (GthBrowser *browser, GFile *location, - GFile *scroll_to_file); + GFile *file_to_select); void gth_browser_go_back (GthBrowser *browser, int steps); void gth_browser_go_forward (GthBrowser *browser, @@ -100,6 +100,7 @@ GtkWidget * gth_browser_get_dialog (GthBrowser *browser, const char *dialog_name); GtkUIManager * gth_browser_get_ui_manager (GthBrowser *browser); +GtkActionGroup * gth_browser_get_actions (GthBrowser *browser); GthIconCache * gth_browser_get_menu_icon_cache (GthBrowser *browser); GtkWidget * gth_browser_get_browser_toolbar (GthBrowser *browser); GtkWidget * gth_browser_get_infobar (GthBrowser *browser); @@ -159,10 +160,13 @@ void gth_browser_update_extra_widget (GthBrowser *browser); void gth_browser_update_statusbar_file_info (GthBrowser *browser); -void gth_browser_show_viewer_properties (GthBrowser *browser, +void gth_browser_show_file_properties (GthBrowser *browser, gboolean show); void gth_browser_show_viewer_tools (GthBrowser *browser, gboolean show); +void gth_browser_set_shrink_wrap_viewer (GthBrowser *browser, + gboolean value); +gboolean gth_browser_get_shrink_wrap_viewer (GthBrowser *browser); void gth_browser_load_location (GthBrowser *browser, GFile *location); void gth_browser_enable_thumbnails (GthBrowser *browser, diff -Nru gthumb-2.14.3/gthumb/gth-browser-ui.h gthumb-3.0.0/gthumb/gth-browser-ui.h --- gthumb-2.14.3/gthumb/gth-browser-ui.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-browser-ui.h 2012-03-31 09:42:24.000000000 +0000 @@ -90,6 +90,7 @@ " " " " " " +" " " " " " " " @@ -107,14 +108,24 @@ " " " " +" " +" " +" " " " " " " " " " " " -" " +" " +" " +" " " " " " +" " +" " +" " +" " +" " " " " " @@ -126,8 +137,10 @@ " " " " " " +" " " " " " +" " " " " " @@ -140,8 +153,10 @@ " " " " " " +" " " " " " +" " " " " " @@ -224,11 +239,6 @@ " " " " " " -" " -" " -" " -" " -" " ""; @@ -239,6 +249,9 @@ " " " " " " +" " +" " +" " " " " " " " diff -Nru gthumb-2.14.3/gthumb/gth-cell-renderer-thumbnail.c gthumb-3.0.0/gthumb/gth-cell-renderer-thumbnail.c --- gthumb-2.14.3/gthumb/gth-cell-renderer-thumbnail.c 2011-11-03 20:37:20.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-cell-renderer-thumbnail.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,534 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2008 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include "cairo-utils.h" -#include "gth-file-data.h" -#include "glib-utils.h" -#include "gth-cell-renderer-thumbnail.h" -#include "pixbuf-utils.h" - -#define DEFAULT_THUMBNAIL_SIZE 128 -#define MAX_THUMBNAIL_SIZE 320 -#define THUMBNAIL_BORDER 8 -#define THUMBNAIL_BORDER 8 - - -/* properties */ -enum { - PROP_0, - PROP_SIZE, - PROP_IS_ICON, - PROP_THUMBNAIL, - PROP_CHECKED, - PROP_SELECTED, - PROP_FILE, - PROP_FIXED_SIZE -}; - - -struct _GthCellRendererThumbnailPrivate -{ - int size; - gboolean is_icon; - GdkPixbuf *thumbnail; - GthFileData *file; - gboolean checked; - gboolean selected; - gboolean fixed_size; -}; - - -static gpointer parent_class = NULL; - - -static void -gth_cell_renderer_thumbnail_finalize (GObject *object) -{ - GthCellRendererThumbnail *cell_renderer; - - cell_renderer = GTH_CELL_RENDERER_THUMBNAIL (object); - - if (cell_renderer->priv != NULL) { - _g_object_unref (cell_renderer->priv->thumbnail); - _g_object_unref (cell_renderer->priv->file); - g_free (cell_renderer->priv); - cell_renderer->priv = NULL; - } - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - - -static void -gth_cell_renderer_thumbnail_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - GthCellRendererThumbnail *self; - - self = (GthCellRendererThumbnail *) object; - - switch (param_id) { - case PROP_SIZE: - g_value_set_int (value, self->priv->size); - break; - case PROP_IS_ICON: - g_value_set_boolean (value, self->priv->is_icon); - break; - case PROP_THUMBNAIL: - g_value_set_object (value, self->priv->thumbnail); - break; - case PROP_FILE: - g_value_set_object (value, self->priv->file); - break; - case PROP_CHECKED: - g_value_set_boolean (value, self->priv->checked); - break; - case PROP_SELECTED: - g_value_set_boolean (value, self->priv->selected); - break; - case PROP_FIXED_SIZE: - g_value_set_boolean (value, self->priv->fixed_size); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - - -static void -gth_cell_renderer_thumbnail_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - GthCellRendererThumbnail *self; - - self = (GthCellRendererThumbnail *) object; - - switch (param_id) { - case PROP_SIZE: - self->priv->size = g_value_get_int (value); - break; - case PROP_IS_ICON: - self->priv->is_icon = g_value_get_boolean (value); - break; - case PROP_THUMBNAIL: - if (self->priv->thumbnail != NULL) - g_object_unref (self->priv->thumbnail); - self->priv->thumbnail = g_value_dup_object (value); - break; - case PROP_FILE: - if (self->priv->file != NULL) - g_object_unref (self->priv->file); - self->priv->file = g_value_dup_object (value); - break; - case PROP_CHECKED: - self->priv->checked = g_value_get_boolean (value); - break; - case PROP_SELECTED: - self->priv->selected = g_value_get_boolean (value); - break; - case PROP_FIXED_SIZE: - self->priv->fixed_size = g_value_get_boolean (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - - -static void -gth_cell_renderer_thumbnail_get_size (GtkCellRenderer *cell, - GtkWidget *widget, - GdkRectangle *cell_area, - int *x_offset, - int *y_offset, - int *width, - int *height) -{ - GthCellRendererThumbnail *self; - int image_width; - int image_height; - int calc_width; - int calc_height; - int xpad; - int ypad; - - self = (GthCellRendererThumbnail *) cell; - - if (self->priv->thumbnail != NULL) { - image_width = gdk_pixbuf_get_width (self->priv->thumbnail); - image_height = gdk_pixbuf_get_height (self->priv->thumbnail); - } - else { - image_width = 0; - image_height = 0; - } - - gtk_cell_renderer_get_padding (cell, &xpad, &ypad); - - if (self->priv->is_icon - || self->priv->fixed_size - || (self->priv->thumbnail == NULL) - || ((image_width < self->priv->size) && (image_height < self->priv->size))) - { - calc_width = (int) (xpad * 2) + (THUMBNAIL_BORDER * 2) + self->priv->size; - calc_height = (int) (ypad * 2) + (THUMBNAIL_BORDER * 2) + self->priv->size; - } - else { - calc_width = (int) (xpad * 2) + (THUMBNAIL_BORDER * 2) + self->priv->size; - calc_height = (int) (ypad * 2) + (THUMBNAIL_BORDER * 2) + self->priv->size; - } - - if (width != NULL) - *width = calc_width; - - if (height != NULL) - *height = calc_height; - - if (cell_area != NULL) { - float xalign; - float yalign; - - gtk_cell_renderer_get_alignment (cell, &xalign, &yalign); - - if (x_offset != NULL) { - *x_offset = xalign * (cell_area->width - calc_width); - *x_offset = MAX (*x_offset, 0); - } - - if (y_offset != NULL) { - *y_offset = yalign * (cell_area->height - calc_height); - *y_offset = MAX (*y_offset, 0); - } - } -} - - -static void -gth_cell_renderer_thumbnail_render (GtkCellRenderer *cell, - GdkWindow *window, - GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, - GtkCellRendererState flags) -{ - GthCellRendererThumbnail *self; - GtkStyle *style; - GtkStateType state; - GdkRectangle thumb_rect; - GdkRectangle draw_rect; - GdkRectangle image_rect; - cairo_t *cr; - GdkPixbuf *pixbuf; - GdkPixbuf *original_pixbuf; - int xpad; - int ypad; - GdkPixbuf *colorized = NULL; - int border; - - self = (GthCellRendererThumbnail *) cell; - - gth_cell_renderer_thumbnail_get_size (cell, widget, cell_area, - &thumb_rect.x, - &thumb_rect.y, - &thumb_rect.width, - &thumb_rect.height); - - gtk_cell_renderer_get_padding (cell, &xpad, &ypad); - - thumb_rect.x += cell_area->x + xpad; - thumb_rect.y += cell_area->y + ypad; - thumb_rect.width -= xpad * 2; - thumb_rect.height -= ypad * 2; - - if (! gdk_rectangle_intersect (cell_area, &thumb_rect, &draw_rect) - || ! gdk_rectangle_intersect (expose_area, &thumb_rect, &draw_rect)) - { - return; - } - - cr = gdk_cairo_create (window); - - pixbuf = original_pixbuf = self->priv->thumbnail; - if (pixbuf == NULL) - return; - - g_object_ref (pixbuf); - - image_rect.width = gdk_pixbuf_get_width (pixbuf); - image_rect.height = gdk_pixbuf_get_height (pixbuf); - image_rect.x = thumb_rect.x + (thumb_rect.width - image_rect.width) * .5; - image_rect.y = thumb_rect.y + (thumb_rect.height - image_rect.height) * .5; - - style = gtk_widget_get_style (widget); - - if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED) - state = gtk_widget_has_focus (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE; - else - state = ((flags & GTK_CELL_RENDERER_FOCUSED) == GTK_CELL_RENDERER_FOCUSED) ? GTK_STATE_ACTIVE : GTK_STATE_NORMAL; - - if (self->priv->is_icon || ((image_rect.width < self->priv->size) && (image_rect.height < self->priv->size))) { - GtkStyle *style; - - /* use a gray rounded box for icons or when the original size - * is smaller than the thumbnail size... */ - - style = gtk_widget_get_style (widget); - if (state == GTK_STATE_NORMAL) - gdk_cairo_set_source_color (cr, &style->bg[state]); - else - gdk_cairo_set_source_color (cr, &style->base[state]); - - _cairo_draw_rounded_box (cr, - thumb_rect.x, - thumb_rect.y, - thumb_rect.width, - thumb_rect.height, - 2); - cairo_fill (cr); - } - else { - - /* ...else draw a frame with a drop-shadow effect */ - - GdkRectangle frame_rect; - - if (state == GTK_STATE_ACTIVE) - state = GTK_STATE_SELECTED; - - if (self->priv->fixed_size && _g_mime_type_is_image (gth_file_data_get_mime_type (self->priv->file))) { - frame_rect.width = self->priv->size; /*image_rect.width*/ - frame_rect.height = self->priv->size; /*image_rect.height*/ - frame_rect.x = thumb_rect.x + (thumb_rect.width - frame_rect.width) * .5; /*cell_area->x + xpad + THUMBNAIL_BORDER - 1;*/ - frame_rect.y = thumb_rect.y + (thumb_rect.height - frame_rect.height) * .5; /*cell_area->y + ypad + THUMBNAIL_BORDER - 1;*/ - - border = 6; - } - else { - frame_rect = image_rect; - border = 1; - frame_rect.width -= 1; - frame_rect.height -= 1; - } - - cairo_translate (cr, 0.5, 0.5); - cairo_set_line_width (cr, 0.5); - cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); - - if (border > 1) { - /* the drop shadow */ - - gdk_cairo_set_source_color (cr, &style->dark[state]); - _cairo_draw_rounded_box (cr, - frame_rect.x - border + 2, - frame_rect.y - border + 2, - frame_rect.width + (border * 2), - frame_rect.height + (border * 2), - 1); - cairo_fill (cr); - - /* the outer frame */ - - gdk_cairo_set_source_color (cr, &style->bg[state]); - _cairo_draw_rounded_box (cr, - frame_rect.x - border, - frame_rect.y - border, - frame_rect.width + (border * 2), - frame_rect.height + (border * 2), - 1); - cairo_fill_preserve (cr); - - if (state == GTK_STATE_SELECTED) - gdk_cairo_set_source_color (cr, &style->dark[state]); - else - gdk_cairo_set_source_color (cr, &style->mid[state]); - - cairo_stroke (cr); - - /* the inner frame */ - - cairo_rectangle (cr, - image_rect.x - 1, - image_rect.y - 1, - image_rect.width, - image_rect.height); - cairo_stroke (cr); - } - else { - /* the drop shadow */ - - gdk_cairo_set_source_color (cr, &style->dark[state]); - cairo_rectangle (cr, - frame_rect.x - border + 2, - frame_rect.y - border + 2, - frame_rect.width + (border * 2), - frame_rect.height + (border * 2)); - cairo_fill (cr); - - gdk_cairo_set_source_color (cr, &style->dark[state]); - cairo_rectangle (cr, - frame_rect.x - border, - frame_rect.y - border, - frame_rect.width + (border * 2), - frame_rect.height + (border * 2)); - cairo_stroke (cr); - } - - cairo_identity_matrix (cr); - } - - if (! self->priv->checked || ((flags & (GTK_CELL_RENDERER_SELECTED | GTK_CELL_RENDERER_PRELIT)) != 0)) { - colorized = _gdk_pixbuf_colorize (pixbuf, &style->base[state], self->priv->checked ? 1.0 : 0.33); - pixbuf = colorized; - } - - gdk_cairo_set_source_pixbuf (cr, pixbuf, image_rect.x, image_rect.y); - cairo_rectangle (cr, image_rect.x, image_rect.y, image_rect.width, image_rect.height); - cairo_fill (cr); - - _g_object_unref (colorized); - g_object_unref (original_pixbuf); - cairo_destroy (cr); -} - - -static void -gth_cell_renderer_thumbnail_class_init (GthCellRendererThumbnailClass *klass) -{ - GObjectClass *object_class; - GtkCellRendererClass *cell_renderer; - - parent_class = g_type_class_peek_parent (klass); - object_class = G_OBJECT_CLASS (klass); - cell_renderer = GTK_CELL_RENDERER_CLASS (klass); - - object_class->finalize = gth_cell_renderer_thumbnail_finalize; - object_class->get_property = gth_cell_renderer_thumbnail_get_property; - object_class->set_property = gth_cell_renderer_thumbnail_set_property; - cell_renderer->get_size = gth_cell_renderer_thumbnail_get_size; - cell_renderer->render = gth_cell_renderer_thumbnail_render; - - /* properties */ - - g_object_class_install_property (object_class, - PROP_SIZE, - g_param_spec_int ("size", - "Size", - "The thumbnail size", - 0, - MAX_THUMBNAIL_SIZE, - DEFAULT_THUMBNAIL_SIZE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_IS_ICON, - g_param_spec_boolean ("is_icon", - "Is icon", - "Whether the image is a file icon", - TRUE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_THUMBNAIL, - g_param_spec_object ("thumbnail", - "Thumbnail", - "The image thumbnail", - GDK_TYPE_PIXBUF, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_FILE, - g_param_spec_object ("file", - "File", - "The file data", - GTH_TYPE_FILE_DATA, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_CHECKED, - g_param_spec_boolean ("checked", - "Checked", - "Whether the image has been checked by the user", - TRUE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_SELECTED, - g_param_spec_boolean ("selected", - "Selected", - "Whether the image has been selected by the user", - FALSE, - G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_FIXED_SIZE, - g_param_spec_boolean ("fixed-size", - "Fixed size", - "Whether to always use the maximum size for width and height", - FALSE, - G_PARAM_READWRITE)); -} - - -static void -gth_cell_renderer_thumbnail_init (GthCellRendererThumbnail *self) -{ - self->priv = g_new0 (GthCellRendererThumbnailPrivate, 1); - self->priv->size = DEFAULT_THUMBNAIL_SIZE; - self->priv->checked = TRUE; - self->priv->file = NULL; - self->priv->thumbnail = NULL; -} - - -GType -gth_cell_renderer_thumbnail_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - GTypeInfo type_info = { - sizeof (GthCellRendererThumbnailClass), - NULL, - NULL, - (GClassInitFunc) gth_cell_renderer_thumbnail_class_init, - NULL, - NULL, - sizeof (GthCellRendererThumbnail), - 0, - (GInstanceInitFunc) gth_cell_renderer_thumbnail_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_CELL_RENDERER, - "GthCellRendererThumbnail", - &type_info, - 0); - } - return type; -} - - -GtkCellRenderer * -gth_cell_renderer_thumbnail_new (void) -{ - return g_object_new (GTH_TYPE_CELL_RENDERER_THUMBNAIL, NULL); -} diff -Nru gthumb-2.14.3/gthumb/gth-cell-renderer-thumbnail.h gthumb-3.0.0/gthumb/gth-cell-renderer-thumbnail.h --- gthumb-2.14.3/gthumb/gth-cell-renderer-thumbnail.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-cell-renderer-thumbnail.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2008 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_CELL_RENDERER_THUMBNAIL_H -#define GTH_CELL_RENDERER_THUMBNAIL_H - -#include - -G_BEGIN_DECLS - -#define GTH_TYPE_CELL_RENDERER_THUMBNAIL (gth_cell_renderer_thumbnail_get_type ()) -#define GTH_CELL_RENDERER_THUMBNAIL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_CELL_RENDERER_THUMBNAIL, GthCellRendererThumbnail)) -#define GTH_CELL_RENDERER_THUMBNAIL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_CELL_RENDERER_THUMBNAIL, GthCellRendererThumbnailClass)) -#define GTH_IS_CELL_RENDERER_THUMBNAIL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_CELL_RENDERER_THUMBNAIL)) -#define GTH_IS_CELL_RENDERER_THUMBNAIL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_CELL_RENDERER_THUMBNAIL)) -#define GTH_CELL_RENDERER_THUMBNAIL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_CELL_RENDERER_THUMBNAIL, GthCellRendererThumbnailClass)) - -typedef struct _GthCellRendererThumbnail GthCellRendererThumbnail; -typedef struct _GthCellRendererThumbnailClass GthCellRendererThumbnailClass; -typedef struct _GthCellRendererThumbnailPrivate GthCellRendererThumbnailPrivate; - -struct _GthCellRendererThumbnail { - GtkCellRenderer parent_instance; - GthCellRendererThumbnailPrivate * priv; -}; - -struct _GthCellRendererThumbnailClass { - GtkCellRendererClass parent_class; -}; - -GType gth_cell_renderer_thumbnail_get_type (void); -GtkCellRenderer * gth_cell_renderer_thumbnail_new (void); - -G_END_DECLS - -#endif /* GTH_CELL_RENDERER_THUMBNAIL_H */ diff -Nru gthumb-2.14.3/gthumb/gth-dumb-notebook.c gthumb-3.0.0/gthumb/gth-dumb-notebook.c --- gthumb-2.14.3/gthumb/gth-dumb-notebook.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-dumb-notebook.c 2012-04-12 22:14:52.000000000 +0000 @@ -32,7 +32,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthDumbNotebook, gth_dumb_notebook, GTK_TYPE_CONTAINER) static void @@ -45,36 +45,130 @@ dumb_notebook->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_dumb_notebook_parent_class)->finalize (object); +} + + +static GtkSizeRequestMode +gth_dumb_notebook_get_request_mode (GtkWidget *widget) +{ + return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH; } static void -gth_dumb_notebook_size_request (GtkWidget *widget, - GtkRequisition *requisition) +gth_dumb_notebook_get_preferred_height (GtkWidget *widget, + int *minimum_height, + int *natural_height) { GthDumbNotebook *dumb_notebook = GTH_DUMB_NOTEBOOK (widget); - GList *scan; - GtkRequisition child_requisition; int border_width; - - requisition->width = 0; - requisition->height = 0; - - for (scan = dumb_notebook->priv->children; scan; scan = scan->next) { - GtkWidget *child = scan->data; + + *minimum_height = 0; + *natural_height = 0; + + if (dumb_notebook->priv->current != NULL) { + int child_minimum_height; + int child_natural_height; - if (! gtk_widget_get_visible (child)) - continue; - - gtk_widget_size_request (child, &child_requisition); - requisition->width = MAX (requisition->width, child_requisition.width); - requisition->height = MAX (requisition->height, child_requisition.height); + gtk_widget_get_preferred_height (dumb_notebook->priv->current, + &child_minimum_height, + &child_natural_height); + *minimum_height = MAX (*minimum_height, child_minimum_height); + *natural_height = MAX (*natural_height, child_natural_height); } border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - requisition->width += border_width * 2; - requisition->height += border_width * 2; + *minimum_height += border_width * 2; + *natural_height += border_width * 2; +} + + +static void +gth_dumb_notebook_get_preferred_width_for_height (GtkWidget *widget, + int height, + int *minimum_width, + int *natural_width) +{ + GthDumbNotebook *dumb_notebook = GTH_DUMB_NOTEBOOK (widget); + int border_width; + + *minimum_width = 0; + *natural_width = 0; + + if (dumb_notebook->priv->current != NULL) { + int child_minimum_width; + int child_natural_width; + + gtk_widget_get_preferred_width_for_height (dumb_notebook->priv->current, + height, + &child_minimum_width, + &child_natural_width); + *minimum_width = MAX (*minimum_width, child_minimum_width); + *natural_width = MAX (*natural_width, child_natural_width); + } + + border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); + *minimum_width += border_width * 2; + *natural_width += border_width * 2; +} + + +static void +gth_dumb_notebook_get_preferred_width (GtkWidget *widget, + int *minimum_width, + int *natural_width) +{ + GthDumbNotebook *dumb_notebook = GTH_DUMB_NOTEBOOK (widget); + int border_width; + + *minimum_width = 0; + *natural_width = 0; + + if (dumb_notebook->priv->current != NULL) { + int child_minimum_width; + int child_natural_width; + + gtk_widget_get_preferred_width (dumb_notebook->priv->current, + &child_minimum_width, + &child_natural_width); + *minimum_width = MAX (*minimum_width, child_minimum_width); + *natural_width = MAX (*natural_width, child_natural_width); + } + + border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); + *minimum_width += border_width * 2; + *natural_width += border_width * 2; +} + + +static void +gth_dumb_notebook_get_preferred_height_for_width (GtkWidget *widget, + int width, + int *minimum_height, + int *natural_height) +{ + GthDumbNotebook *dumb_notebook = GTH_DUMB_NOTEBOOK (widget); + int border_width; + + *minimum_height = 0; + *natural_height = 0; + + if (dumb_notebook->priv->current != NULL) { + int child_minimum_height; + int child_natural_height; + + gtk_widget_get_preferred_height_for_width (dumb_notebook->priv->current, + width, + &child_minimum_height, + &child_natural_height); + *minimum_height = MAX (*minimum_height, child_minimum_height); + *natural_height = MAX (*natural_height, child_natural_height); + } + + border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); + *minimum_height += border_width * 2; + *natural_height += border_width * 2; } @@ -83,43 +177,66 @@ GtkAllocation *allocation) { GthDumbNotebook *dumb_notebook = GTH_DUMB_NOTEBOOK (widget); - int border_width; - GtkAllocation child_allocation; - GList *scan; - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - child_allocation.x = allocation->x + border_width; - child_allocation.y = allocation->y + border_width; - child_allocation.width = MAX (1, allocation->width - border_width * 2); - child_allocation.height = MAX (1, allocation->height - border_width * 2); + if (dumb_notebook->priv->current != NULL) { + int border_width; + GtkAllocation child_allocation; + + border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); + child_allocation.x = allocation->x + border_width; + child_allocation.y = allocation->y + border_width; + child_allocation.width = MAX (1, allocation->width - border_width * 2); + child_allocation.height = MAX (1, allocation->height - border_width * 2); - for (scan = dumb_notebook->priv->children; scan; scan = scan->next) { - GtkWidget *child = scan->data; - - if (gtk_widget_get_visible (child)) - gtk_widget_size_allocate (child, &child_allocation); + gtk_widget_size_allocate (dumb_notebook->priv->current, &child_allocation); } gtk_widget_set_allocation (widget, allocation); } -static int -gth_dumb_notebook_expose (GtkWidget *widget, - GdkEventExpose *event) +static gboolean +gth_dumb_notebook_draw (GtkWidget *widget, + cairo_t *cr) { GthDumbNotebook *dumb_notebook = GTH_DUMB_NOTEBOOK (widget); - if (dumb_notebook->priv->current != NULL) - gtk_container_propagate_expose (GTK_CONTAINER (dumb_notebook), - dumb_notebook->priv->current, - event); - + if ((dumb_notebook->priv->current != NULL) && gtk_widget_get_child_visible (dumb_notebook->priv->current)) + gtk_container_propagate_draw (GTK_CONTAINER (widget), + dumb_notebook->priv->current, + cr); + return FALSE; } static void +_gth_dumb_notebook_grab_focus_child (GthDumbNotebook *notebook) +{ + GtkWidget *child; + + child = notebook->priv->current; + if (child == NULL) + return; + + if (GTK_IS_SCROLLED_WINDOW (notebook->priv->current)) { + GList *list = gtk_container_get_children (GTK_CONTAINER (notebook->priv->current)); + if (list != NULL) + child = list->data; + } + + gtk_widget_grab_focus (child); +} + + +static void +gth_dumb_notebook_grab_focus (GtkWidget *widget) +{ + _gth_dumb_notebook_grab_focus_child (GTH_DUMB_NOTEBOOK (widget)); +} + + +static void gth_dumb_notebook_add (GtkContainer *container, GtkWidget *child) { @@ -130,23 +247,37 @@ gtk_widget_freeze_child_notify (child); notebook->priv->children = g_list_append (notebook->priv->children, child); - gtk_widget_set_parent (child, GTK_WIDGET (notebook)); - notebook->priv->n_children++; - if (notebook->priv->current_pos == notebook->priv->n_children - 1) + if (notebook->priv->current_pos == notebook->priv->n_children - 1) { gtk_widget_set_child_visible (child, TRUE); + notebook->priv->current = child; + } else gtk_widget_set_child_visible (child, FALSE); - + gtk_widget_set_parent (child, GTK_WIDGET (notebook)); + gtk_widget_thaw_child_notify (child); } static void gth_dumb_notebook_remove (GtkContainer *container, - GtkWidget *widget) + GtkWidget *child) { - /* FIXME */ + GthDumbNotebook *notebook; + GList *link; + + notebook = GTH_DUMB_NOTEBOOK (container); + + link = g_list_find (notebook->priv->children, child); + if (link == NULL) + return; + + gtk_widget_unparent (child); + + notebook->priv->children = g_list_remove_link (notebook->priv->children, link); + notebook->priv->n_children--; + g_list_free (link); } @@ -161,8 +292,12 @@ notebook = GTH_DUMB_NOTEBOOK (container); - for (scan = notebook->priv->children; scan; scan = scan->next) - (* callback) (scan->data, callback_data); + for (scan = notebook->priv->children; scan; /* void */) { + GtkWidget *child = scan->data; + + scan = scan->next; + (* callback) (child, callback_data); + } } @@ -180,15 +315,18 @@ GtkWidgetClass *widget_class; GtkContainerClass *container_class; - parent_class = g_type_class_peek_parent (klass); - gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = gth_dumb_notebook_finalize; widget_class = GTK_WIDGET_CLASS (klass); - widget_class->size_request = gth_dumb_notebook_size_request; + widget_class->get_request_mode = gth_dumb_notebook_get_request_mode; + widget_class->get_preferred_height = gth_dumb_notebook_get_preferred_height; + widget_class->get_preferred_width_for_height = gth_dumb_notebook_get_preferred_width_for_height; + widget_class->get_preferred_width = gth_dumb_notebook_get_preferred_width; + widget_class->get_preferred_height_for_width = gth_dumb_notebook_get_preferred_height_for_width; widget_class->size_allocate = gth_dumb_notebook_size_allocate; - widget_class->expose_event = gth_dumb_notebook_expose; + widget_class->draw = gth_dumb_notebook_draw; + widget_class->grab_focus = gth_dumb_notebook_grab_focus; container_class = GTK_CONTAINER_CLASS (klass); container_class->add = gth_dumb_notebook_add; @@ -202,37 +340,11 @@ gth_dumb_notebook_init (GthDumbNotebook *notebook) { gtk_widget_set_has_window (GTK_WIDGET (notebook), FALSE); + gtk_widget_set_can_focus (GTK_WIDGET (notebook), TRUE); notebook->priv = g_new0 (GthDumbNotebookPrivate, 1); notebook->priv->n_children = 0; -} - - -GType -gth_dumb_notebook_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthDumbNotebookClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_dumb_notebook_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthDumbNotebook), - 0, - (GInstanceInitFunc) gth_dumb_notebook_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_CONTAINER, - "GthDumbNotebook", - &g_define_type_info, - 0); - } - - return type; + notebook->priv->current_pos = 0; } @@ -247,23 +359,23 @@ gth_dumb_notebook_show_child (GthDumbNotebook *notebook, int pos) { - GList *link; - - if (notebook->priv->current_pos == pos) - return; - - if (notebook->priv->current) - gtk_widget_set_child_visible (notebook->priv->current, FALSE); - - notebook->priv->current = NULL; - notebook->priv->current_pos = pos; + GList *link; + gboolean current_is_focus; link = g_list_nth (notebook->priv->children, pos); if (link == NULL) return; - + + current_is_focus = (notebook->priv->current != NULL) && gtk_widget_has_focus (notebook->priv->current); + + if (notebook->priv->current != link->data) + gtk_widget_set_child_visible (notebook->priv->current, FALSE); + + notebook->priv->current_pos = pos; notebook->priv->current = link->data; gtk_widget_set_child_visible (notebook->priv->current, TRUE); - + if (current_is_focus) + _gth_dumb_notebook_grab_focus_child (notebook); + gtk_widget_queue_resize (GTK_WIDGET (notebook)); } diff -Nru gthumb-2.14.3/gthumb/gth-duplicable.c gthumb-3.0.0/gthumb/gth-duplicable.c --- gthumb-2.14.3/gthumb/gth-duplicable.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-duplicable.c 2012-02-19 15:01:32.000000000 +0000 @@ -23,34 +23,18 @@ #include "gth-duplicable.h" -GObject * -gth_duplicable_duplicate (GthDuplicable *self) +G_DEFINE_INTERFACE (GthDuplicable, gth_duplicable, 0) + + +static void +gth_duplicable_default_init (GthDuplicableInterface *iface) { - return GTH_DUPLICABLE_GET_INTERFACE (self)->duplicate (self); + /* void */ } -GType -gth_duplicable_get_type (void) +GObject * +gth_duplicable_duplicate (GthDuplicable *self) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthDuplicableIface), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) NULL, - (GClassFinalizeFunc) NULL, - NULL, - 0, - 0, - (GInstanceInitFunc) NULL, - NULL - }; - type_id = g_type_register_static (G_TYPE_INTERFACE, - "GthDuplicable", - &g_define_type_info, - 0); - } - return type_id; + return GTH_DUPLICABLE_GET_INTERFACE (self)->duplicate (self); } diff -Nru gthumb-2.14.3/gthumb/gth-duplicable.h gthumb-3.0.0/gthumb/gth-duplicable.h --- gthumb-2.14.3/gthumb/gth-duplicable.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-duplicable.h 2012-02-19 15:01:32.000000000 +0000 @@ -30,12 +30,12 @@ #define GTH_TYPE_DUPLICABLE (gth_duplicable_get_type ()) #define GTH_DUPLICABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_DUPLICABLE, GthDuplicable)) #define GTH_IS_DUPLICABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_DUPLICABLE)) -#define GTH_DUPLICABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_DUPLICABLE, GthDuplicableIface)) +#define GTH_DUPLICABLE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_DUPLICABLE, GthDuplicableInterface)) typedef struct _GthDuplicable GthDuplicable; -typedef struct _GthDuplicableIface GthDuplicableIface; +typedef struct _GthDuplicableInterface GthDuplicableInterface; -struct _GthDuplicableIface { +struct _GthDuplicableInterface { GTypeInterface parent_iface; GObject * (*duplicate) (GthDuplicable *self); diff -Nru gthumb-2.14.3/gthumb/gth-embedded-dialog.c gthumb-3.0.0/gthumb/gth-embedded-dialog.c --- gthumb-2.14.3/gthumb/gth-embedded-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-embedded-dialog.c 2012-03-04 15:22:15.000000000 +0000 @@ -22,117 +22,82 @@ #include #include #include "gth-embedded-dialog.h" - - -static gpointer parent_class = NULL; +#include "gth-location-chooser.h" struct _GthEmbeddedDialogPrivate { GtkWidget *icon_image; GtkWidget *primary_text_label; GtkWidget *secondary_text_label; + GtkWidget *info_box; + GtkWidget *location_chooser; }; -static void -gth_embedded_dialog_finalize (GObject *object) -{ - GthEmbeddedDialog *dialog; - - dialog = GTH_EMBEDDED_DIALOG (object); - - if (dialog->priv != NULL) - dialog->priv = NULL; - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - -static void -gth_embedded_dialog_class_init (GthEmbeddedDialogClass *class) -{ - GObjectClass *object_class; - - parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass*) class; - - object_class->finalize = gth_embedded_dialog_finalize; -} +G_DEFINE_TYPE (GthEmbeddedDialog, gth_embedded_dialog, GEDIT_TYPE_MESSAGE_AREA) static void -gth_embedded_dialog_init (GthEmbeddedDialog *dialog) -{ - dialog->priv = g_new0 (GthEmbeddedDialogPrivate, 1); -} - - -GType -gth_embedded_dialog_get_type (void) +gth_embedded_dialog_class_init (GthEmbeddedDialogClass *klass) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthEmbeddedDialogClass), - NULL, - NULL, - (GClassInitFunc) gth_embedded_dialog_class_init, - NULL, - NULL, - sizeof (GthEmbeddedDialog), - 0, - (GInstanceInitFunc) gth_embedded_dialog_init - }; - - type = g_type_register_static (GEDIT_TYPE_MESSAGE_AREA, - "GthEmbeddedDialog", - &type_info, - 0); - } - - return type; + g_type_class_add_private (klass, sizeof (GthEmbeddedDialogPrivate)); } static void -gth_embedded_dialog_construct (GthEmbeddedDialog *self) +gth_embedded_dialog_init (GthEmbeddedDialog *self) { GtkWidget *hbox_content; GtkWidget *image; - GtkWidget *vbox; + GtkWidget *to_center_labels_box; + GtkWidget *label_box; GtkWidget *primary_label; GtkWidget *secondary_label; - hbox_content = gtk_hbox_new (FALSE, 8); + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_EMBEDDED_DIALOG, GthEmbeddedDialogPrivate); + + hbox_content = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (hbox_content); + self->priv->info_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + gtk_box_pack_start (GTK_BOX (hbox_content), self->priv->info_box, TRUE, TRUE, 0); + self->priv->icon_image = image = gtk_image_new (); - gtk_box_pack_start (GTK_BOX (hbox_content), image, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (self->priv->info_box), image, FALSE, FALSE, 0); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.5); - vbox = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox); - gtk_box_pack_start (GTK_BOX (hbox_content), vbox, TRUE, TRUE, 0); + to_center_labels_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_widget_show (to_center_labels_box); + gtk_box_pack_start (GTK_BOX (self->priv->info_box), to_center_labels_box, TRUE, TRUE, 0); + + label_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); + gtk_widget_show (label_box); + gtk_box_pack_start (GTK_BOX (to_center_labels_box), label_box, TRUE, FALSE, 0); self->priv->primary_text_label = primary_label = gtk_label_new (NULL); - gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (label_box), primary_label, FALSE, FALSE, 0); gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE); - gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE); + gtk_label_set_line_wrap (GTK_LABEL (primary_label), FALSE); gtk_label_set_ellipsize (GTK_LABEL (primary_label), PANGO_ELLIPSIZE_MIDDLE); gtk_misc_set_alignment (GTK_MISC (primary_label), 0, 0.5); - gtk_misc_set_padding (GTK_MISC (primary_label), 0, 6); gtk_widget_set_can_focus (primary_label, TRUE); gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE); self->priv->secondary_text_label = secondary_label = gtk_label_new (NULL); - gtk_box_pack_start (GTK_BOX (vbox), secondary_label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (label_box), secondary_label, FALSE, FALSE, 0); gtk_widget_set_can_focus (secondary_label, TRUE); gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE); - gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE); + gtk_label_set_line_wrap (GTK_LABEL (secondary_label), FALSE); gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE); gtk_label_set_ellipsize (GTK_LABEL (secondary_label), PANGO_ELLIPSIZE_END); gtk_misc_set_alignment (GTK_MISC (secondary_label), 0, 0.5); + self->priv->location_chooser = g_object_new (GTH_TYPE_LOCATION_CHOOSER, + "show-entry-points", FALSE, + "relief", GTK_RELIEF_NONE, + NULL); + gtk_box_pack_start (GTK_BOX (hbox_content), self->priv->location_chooser, FALSE, FALSE, 0); + gedit_message_area_set_contents (GEDIT_MESSAGE_AREA (self), hbox_content); } @@ -140,61 +105,59 @@ GtkWidget * gth_embedded_dialog_new (void) { - GthEmbeddedDialog *self; - - self = g_object_new (GTH_TYPE_EMBEDDED_DIALOG, NULL); - gth_embedded_dialog_construct (self); - - return (GtkWidget *) self; + return g_object_new (GTH_TYPE_EMBEDDED_DIALOG, NULL); } void -gth_embedded_dialog_set_icon (GthEmbeddedDialog *dialog, +gth_embedded_dialog_set_icon (GthEmbeddedDialog *self, const char *icon_stock_id, GtkIconSize size) { if (icon_stock_id == NULL) { - gtk_widget_hide (dialog->priv->icon_image); + gtk_widget_hide (self->priv->icon_image); return; } - gtk_image_set_from_stock (GTK_IMAGE (dialog->priv->icon_image), icon_stock_id, size); - gtk_widget_show (dialog->priv->icon_image); + gtk_image_set_from_stock (GTK_IMAGE (self->priv->icon_image), icon_stock_id, size); + gtk_widget_show (self->priv->icon_image); } void -gth_embedded_dialog_set_gicon (GthEmbeddedDialog *dialog, +gth_embedded_dialog_set_gicon (GthEmbeddedDialog *self, GIcon *icon, GtkIconSize size) { if (icon == NULL) { - gtk_widget_hide (dialog->priv->icon_image); + gtk_widget_hide (self->priv->icon_image); return; } - gtk_image_set_from_gicon (GTK_IMAGE (dialog->priv->icon_image), icon, size); - gtk_widget_show (dialog->priv->icon_image); + gtk_image_set_from_gicon (GTK_IMAGE (self->priv->icon_image), icon, size); + gtk_widget_show (self->priv->icon_image); } void -gth_embedded_dialog_set_primary_text (GthEmbeddedDialog *dialog, +gth_embedded_dialog_set_primary_text (GthEmbeddedDialog *self, const char *text) { char *escaped; char *markup; + gtk_widget_hide (self->priv->location_chooser); + gtk_widget_show (self->priv->info_box); + if (text == NULL) { - gtk_widget_hide (dialog->priv->primary_text_label); + gtk_widget_hide (self->priv->primary_text_label); return; } escaped = g_markup_escape_text (text, -1); markup = g_strdup_printf ("%s", escaped); - gtk_label_set_markup (GTK_LABEL (dialog->priv->primary_text_label), markup); - gtk_widget_show (dialog->priv->primary_text_label); + gtk_label_set_markup (GTK_LABEL (self->priv->primary_text_label), markup); + gtk_widget_show (self->priv->primary_text_label); g_free (markup); g_free (escaped); @@ -202,22 +165,39 @@ void -gth_embedded_dialog_set_secondary_text (GthEmbeddedDialog *dialog, +gth_embedded_dialog_set_secondary_text (GthEmbeddedDialog *self, const char *text) { char *escaped; char *markup; if (text == NULL) { - gtk_widget_hide (dialog->priv->secondary_text_label); + gtk_widget_hide (self->priv->secondary_text_label); return; } escaped = g_markup_escape_text (text, -1); markup = g_strdup_printf ("%s", escaped); - gtk_label_set_markup (GTK_LABEL (dialog->priv->secondary_text_label), markup); - gtk_widget_show (dialog->priv->secondary_text_label); + gtk_label_set_markup (GTK_LABEL (self->priv->secondary_text_label), markup); + gtk_widget_show (self->priv->secondary_text_label); g_free (markup); g_free (escaped); } + + +void +gth_embedded_dialog_set_from_file (GthEmbeddedDialog *self, + GFile *file) +{ + gtk_widget_hide (self->priv->info_box); + gtk_widget_show (self->priv->location_chooser); + gth_location_chooser_set_current (GTH_LOCATION_CHOOSER (self->priv->location_chooser), file); +} + + +GtkWidget * +gth_embedded_dialog_get_chooser (GthEmbeddedDialog *self) +{ + return self->priv->location_chooser; +} diff -Nru gthumb-2.14.3/gthumb/gth-embedded-dialog.h gthumb-3.0.0/gthumb/gth-embedded-dialog.h --- gthumb-2.14.3/gthumb/gth-embedded-dialog.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-embedded-dialog.h 2012-02-19 15:01:32.000000000 +0000 @@ -61,6 +61,9 @@ const char *primary_text); void gth_embedded_dialog_set_secondary_text (GthEmbeddedDialog *dialog, const char *secondary_text); +void gth_embedded_dialog_set_from_file (GthEmbeddedDialog *dialog, + GFile *file); +GtkWidget * gth_embedded_dialog_get_chooser (GthEmbeddedDialog *dialog); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/gth-empty-list.c gthumb-3.0.0/gthumb/gth-empty-list.c --- gthumb-2.14.3/gthumb/gth-empty-list.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-empty-list.c 2012-04-21 11:11:41.000000000 +0000 @@ -28,27 +28,19 @@ }; struct _GthEmptyListPrivate { - GdkWindow *bin_window; char *text; PangoLayout *layout; }; -static gpointer parent_class = NULL; + +G_DEFINE_TYPE (GthEmptyList, gth_empty_list, GTK_TYPE_SCROLLED_WINDOW) static void gth_empty_list_finalize (GObject *obj) { - GthEmptyList *self; - - self = GTH_EMPTY_LIST (obj); - - if (self->priv != NULL) { - g_free (self->priv->text); - g_free (self->priv); - } - - G_OBJECT_CLASS (parent_class)->finalize (obj); + g_free (GTH_EMPTY_LIST (obj)->priv->text); + G_OBJECT_CLASS (gth_empty_list_parent_class)->finalize (obj); } @@ -67,7 +59,9 @@ g_free (self->priv->text); self->priv->text = g_value_dup_string (value); gtk_widget_queue_resize (GTK_WIDGET (self)); + g_object_notify (object, "text"); break; + default: break; } @@ -88,6 +82,7 @@ case PROP_TEXT: g_value_set_string (value, self->priv->text); break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -98,12 +93,12 @@ static void gth_empty_list_realize (GtkWidget *widget) { - GthEmptyList *self; - GtkAllocation allocation; - GdkWindowAttr attributes; - int attributes_mask; - GdkWindow *window; - GtkStyle *style; + GthEmptyList *self; + GtkAllocation allocation; + GdkWindowAttr attributes; + int attributes_mask; + GdkWindow *window; + GtkStyleContext *style_context; g_return_if_fail (GTH_IS_EMPTY_LIST (widget)); self = (GthEmptyList*) widget; @@ -121,24 +116,6 @@ attributes.height = allocation.height; attributes.wclass = GDK_INPUT_OUTPUT; attributes.visual = gtk_widget_get_visual (widget); - attributes.colormap = gtk_widget_get_colormap (widget); - attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK; - attributes_mask = (GDK_WA_X - | GDK_WA_Y - | GDK_WA_VISUAL - | GDK_WA_COLORMAP); - window = gdk_window_new (gtk_widget_get_parent_window (widget), - &attributes, - attributes_mask); - gtk_widget_set_window (widget, window); - gdk_window_set_user_data (window, widget); - - /**/ - - attributes.x = 0; - attributes.y = 0; - attributes.width = allocation.width; - attributes.height = allocation.height; attributes.event_mask = (GDK_EXPOSURE_MASK | GDK_SCROLL_MASK | GDK_POINTER_MOTION_MASK @@ -147,19 +124,19 @@ | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | gtk_widget_get_events (widget)); - - self->priv->bin_window = gdk_window_new (window, - &attributes, - attributes_mask); - gdk_window_set_user_data (self->priv->bin_window, widget); + attributes_mask = (GDK_WA_X + | GDK_WA_Y + | GDK_WA_VISUAL); + window = gdk_window_new (gtk_widget_get_parent_window (widget), + &attributes, + attributes_mask); + gtk_widget_set_window (widget, window); + gdk_window_set_user_data (window, widget); /* Style */ - style = gtk_widget_get_style (widget); - style = gtk_style_attach (style, window); - gtk_widget_set_style (widget, style); - gdk_window_set_background (window, &style->base[gtk_widget_get_state (widget)]); - gdk_window_set_background (self->priv->bin_window, &style->base[gtk_widget_get_state (widget)]); + style_context = gtk_widget_get_style_context (widget); + gtk_style_context_set_background (style_context, window); /* 'No Image' message Layout */ @@ -168,7 +145,6 @@ self->priv->layout = gtk_widget_create_pango_layout (widget, NULL); pango_layout_set_wrap (self->priv->layout, PANGO_WRAP_WORD_CHAR); - pango_layout_set_font_description (self->priv->layout, style->font_desc); pango_layout_set_alignment (self->priv->layout, PANGO_ALIGN_CENTER); } @@ -182,16 +158,14 @@ self = (GthEmptyList*) widget; - gdk_window_set_user_data (self->priv->bin_window, NULL); - gdk_window_destroy (self->priv->bin_window); - self->priv->bin_window = NULL; - if (self->priv->layout != NULL) { g_object_unref (self->priv->layout); self->priv->layout = NULL; } - (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget); + /* note the use of g_type_class_peek_parent to skip GtkScrolledWindow::unrealize */ + + GTK_WIDGET_CLASS (g_type_class_peek_parent (gth_empty_list_parent_class))->unrealize (widget); } @@ -199,7 +173,6 @@ gth_empty_list_map (GtkWidget *widget) { gtk_widget_set_mapped (widget, TRUE); - gdk_window_show (GTH_EMPTY_LIST (widget)->priv->bin_window); gdk_window_show (gtk_widget_get_window (widget)); } @@ -208,7 +181,6 @@ gth_empty_list_unmap (GtkWidget *widget) { gtk_widget_set_mapped (widget, FALSE); - gdk_window_hide (GTH_EMPTY_LIST (widget)->priv->bin_window); gdk_window_hide (gtk_widget_get_window (widget)); } @@ -217,78 +189,64 @@ gth_empty_list_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { - GthEmptyList *self = (GthEmptyList*) widget; - gtk_widget_set_allocation (widget, allocation); - if (gtk_widget_get_realized (widget)) { + if (gtk_widget_get_realized (widget)) gdk_window_move_resize (gtk_widget_get_window (widget), allocation->x, allocation->y, allocation->width, allocation->height); - gdk_window_invalidate_rect (self->priv->bin_window, NULL, FALSE); - } } static gboolean -gth_empty_list_expose_event (GtkWidget *widget, - GdkEventExpose *event) +gth_empty_list_draw (GtkWidget *widget, + cairo_t *cr) { - GthEmptyList *self = (GthEmptyList*) widget; - GtkAllocation allocation; - PangoRectangle bounds; - GtkStyle *style; - cairo_t *cr; - - if (event->window != self->priv->bin_window) + GthEmptyList *self = (GthEmptyList*) widget; + GtkStyleContext *style_context; + GtkAllocation allocation; + + if (! gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget))) return FALSE; - if (self->priv->text == NULL) - return TRUE; + style_context = gtk_widget_get_style_context (widget); gtk_widget_get_allocation (widget, &allocation); - pango_layout_set_width (self->priv->layout, allocation.width * PANGO_SCALE); - pango_layout_set_text (self->priv->layout, self->priv->text, strlen (self->priv->text)); - pango_layout_get_pixel_extents (self->priv->layout, NULL, &bounds); - - cr = gdk_cairo_create (self->priv->bin_window); - cairo_move_to (cr, 0, (allocation.height - bounds.height) / 2); - pango_cairo_layout_path (cr, self->priv->layout); - style = gtk_widget_get_style (widget); - gdk_cairo_set_source_color (cr, &style->text[gtk_widget_get_state (widget)]); - cairo_fill (cr); - - if (gtk_widget_has_focus (widget)) { - gtk_paint_focus (style, - self->priv->bin_window, - gtk_widget_get_state (widget), - &event->area, - widget, - NULL, - 1, 1, - allocation.width - 2, - allocation.height - 2); - } - cairo_destroy (cr); + gtk_render_frame (style_context, cr, + 0, + 0, + allocation.width, + allocation.height); + + if (self->priv->text != NULL) { + PangoRectangle bounds; + GdkRGBA color; + + pango_layout_set_width (self->priv->layout, allocation.width * PANGO_SCALE); + pango_layout_set_text (self->priv->layout, self->priv->text, strlen (self->priv->text)); + pango_layout_get_pixel_extents (self->priv->layout, NULL, &bounds); + pango_layout_set_font_description (self->priv->layout, gtk_style_context_get_font (style_context, gtk_widget_get_state (widget))); + gtk_style_context_get_color (style_context, gtk_widget_get_state (widget), &color); + gdk_cairo_set_source_rgba (cr, &color); + cairo_move_to (cr, 0, (allocation.height - bounds.height) / 2); + pango_cairo_layout_path (cr, self->priv->layout); + cairo_fill (cr); + } return FALSE; } -static int +static gboolean gth_empty_list_button_press (GtkWidget *widget, GdkEventButton *event) { - GthEmptyList *self = (GthEmptyList*) widget; - - if (event->window == self->priv->bin_window) - if (! gtk_widget_has_focus (widget)) - gtk_widget_grab_focus (widget); - - return FALSE; + if (! gtk_widget_has_focus (widget)) + gtk_widget_grab_focus (widget); + return TRUE; } @@ -298,22 +256,22 @@ GObjectClass *object_class; GtkWidgetClass *widget_class; - parent_class = g_type_class_peek_parent (klass); + g_type_class_add_private (klass, sizeof (GthEmptyListPrivate)); + object_class = (GObjectClass*) (klass); - widget_class = (GtkWidgetClass*) klass; - object_class->set_property = gth_empty_list_set_property; object_class->get_property = gth_empty_list_get_property; object_class->finalize = gth_empty_list_finalize; + widget_class = (GtkWidgetClass*) klass; widget_class->realize = gth_empty_list_realize; widget_class->unrealize = gth_empty_list_unrealize; widget_class->map = gth_empty_list_map; widget_class->unmap = gth_empty_list_unmap; widget_class->size_allocate = gth_empty_list_size_allocate; - widget_class->expose_event = gth_empty_list_expose_event; + widget_class->draw = gth_empty_list_draw; widget_class->button_press_event = gth_empty_list_button_press; - + /* properties */ g_object_class_install_property (object_class, @@ -322,43 +280,25 @@ "Text", "The text to display", NULL, - G_PARAM_READWRITE)); + G_PARAM_READABLE | G_PARAM_WRITABLE)); } static void -gth_empty_list_instance_init (GthEmptyList *self) +gth_empty_list_init (GthEmptyList *self) { - gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE); - self->priv = g_new0 (GthEmptyListPrivate, 1); -} + GtkStyleContext *style_context; + gtk_widget_set_has_window (GTK_WIDGET (self), TRUE); + gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE); -GType -gth_empty_list_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthEmptyListClass), - NULL, - NULL, - (GClassInitFunc) gth_empty_list_class_init, - NULL, - NULL, - sizeof (GthEmptyList), - 0, - (GInstanceInitFunc) gth_empty_list_instance_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_VBOX, - "GthEmptyList", - &g_define_type_info, - 0); - } - - return type; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_EMPTY_LIST, GthEmptyListPrivate); + self->priv->layout = NULL; + self->priv->text = NULL; + + style_context = gtk_widget_get_style_context (GTK_WIDGET (self)); + gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_VIEW); + gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_FRAME); } diff -Nru gthumb-2.14.3/gthumb/gth-empty-list.h gthumb-3.0.0/gthumb/gth-empty-list.h --- gthumb-2.14.3/gthumb/gth-empty-list.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-empty-list.h 2012-02-19 15:01:32.000000000 +0000 @@ -42,12 +42,12 @@ typedef struct _GthEmptyListPrivate GthEmptyListPrivate; struct _GthEmptyList { - GtkVBox parent_instance; + GtkScrolledWindow parent_instance; GthEmptyListPrivate * priv; }; struct _GthEmptyListClass { - GtkVBoxClass parent_class; + GtkScrolledWindowClass parent_class; }; GType gth_empty_list_get_type (void); diff -Nru gthumb-2.14.3/gthumb/gth-extensions.c gthumb-3.0.0/gthumb/gth-extensions.c --- gthumb-2.14.3/gthumb/gth-extensions.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-extensions.c 2012-04-21 09:32:17.000000000 +0000 @@ -32,7 +32,7 @@ /* -- gth_extension -- */ -static gpointer gth_extension_parent_class = NULL; +G_DEFINE_TYPE (GthExtension, gth_extension, G_TYPE_OBJECT) static gboolean @@ -89,8 +89,6 @@ static void gth_extension_class_init (GthExtensionClass *klass) { - gth_extension_parent_class = g_type_class_peek_parent (klass); - klass->open = gth_extension_base_open; klass->close = gth_extension_base_close; klass->activate = gth_extension_base_activate; @@ -101,36 +99,13 @@ static void -gth_extension_instance_init (GthExtension *self) +gth_extension_init (GthExtension *self) { self->initialized = FALSE; self->active = FALSE; } -GType -gth_extension_get_type (void) -{ - static GType gth_extension_type_id = 0; - if (gth_extension_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthExtensionClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_extension_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthExtension), - 0, - (GInstanceInitFunc) gth_extension_instance_init, - NULL - }; - gth_extension_type_id = g_type_register_static (G_TYPE_OBJECT, "GthExtension", &g_define_type_info, 0); - } - return gth_extension_type_id; -} - - gboolean gth_extension_open (GthExtension *self, GError **error) @@ -194,7 +169,7 @@ }; -static gpointer gth_extension_module_parent_class = NULL; +G_DEFINE_TYPE (GthExtensionModule, gth_extension_module, GTH_TYPE_EXTENSION) static gboolean @@ -379,7 +354,6 @@ { GthExtensionClass *elc; - gth_extension_module_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthExtensionModulePrivate)); G_OBJECT_CLASS (klass)->finalize = gth_extension_module_finalize; @@ -395,35 +369,12 @@ static void -gth_extension_module_instance_init (GthExtensionModule *self) +gth_extension_module_init (GthExtensionModule *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_EXTENSION_MODULE, GthExtensionModulePrivate); } -GType -gth_extension_module_get_type (void) -{ - static GType gth_extension_module_type_id = 0; - if (gth_extension_module_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthExtensionModuleClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_extension_module_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthExtensionModule), - 0, - (GInstanceInitFunc) gth_extension_module_instance_init, - NULL - }; - gth_extension_module_type_id = g_type_register_static (GTH_TYPE_EXTENSION, "GthExtensionModule", &g_define_type_info, 0); - } - return gth_extension_module_type_id; -} - - GthExtension * gth_extension_module_new (const char *module_name) { @@ -445,7 +396,7 @@ }; -static gpointer gth_extension_description_parent_class = NULL; +G_DEFINE_TYPE (GthExtensionDescription, gth_extension_description, G_TYPE_OBJECT) static void @@ -477,15 +428,13 @@ static void gth_extension_description_class_init (GthExtensionDescriptionClass *klass) { - gth_extension_description_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthExtensionDescriptionPrivate)); - G_OBJECT_CLASS (klass)->finalize = gth_extension_description_finalize; } static void -gth_extension_description_instance_init (GthExtensionDescription *self) +gth_extension_description_init (GthExtensionDescription *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_EXTENSION_DESCRIPTION, GthExtensionDescriptionPrivate); self->priv->opened = FALSE; @@ -493,35 +442,13 @@ } -GType -gth_extension_description_get_type (void) -{ - static GType gth_extension_description_type_id = 0; - if (gth_extension_description_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthExtensionDescriptionClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_extension_description_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthExtensionDescription), - 0, - (GInstanceInitFunc) gth_extension_description_instance_init, - NULL - }; - gth_extension_description_type_id = g_type_register_static (G_TYPE_OBJECT, "GthExtensionDescription", &g_define_type_info, 0); - } - return gth_extension_description_type_id; -} - - static gboolean gth_extension_description_load_from_file (GthExtensionDescription *desc, GFile *file) { GKeyFile *key_file; char *file_path; + char *api; char *basename; key_file = g_key_file_new (); @@ -532,6 +459,14 @@ return FALSE; } + api = g_key_file_get_string (key_file, "Loader", "API", NULL); + if (g_strcmp0 (api, GTHUMB_API_VERSION) != 0) { + g_free (api); + g_free (file_path); + g_key_file_free (key_file); + return FALSE; + } + basename = g_file_get_basename (file); desc->id = _g_uri_remove_extension (basename); desc->name = g_key_file_get_locale_string (key_file, "Extension", "Name", NULL, NULL); @@ -550,6 +485,7 @@ desc->loader_after = g_key_file_get_string_list (key_file, "Loader", "After", NULL, NULL); g_free (basename); + g_free (api); g_free (file_path); g_key_file_free (key_file); @@ -589,14 +525,14 @@ /* -- gth_extension_manager -- */ -static gpointer gth_extension_manager_parent_class = NULL; - - struct _GthExtensionManagerPrivate { GHashTable *extensions; }; +G_DEFINE_TYPE (GthExtensionManager, gth_extension_manager, G_TYPE_OBJECT) + + static void gth_extension_manager_finalize (GObject *obj) { @@ -614,43 +550,19 @@ static void gth_extension_manager_class_init (GthExtensionManagerClass *klass) { - gth_extension_manager_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthExtensionManagerPrivate)); - G_OBJECT_CLASS (klass)->finalize = gth_extension_manager_finalize; } static void -gth_extension_manager_instance_init (GthExtensionManager *self) +gth_extension_manager_init (GthExtensionManager *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_EXTENSION_MANAGER, GthExtensionManagerPrivate); self->priv->extensions = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); } -GType -gth_extension_manager_get_type (void) { - static GType gth_extension_manager_type_id = 0; - if (gth_extension_manager_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthExtensionManagerClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_extension_manager_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthExtensionManager), - 0, - (GInstanceInitFunc) gth_extension_manager_instance_init, - NULL - }; - gth_extension_manager_type_id = g_type_register_static (G_TYPE_OBJECT, "GthExtensionManager", &g_define_type_info, 0); - } - return gth_extension_manager_type_id; -} - - static void gth_extension_manager_load_extensions (GthExtensionManager *self) { @@ -673,6 +585,11 @@ extensions_dir = g_file_new_for_path (GTHUMB_EXTENSIONS_DIR); enumerator = g_file_enumerate_children (extensions_dir, G_FILE_ATTRIBUTE_STANDARD_NAME, 0, NULL, NULL); + if (enumerator == NULL) { + g_critical ("Could not find the extensions folder: %s", g_file_get_uri (extensions_dir)); + abort (); + } + while ((info = g_file_enumerator_next_file (enumerator, NULL, NULL)) != NULL) { const char *name; GFile *ext_file; @@ -735,7 +652,10 @@ GthExtensionDescription *description; description = g_hash_table_lookup (manager->priv->extensions, extension_name); - g_return_val_if_fail (description != NULL, FALSE); + if (description == NULL) { + *error = g_error_new_literal (GTH_ERROR, GTH_ERROR_EXTENSION_DEPENDENCY, "Extension not found"); + return FALSE; + } if (description->priv->opened) return TRUE; @@ -899,50 +819,57 @@ } -GSList * -gth_extension_manager_order_extensions (GthExtensionManager *manager, - GSList *extensions) +GList * +gth_extension_manager_order_extensions (GthExtensionManager *manager, + char **extensions) { - GSList *scan; - GSList *ordered = NULL; + GList *extension_list; + int i; + GList *ordered_by_dependency; + GList *scan; - for (scan = extensions; scan; /* void */) { - char *ext_name = scan->data; + extension_list = NULL; + for (i = 0; extensions[i] != NULL; i++) + if (g_hash_table_lookup (manager->priv->extensions, extensions[i]) != NULL) + extension_list = g_list_prepend (extension_list, g_strdup (extensions[i])); + extension_list = g_list_reverse (extension_list); + + ordered_by_dependency = NULL; + for (scan = extension_list; scan; /* void */) { + GList *next; + char *ext_name; GthExtensionDescription *ext_description; - GSList *next = scan->next; GList *dependencies; - GSList *slink; - GList *scan_d; + GList *scan_dep; + next = extension_list->next; + ext_name = extension_list->data; ext_description = g_hash_table_lookup (manager->priv->extensions, ext_name); - if (ext_description == NULL) { - g_free (scan->data); - extensions = g_slist_delete_link (extensions, scan); - scan = next; - continue; - } + g_assert (ext_description != NULL); dependencies = get_extension_optional_dependencies (manager, ext_description); - for (scan_d = dependencies; scan_d; scan_d = scan_d->next) { - char *dep_name = scan_d->data; - - slink = g_slist_find_custom (extensions, dep_name, (GCompareFunc) strcmp); - if (slink != NULL) { - if (slink == next) + for (scan_dep = dependencies; scan_dep; scan_dep = scan_dep->next) { + char *dep_name = scan_dep->data; + GList *link; + + link = g_list_find_custom (extension_list, dep_name, (GCompareFunc) strcmp); + if (link != NULL) { + if (link == next) next = next->next; - extensions = g_slist_remove_link (extensions, slink); - slink->next = ordered; - ordered = slink; + /* prepend the extension dependency to the ordered list */ + extension_list = g_list_remove_link (extension_list, link); + ordered_by_dependency = _g_list_prepend_link (ordered_by_dependency, link); } } g_list_free (dependencies); - extensions = g_slist_remove_link (extensions, scan); - scan->next = ordered; - ordered = scan; + /* prepend the extension to the ordered list */ + extension_list = g_list_remove_link (extension_list, scan); + ordered_by_dependency = _g_list_prepend_link (ordered_by_dependency, scan); + scan = next; } - return g_slist_reverse (ordered); + return g_list_reverse (ordered_by_dependency); } diff -Nru gthumb-2.14.3/gthumb/gth-extensions.h gthumb-3.0.0/gthumb/gth-extensions.h --- gthumb-2.14.3/gthumb/gth-extensions.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-extensions.h 2012-04-21 09:31:57.000000000 +0000 @@ -174,8 +174,9 @@ GList * gth_extension_manager_get_extensions (GthExtensionManager *manager); GthExtensionDescription * gth_extension_manager_get_description (GthExtensionManager *manager, const char *extension_name); -GSList * gth_extension_manager_order_extensions (GthExtensionManager *manager, - GSList *extensions); +GList * gth_extension_manager_order_extensions (GthExtensionManager *manager, + char **extensions); + G_END_DECLS #endif diff -Nru gthumb-2.14.3/gthumb/gth-file-chooser-dialog.c gthumb-3.0.0/gthumb/gth-file-chooser-dialog.c --- gthumb-2.14.3/gthumb/gth-file-chooser-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-chooser-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -35,7 +35,7 @@ } Format; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthFileChooserDialog, gth_file_chooser_dialog, GTK_TYPE_FILE_CHOOSER_DIALOG) struct _GthFileChooserDialogPrivate { @@ -54,7 +54,7 @@ g_list_foreach (self->priv->supported_formats, (GFunc) g_free, NULL); g_list_free (self->priv->supported_formats); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_chooser_dialog_parent_class)->finalize (object); } @@ -63,7 +63,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthFileChooserDialogPrivate)); object_class = (GObjectClass*) class; @@ -79,34 +78,6 @@ } -GType -gth_file_chooser_dialog_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthFileChooserDialogClass), - NULL, - NULL, - (GClassInitFunc) gth_file_chooser_dialog_class_init, - NULL, - NULL, - sizeof (GthFileChooserDialog), - 0, - (GInstanceInitFunc) gth_file_chooser_dialog_init - }; - - type = g_type_register_static (GTK_TYPE_FILE_CHOOSER_DIALOG, - "GthFileChooserDialog", - &type_info, - 0); - } - - return type; -} - - static void format_chooser_selection_changed_cb (EggFileFormatChooser *format_chooser, GthFileChooserDialog *self) diff -Nru gthumb-2.14.3/gthumb/gth-file-data.c gthumb-3.0.0/gthumb/gth-file-data.c --- gthumb-2.14.3/gthumb/gth-file-data.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-data.c 2012-03-24 15:48:36.000000000 +0000 @@ -28,9 +28,6 @@ #include "gth-string-list.h" -#define GTH_FILE_DATA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_FILE_DATA, GthFileDataPrivate)) - - const char *FileDataDigitalizationTags[] = { "Exif::Photo::DateTimeOriginal", "Xmp::exif::DateTimeOriginal", @@ -51,7 +48,15 @@ char *sort_key; }; -static gpointer gth_file_data_parent_class = NULL; + +static void gth_file_data_gth_duplicable_interface_init (GthDuplicableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthFileData, + gth_file_data, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTH_TYPE_DUPLICABLE, + gth_file_data_gth_duplicable_interface_init)) static void @@ -59,10 +64,8 @@ { GthFileData *self = GTH_FILE_DATA (obj); - if (self->file != NULL) - g_object_unref (self->file); - if (self->info != NULL) - g_object_unref (self->info); + _g_object_unref (self->file); + _g_object_unref (self->info); g_free (self->priv->sort_key); G_OBJECT_CLASS (gth_file_data_parent_class)->finalize (obj); @@ -72,21 +75,12 @@ static void gth_file_data_class_init (GthFileDataClass *klass) { - gth_file_data_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthFileDataPrivate)); G_OBJECT_CLASS (klass)->finalize = gth_file_data_finalize; } -static void -gth_file_data_instance_init (GthFileData *self) -{ - self->priv = GTH_FILE_DATA_GET_PRIVATE (self); - self->priv->dtime.tv_sec = 0; -} - - static GObject * gth_file_data_real_duplicate (GthDuplicable *base) { @@ -95,40 +89,20 @@ static void -gth_file_data_gth_duplicable_interface_init (GthDuplicableIface *iface) +gth_file_data_gth_duplicable_interface_init (GthDuplicableInterface *iface) { iface->duplicate = gth_file_data_real_duplicate; } -GType -gth_file_data_get_type (void) +static void +gth_file_data_init (GthFileData *self) { - static GType gth_file_data_type_id = 0; - - if (gth_file_data_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileDataClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_data_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileData), - 0, - (GInstanceInitFunc) gth_file_data_instance_init, - NULL - }; - static const GInterfaceInfo gth_duplicable_info = { - (GInterfaceInitFunc) gth_file_data_gth_duplicable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - gth_file_data_type_id = g_type_register_static (G_TYPE_OBJECT, "GthFileData", &g_define_type_info, 0); - g_type_add_interface_static (gth_file_data_type_id, GTH_TYPE_DUPLICABLE, >h_duplicable_info); - } - - return gth_file_data_type_id; + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_DATA, GthFileDataPrivate); + self->priv->dtime.tv_sec = 0; + self->priv->sort_key = NULL; + self->file = NULL; + self->info = NULL; } @@ -238,9 +212,14 @@ content_type = g_file_info_get_attribute_string (self->info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE); if (content_type == NULL) content_type = g_file_info_get_attribute_string (self->info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE); + if (content_type == NULL) { - char *filename = g_file_get_basename (self->file); + char *filename; + + if (self->file == NULL) + return NULL; + filename = g_file_get_basename (self->file); if (filename != NULL) { content_type = g_content_type_guess (filename, NULL, 0, NULL); g_free (filename); @@ -541,6 +520,10 @@ int i; info = g_file_info_new (); + + if (file_data_list == NULL) + return info; + g_file_info_copy_into (((GthFileData *) file_data_list->data)->info, info); attributes_v = g_strsplit (attribtues, ",", -1); diff -Nru gthumb-2.14.3/gthumb/gth-file-list.c gthumb-3.0.0/gthumb/gth-file-list.c --- gthumb-2.14.3/gthumb/gth-file-list.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-list.c 2012-04-12 20:12:23.000000000 +0000 @@ -23,9 +23,7 @@ #include #include #include -#include "gconf-utils.h" #include "glib-utils.h" -#include "gth-cell-renderer-thumbnail.h" #include "gth-dumb-notebook.h" #include "gth-empty-list.h" #include "gth-file-list.h" @@ -51,12 +49,13 @@ GTH_FILE_LIST_OP_TYPE_CLEAR_FILES, GTH_FILE_LIST_OP_TYPE_ADD_FILES, GTH_FILE_LIST_OP_TYPE_UPDATE_FILES, + GTH_FILE_LIST_OP_TYPE_UPDATE_EMBLEMS, GTH_FILE_LIST_OP_TYPE_DELETE_FILES, GTH_FILE_LIST_OP_TYPE_SET_FILTER, GTH_FILE_LIST_OP_TYPE_SET_SORT_FUNC, GTH_FILE_LIST_OP_TYPE_ENABLE_THUMBS, - GTH_FILE_LIST_OP_TYPE_RENAME_FILE - /*GTH_FILE_LIST_OP_TYPE_SET_THUMBS_SIZE,*/ + GTH_FILE_LIST_OP_TYPE_RENAME_FILE, + GTH_FILE_LIST_OP_TYPE_MAKE_FILE_VISIBLE } GthFileListOpType; @@ -105,35 +104,51 @@ }; +typedef enum { + THUMBNAILER_PHASE_INITIALIZE, + THUMBNAILER_PHASE_UPDATE_VISIBLE, + THUMBNAILER_PHASE_UPDATE_DOWNWARD, + THUMBNAILER_PHASE_UPDATE_UPWARD, + THUMBNAILER_PHASE_COMPLETED +} ThumbnailerPhase; + + +typedef struct { + ThumbnailerPhase phase; + int first_visibile; + int last_visible; + int current_pos; + GList *current_item; +} ThumbnailerState; + + struct _GthFileListPrivateData { - GthFileListType type; - GtkAdjustment *vadj; - GtkWidget *notebook; - GtkWidget *view; - GtkWidget *message; - GtkWidget *scrolled_window; - GthIconCache *icon_cache; - GthFileSource *file_source; - gboolean load_thumbs; - int thumb_size; - gboolean ignore_hidden_thumbs; - GHashTable *thumb_data; - GthThumbLoader *thumb_loader; - gboolean loading_thumbs; - gboolean dirty; - guint dirty_event; - guint restart_thumb_update; - GList *queue; /* list of GthFileListOp */ - GList *jobs; /* list of ThumbnailJob */ - GtkCellRenderer *thumbnail_renderer; - GtkCellRenderer *text_renderer; - GtkCellRenderer *checkbox_renderer; - char **caption_attributes_v; - gboolean cancelling; - guint update_event; - gboolean visibility_changed; - GList *visibles; + GSettings *settings; + GthFileListType type; + GtkAdjustment *vadj; + GtkWidget *notebook; + GtkWidget *view; + GtkWidget *message; + GtkWidget *scrolled_window; + GthIconCache *icon_cache; + GthFileSource *file_source; + gboolean load_thumbs; + int thumb_size; + gboolean ignore_hidden_thumbs; + GHashTable *thumb_data; + GthThumbLoader *thumb_loader; + gboolean loading_thumbs; + gboolean dirty; + guint dirty_event; + guint restart_thumb_update; + GList *queue; /* list of GthFileListOp */ + GList *jobs; /* list of ThumbnailJob */ + gboolean cancelling; + guint update_event; + gboolean visibility_changed; + GList *visibles; + ThumbnailerState thumbnailer_state; }; @@ -167,6 +182,7 @@ break; case GTH_FILE_LIST_OP_TYPE_ADD_FILES: case GTH_FILE_LIST_OP_TYPE_UPDATE_FILES: + case GTH_FILE_LIST_OP_TYPE_UPDATE_EMBLEMS: _g_object_list_unref (op->file_list); break; case GTH_FILE_LIST_OP_TYPE_DELETE_FILES: @@ -179,6 +195,9 @@ g_object_unref (op->file); g_object_unref (op->file_data); break; + case GTH_FILE_LIST_OP_TYPE_MAKE_FILE_VISIBLE: + g_object_unref (op->file); + break; default: break; } @@ -253,7 +272,7 @@ /* -- gth_file_list -- */ -static GtkHBoxClass *parent_class = NULL; +G_DEFINE_TYPE (GthFileList, gth_file_list, GTK_TYPE_BOX) static void @@ -269,67 +288,94 @@ g_hash_table_unref (file_list->priv->thumb_data); if (file_list->priv->icon_cache != NULL) gth_icon_cache_free (file_list->priv->icon_cache); - g_strfreev (file_list->priv->caption_attributes_v); + g_object_unref (file_list->priv->settings); g_free (file_list->priv); file_list->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_list_parent_class)->finalize (object); } -static void -gth_file_list_size_request (GtkWidget *widget, - GtkRequisition *requisition) +static GtkSizeRequestMode +gth_file_list_get_request_mode (GtkWidget *widget) { - GthFileList *file_list; + return GTK_SIZE_REQUEST_CONSTANT_SIZE; +} - GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition); - file_list = GTH_FILE_LIST (widget); +static void +gth_file_list_get_preferred_width (GtkWidget *widget, + int *minimum_width, + int *natural_width) +{ + GthFileList *file_list = GTH_FILE_LIST (widget); + GtkWidget *vscrollbar; + const int border = 1; - if (file_list->priv->type == GTH_FILE_LIST_TYPE_V_SIDEBAR) { - int xthickness; - GtkWidget *vscrollbar; + gtk_widget_get_preferred_width (file_list->priv->view, minimum_width, natural_width); + if (minimum_width) + *minimum_width += border * 2; + if (natural_width) + *natural_width += border * 2; - xthickness = gtk_widget_get_style (file_list->priv->scrolled_window)->xthickness; - requisition->width = file_list->priv->thumb_size + (THUMBNAIL_BORDER * 2) + xthickness * 2; + vscrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (file_list->priv->scrolled_window)); + if (gtk_widget_get_visible (vscrollbar) || (file_list->priv->type == GTH_FILE_LIST_TYPE_V_SIDEBAR)) { + int vscrollbar_minimum_width; + int vscrollbar_natural_width; + int scrollbar_spacing; - vscrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (file_list->priv->scrolled_window)); - if (gtk_widget_get_visible (vscrollbar)) { - GtkRequisition vscrollbar_requisition; - int scrollbar_spacing; - - gtk_widget_size_request (vscrollbar, &vscrollbar_requisition); - gtk_widget_style_get (file_list->priv->scrolled_window, - "scrollbar-spacing", &scrollbar_spacing, - NULL); - requisition->width += vscrollbar_requisition.width + scrollbar_spacing; - } - } - else if (file_list->priv->type == GTH_FILE_LIST_TYPE_H_SIDEBAR) { - int ythickness; + gtk_widget_get_preferred_width (vscrollbar, &vscrollbar_minimum_width, &vscrollbar_natural_width); + gtk_widget_style_get (file_list->priv->scrolled_window, + "scrollbar-spacing", &scrollbar_spacing, + NULL); - ythickness = gtk_widget_get_style (file_list->priv->scrolled_window)->ythickness; - requisition->height = file_list->priv->thumb_size + (THUMBNAIL_BORDER * 2) + ythickness * 2; + *minimum_width += vscrollbar_minimum_width + scrollbar_spacing; + *natural_width += vscrollbar_natural_width + scrollbar_spacing; } } static void +gth_file_list_get_preferred_height (GtkWidget *widget, + int *minimum_height, + int *natural_height) +{ + GthFileList *file_list = GTH_FILE_LIST (widget); + const int border = 1; + + gtk_widget_get_preferred_height (file_list->priv->view, minimum_height, natural_height); + if (minimum_height) + *minimum_height += border * 2; + if (natural_height) + *natural_height += border * 2; +} + + +static void +gth_file_list_grab_focus (GtkWidget *widget) +{ + GthFileList *file_list = GTH_FILE_LIST (widget); + + gtk_widget_grab_focus (file_list->priv->notebook); +} + + +static void gth_file_list_class_init (GthFileListClass *class) { GObjectClass *object_class; GtkWidgetClass *widget_class; - parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass*) class; object_class->finalize = gth_file_list_finalize; widget_class = (GtkWidgetClass*) class; - widget_class->size_request = gth_file_list_size_request; + widget_class->get_request_mode = gth_file_list_get_request_mode; + widget_class->get_preferred_width = gth_file_list_get_preferred_width; + widget_class->get_preferred_height = gth_file_list_get_preferred_height; + widget_class->grab_focus = gth_file_list_grab_focus; } @@ -374,15 +420,16 @@ gth_file_list_init (GthFileList *file_list) { file_list->priv = g_new0 (GthFileListPrivateData, 1); + file_list->priv->settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); file_list->priv->thumb_data = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, g_object_unref, (GDestroyNotify) thumb_data_unref); - file_list->priv->thumb_size = DEFAULT_THUMBNAIL_SIZE; + file_list->priv->thumb_size = g_settings_get_int (file_list->priv->settings, PREF_BROWSER_THUMBNAIL_SIZE); file_list->priv->ignore_hidden_thumbs = FALSE; file_list->priv->load_thumbs = TRUE; - file_list->priv->caption_attributes_v = g_strsplit ("none", ",", -1); file_list->priv->cancelling = FALSE; file_list->priv->update_event = 0; file_list->priv->visibles = NULL; file_list->priv->visibility_changed = FALSE; + file_list->priv->thumbnailer_state.phase = THUMBNAILER_PHASE_INITIALIZE; } @@ -468,6 +515,9 @@ vadj_changed_cb (GtkAdjustment *adjustment, gpointer user_data) { + GthFileList *file_list = user_data; + + file_list->priv->thumbnailer_state.phase = THUMBNAILER_PHASE_INITIALIZE; start_update_next_thumb (GTH_FILE_LIST (user_data)); } @@ -507,71 +557,24 @@ static void -checkbox_toggled_cb (GtkCellRendererToggle *cell_renderer, - char *path, - gpointer user_data) +_gth_file_list_update_orientation (GthFileList *file_list) { - GthFileList *file_list = user_data; - GtkTreePath *tpath; - GthFileStore *file_store; - GtkTreeIter iter; - - tpath = gtk_tree_path_new_from_string (path); - if (tpath == NULL) - return; - - file_store = (GthFileStore*) gth_file_view_get_model (GTH_FILE_VIEW (file_list->priv->view)); - if (gtk_tree_model_get_iter (GTK_TREE_MODEL (file_store), &iter, tpath)) { - gboolean checked; - - gtk_tree_model_get (GTK_TREE_MODEL (file_store), &iter, - GTH_FILE_STORE_CHECKED_COLUMN, &checked, - -1); - gth_file_store_set (file_store, - &iter, - GTH_FILE_STORE_CHECKED_COLUMN, ! checked, - -1); - } - - gtk_tree_path_free (tpath); -} + GtkPolicyType hscrollbar_policy; + GtkPolicyType vscrollbar_policy; + hscrollbar_policy = GTK_POLICY_AUTOMATIC; + vscrollbar_policy = GTK_POLICY_AUTOMATIC; -static void -_gth_file_list_update_orientation (GthFileList *file_list) -{ - if (file_list->priv->type == GTH_FILE_LIST_TYPE_V_SIDEBAR) + if (file_list->priv->type == GTH_FILE_LIST_TYPE_V_SIDEBAR) { gtk_orientable_set_orientation (GTK_ORIENTABLE (file_list), GTK_ORIENTATION_VERTICAL); + vscrollbar_policy = GTK_POLICY_ALWAYS; + } else if (file_list->priv->type == GTH_FILE_LIST_TYPE_H_SIDEBAR) gtk_orientable_set_orientation (GTK_ORIENTABLE (file_list), GTK_ORIENTATION_HORIZONTAL); -} - -static void -_gth_file_list_set_type (GthFileList *file_list, - GthFileListType list_type) -{ - file_list->priv->type = list_type; - - if ((file_list->priv->type == GTH_FILE_LIST_TYPE_SELECTOR) || (file_list->priv->type == GTH_FILE_LIST_TYPE_NO_SELECTION)) - gth_file_selection_set_selection_mode (GTH_FILE_SELECTION (file_list->priv->view), GTK_SELECTION_NONE); - else if ((file_list->priv->type == GTH_FILE_LIST_TYPE_H_SIDEBAR) || (file_list->priv->type == GTH_FILE_LIST_TYPE_V_SIDEBAR)) - gth_file_selection_set_selection_mode (GTH_FILE_SELECTION (file_list->priv->view), GTK_SELECTION_SINGLE); - else - gth_file_selection_set_selection_mode (GTH_FILE_SELECTION (file_list->priv->view), GTK_SELECTION_MULTIPLE); - - g_object_set (file_list->priv->checkbox_renderer, - "visible", ((file_list->priv->type == GTH_FILE_LIST_TYPE_BROWSER) || (file_list->priv->type == GTH_FILE_LIST_TYPE_SELECTOR)), - NULL); - - /* use the fixed size for horizontal sidebars to view a single row at - * a time. */ - - g_object_set (file_list->priv->thumbnail_renderer, - "fixed_size", TRUE /* (file_list->priv->type == GTH_FILE_LIST_TYPE_H_SIDEBAR) */, - NULL); - - _gth_file_list_update_orientation (file_list); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (file_list->priv->scrolled_window), + hscrollbar_policy, + vscrollbar_policy); } @@ -591,6 +594,7 @@ gpointer user_data) { GthFileList *file_list = user_data; + file_list->priv->visibility_changed = TRUE; } @@ -601,10 +605,7 @@ GthFileListType list_type, gboolean enable_drag_drop) { - GtkWidget *viewport; - GtkCellRenderer *renderer; - GthFileStore *model; - GtkCellLayout *cell_layout; + GthFileStore *model; file_list->priv->thumb_loader = gth_thumb_loader_new (file_list->priv->thumb_size); file_list->priv->icon_cache = gth_icon_cache_new (gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (file_list))), file_list->priv->thumb_size / 2); @@ -615,20 +616,12 @@ /* the message pane */ - viewport = gtk_viewport_new (NULL, NULL); - gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), - GTK_SHADOW_ETCHED_IN); - file_list->priv->message = gth_empty_list_new (_(EMPTY)); /* the file view */ file_list->priv->scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (file_list->priv->scrolled_window), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (file_list->priv->scrolled_window), - GTK_SHADOW_ETCHED_IN); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (file_list->priv->scrolled_window), GTK_SHADOW_ETCHED_IN); file_list->priv->vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (file_list->priv->scrolled_window)); g_signal_connect (G_OBJECT (file_list->priv->vadj), @@ -678,66 +671,7 @@ file_list); } - /* checkbox */ - - file_list->priv->checkbox_renderer = renderer = gtk_cell_renderer_toggle_new (); - g_signal_connect (file_list->priv->checkbox_renderer, - "toggled", - G_CALLBACK (checkbox_toggled_cb), - file_list); - - cell_layout = gth_file_view_add_renderer (GTH_FILE_VIEW (file_list->priv->view), - GTH_FILE_VIEW_RENDERER_CHECKBOX, - file_list->priv->checkbox_renderer); - gtk_cell_layout_set_attributes (cell_layout, - renderer, - "active", GTH_FILE_STORE_CHECKED_COLUMN, - NULL); - - /* thumbnail */ - - file_list->priv->thumbnail_renderer = renderer = gth_cell_renderer_thumbnail_new (); - - cell_layout = gth_file_view_add_renderer (GTH_FILE_VIEW (file_list->priv->view), - GTH_FILE_VIEW_RENDERER_THUMBNAIL, - file_list->priv->thumbnail_renderer); - gtk_cell_layout_set_attributes (cell_layout, - renderer, - "thumbnail", GTH_FILE_STORE_THUMBNAIL_COLUMN, - "is_icon", GTH_FILE_STORE_IS_ICON_COLUMN, - "file", GTH_FILE_STORE_FILE_DATA_COLUMN, - NULL); - if (file_list->priv->type == GTH_FILE_LIST_TYPE_BROWSER) - gtk_cell_layout_add_attribute (cell_layout, - renderer, - "selected", - GTH_FILE_STORE_CHECKED_COLUMN); - else if (file_list->priv->type == GTH_FILE_LIST_TYPE_SELECTOR) - gtk_cell_layout_add_attribute (cell_layout, - renderer, - "checked", - GTH_FILE_STORE_CHECKED_COLUMN); - - /* text */ - - file_list->priv->text_renderer = renderer = gtk_cell_renderer_text_new (); - - cell_layout = gth_file_view_add_renderer (GTH_FILE_VIEW (file_list->priv->view), - GTH_FILE_VIEW_RENDERER_TEXT, - file_list->priv->text_renderer); - gtk_cell_layout_set_attributes (cell_layout, - renderer, - "text", GTH_FILE_STORE_METADATA_COLUMN, - "visible", GTH_FILE_STORE_METADATA_VISIBLE_COLUMN, - NULL); - - gth_file_view_update_attributes (GTH_FILE_VIEW (file_list->priv->view), - file_list->priv->checkbox_renderer, - file_list->priv->thumbnail_renderer, - file_list->priv->text_renderer, - file_list->priv->thumb_size); - - _gth_file_list_set_type (file_list, list_type); + gth_file_list_set_type (file_list, list_type); /* pack the widgets together */ @@ -748,10 +682,7 @@ gtk_container_add (GTK_CONTAINER (file_list->priv->notebook), file_list->priv->scrolled_window); gtk_widget_show (file_list->priv->message); - gtk_container_add (GTK_CONTAINER (viewport), file_list->priv->message); - - gtk_widget_show (viewport); - gtk_container_add (GTK_CONTAINER (file_list->priv->notebook), viewport); + gtk_container_add (GTK_CONTAINER (file_list->priv->notebook), file_list->priv->message); gtk_widget_show (file_list->priv->notebook); gtk_box_pack_start (GTK_BOX (file_list), file_list->priv->notebook, TRUE, TRUE, 0); @@ -760,35 +691,7 @@ } -GType -gth_file_list_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthFileListClass), - NULL, - NULL, - (GClassInitFunc) gth_file_list_class_init, - NULL, - NULL, - sizeof (GthFileList), - 0, - (GInstanceInitFunc) gth_file_list_init - }; - - type = g_type_register_static (GTK_TYPE_VBOX, - "GthFileList", - &type_info, - 0); - } - - return type; -} - - -GtkWidget* +GtkWidget * gth_file_list_new (GtkWidget *file_view, GthFileListType list_type, gboolean enable_drag_drop) @@ -806,7 +709,18 @@ gth_file_list_set_type (GthFileList *file_list, GthFileListType list_type) { - _gth_file_list_set_type (file_list, list_type); + g_return_if_fail (GTH_IS_FILE_LIST (file_list)); + + file_list->priv->type = list_type; + + if ((file_list->priv->type == GTH_FILE_LIST_TYPE_SELECTOR) || (file_list->priv->type == GTH_FILE_LIST_TYPE_NO_SELECTION)) + gth_file_selection_set_selection_mode (GTH_FILE_SELECTION (file_list->priv->view), GTK_SELECTION_NONE); + else if ((file_list->priv->type == GTH_FILE_LIST_TYPE_H_SIDEBAR) || (file_list->priv->type == GTH_FILE_LIST_TYPE_V_SIDEBAR)) + gth_file_selection_set_selection_mode (GTH_FILE_SELECTION (file_list->priv->view), GTK_SELECTION_SINGLE); + else + gth_file_selection_set_selection_mode (GTH_FILE_SELECTION (file_list->priv->view), GTK_SELECTION_MULTIPLE); + + _gth_file_list_update_orientation (file_list); } @@ -945,46 +859,6 @@ } -#define MAX_TEXT_LENGTH 70 - - -static GString * -_gth_file_list_get_metadata (GthFileList *file_list, - GthFileData *file_data) -{ - GString *metadata; - int i; - - metadata = g_string_new (NULL); - for (i = 0; file_list->priv->caption_attributes_v[i] != NULL; i++) { - char *value; - - value = gth_file_data_get_attribute_as_string (file_data, file_list->priv->caption_attributes_v[i]); - if (value != NULL) { - if (metadata->len > 0) - g_string_append (metadata, "\n"); - if (gth_file_view_truncate_metadata (GTH_FILE_VIEW (file_list->priv->view)) - && g_utf8_strlen (value, -1) > MAX_TEXT_LENGTH) - { - char *tmp; - - tmp = g_strdup (value); - g_utf8_strncpy (tmp, value, MAX_TEXT_LENGTH); - g_free (value); - value = g_strdup_printf ("%s […]", tmp); - - g_free (tmp); - } - g_string_append (metadata, value); - } - - g_free (value); - } - - return metadata; -} - - static void gfl_add_files (GthFileList *file_list, GList *files, @@ -994,6 +868,8 @@ GList *scan; char *cache_base_uri; + performance (DEBUG_INFO, "gfl_add_files start"); + file_store = (GthFileStore*) gth_file_view_get_model (GTH_FILE_VIEW (file_list->priv->view)); cache_base_uri = g_strconcat (get_home_uri (), "/.thumbnails", NULL); @@ -1003,7 +879,6 @@ ThumbData *thumb_data; GIcon *icon; GdkPixbuf *pixbuf = NULL; - GString *metadata; if (g_file_info_get_file_type (file_data->info) != G_FILE_TYPE_REGULAR) continue; @@ -1024,24 +899,21 @@ icon = g_file_info_get_icon (file_data->info); pixbuf = gth_icon_cache_get_pixbuf (file_list->priv->icon_cache, icon); - metadata = _gth_file_list_get_metadata (file_list, file_data); gth_file_store_queue_add (file_store, file_data, pixbuf, - TRUE, - metadata->str, TRUE); - g_string_free (metadata, TRUE); if (pixbuf != NULL) g_object_unref (pixbuf); - g_free (uri); } g_free (cache_base_uri); gth_file_store_exec_add (file_store, position); _gth_file_list_update_pane (file_list); + + performance (DEBUG_INFO, "gfl_add_files end"); } @@ -1118,18 +990,11 @@ thumb_data->thumb_loaded = FALSE; thumb_data->thumb_created = FALSE; - if (gth_file_store_find (file_store, file_data->file, &iter)) { - GString *metadata; - - metadata = _gth_file_list_get_metadata (file_list, file_data); + if (gth_file_store_find (file_store, file_data->file, &iter)) gth_file_store_queue_set (file_store, &iter, GTH_FILE_STORE_FILE_DATA_COLUMN, file_data, - GTH_FILE_STORE_METADATA_COLUMN, metadata->str, -1); - - g_string_free (metadata, TRUE); - } } gth_file_store_exec_set (file_store); _gth_file_list_update_pane (file_list); @@ -1149,6 +1014,45 @@ static void +gfl_update_emblems (GthFileList *file_list, + GList *files) +{ + GthFileStore *file_store; + GList *scan; + + file_store = (GthFileStore*) gth_file_view_get_model (GTH_FILE_VIEW (file_list->priv->view)); + for (scan = files; scan; scan = scan->next) { + GthFileData *file_data = scan->data; + ThumbData *thumb_data; + GtkTreeIter iter; + + thumb_data = g_hash_table_lookup (file_list->priv->thumb_data, file_data->file); + if (thumb_data == NULL) + continue; + + if (gth_file_store_find (file_store, file_data->file, &iter)) + gth_file_store_queue_set (file_store, + &iter, + GTH_FILE_STORE_EMBLEMS_COLUMN, g_file_info_get_attribute_object (file_data->info, GTH_FILE_ATTRIBUTE_EMBLEMS), + -1); + } + gth_file_store_exec_set (file_store); +} + + +void +gth_file_list_update_emblems (GthFileList *file_list, + GList *files /* GthFileData */) +{ + GthFileListOp *op; + + op = gth_file_list_op_new (GTH_FILE_LIST_OP_TYPE_UPDATE_EMBLEMS); + op->file_list = _g_object_list_ref (files); + _gth_file_list_queue_op (file_list, op); +} + + +static void gfl_rename_file (GthFileList *file_list, GFile *file, GthFileData *file_data) @@ -1159,7 +1063,6 @@ file_store = (GthFileStore*) gth_file_view_get_model (GTH_FILE_VIEW (file_list->priv->view)); if (gth_file_store_find (file_store, file, &iter)) { ThumbData *thumb_data; - GString *metadata; thumb_data = g_hash_table_lookup (file_list->priv->thumb_data, file); g_assert (thumb_data != NULL); @@ -1169,14 +1072,10 @@ thumb_data_ref (thumb_data)); g_hash_table_remove (file_list->priv->thumb_data, file); - metadata = _gth_file_list_get_metadata (file_list, file_data); gth_file_store_set (file_store, &iter, GTH_FILE_STORE_FILE_DATA_COLUMN, file_data, - GTH_FILE_STORE_METADATA_COLUMN, metadata->str, -1); - - g_string_free (metadata, TRUE); } _gth_file_list_update_pane (file_list); } @@ -1200,8 +1099,8 @@ gfl_set_files (GthFileList *file_list, GList *files) { - gth_thumb_loader_set_save_thumbnails (file_list->priv->thumb_loader, eel_gconf_get_boolean (PREF_SAVE_THUMBNAILS, TRUE)); - gth_thumb_loader_set_max_file_size (file_list->priv->thumb_loader, eel_gconf_get_integer (PREF_THUMBNAIL_LIMIT, 0)); + gth_thumb_loader_set_save_thumbnails (file_list->priv->thumb_loader, g_settings_get_boolean (file_list->priv->settings, PREF_BROWSER_SAVE_THUMBNAILS)); + gth_thumb_loader_set_max_file_size (file_list->priv->thumb_loader, g_settings_get_int (file_list->priv->settings, PREF_BROWSER_THUMBNAIL_LIMIT)); gth_file_selection_unselect_all (GTH_FILE_SELECTION (file_list->priv->view)); gth_file_store_clear ((GthFileStore*) gth_file_view_get_model (GTH_FILE_VIEW (file_list->priv->view))); @@ -1316,8 +1215,10 @@ GthFileStore *file_store; GtkTreeIter iter; - gth_thumb_loader_set_save_thumbnails (file_list->priv->thumb_loader, eel_gconf_get_boolean (PREF_SAVE_THUMBNAILS, TRUE)); - gth_thumb_loader_set_max_file_size (file_list->priv->thumb_loader, eel_gconf_get_integer (PREF_THUMBNAIL_LIMIT, 0)); + gth_thumb_loader_set_save_thumbnails (file_list->priv->thumb_loader, + g_settings_get_boolean (file_list->priv->settings, PREF_BROWSER_SAVE_THUMBNAILS)); + gth_thumb_loader_set_max_file_size (file_list->priv->thumb_loader, + g_settings_get_int (file_list->priv->settings, PREF_BROWSER_THUMBNAIL_LIMIT)); file_list->priv->load_thumbs = enable; @@ -1381,17 +1282,13 @@ file_list->priv->thumb_size = size; gth_thumb_loader_set_requested_size (file_list->priv->thumb_loader, size); - gth_thumb_loader_set_save_thumbnails (file_list->priv->thumb_loader, eel_gconf_get_boolean (PREF_SAVE_THUMBNAILS, TRUE)); - gth_thumb_loader_set_max_file_size (file_list->priv->thumb_loader, eel_gconf_get_integer (PREF_THUMBNAIL_LIMIT, 0)); + gth_thumb_loader_set_save_thumbnails (file_list->priv->thumb_loader, g_settings_get_boolean (file_list->priv->settings, PREF_BROWSER_SAVE_THUMBNAILS)); + gth_thumb_loader_set_max_file_size (file_list->priv->thumb_loader, g_settings_get_int (file_list->priv->settings, PREF_BROWSER_THUMBNAIL_LIMIT)); gth_icon_cache_free (file_list->priv->icon_cache); file_list->priv->icon_cache = gth_icon_cache_new (gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (file_list))), size / 2); - gth_file_view_update_attributes (GTH_FILE_VIEW (file_list->priv->view), - file_list->priv->checkbox_renderer, - file_list->priv->thumbnail_renderer, - file_list->priv->text_renderer, - file_list->priv->thumb_size); + gth_file_view_set_thumbnail_size (GTH_FILE_VIEW (file_list->priv->view), file_list->priv->thumb_size); _gth_file_list_update_orientation (file_list); } @@ -1401,38 +1298,33 @@ gth_file_list_set_caption (GthFileList *file_list, const char *attributes) { - GthFileStore *file_store; - GtkTreeIter iter; - gboolean metadata_visible; + gth_file_view_set_caption (GTH_FILE_VIEW (file_list->priv->view), attributes); +} - g_strfreev (file_list->priv->caption_attributes_v); - file_list->priv->caption_attributes_v = g_strsplit (attributes, ",", -1); - metadata_visible = (strcmp (file_list->priv->caption_attributes_v[0], "none") != 0); - g_object_set (file_list->priv->text_renderer, - "visible", metadata_visible, - "height", metadata_visible ? -1 : 0, - NULL); +static void +gfl_make_file_visible (GthFileList *file_list, + GFile *file) +{ + int pos; - file_store = (GthFileStore *) gth_file_view_get_model (GTH_FILE_VIEW (file_list->priv->view)); - if (gth_file_store_get_first (file_store, &iter)) { - do { - GthFileData *file_data; - GString *metadata; + pos = gth_file_store_get_pos ((GthFileStore *) gth_file_view_get_model (GTH_FILE_VIEW (file_list->priv->view)), file); + if (pos >= 0) { + gth_file_selection_select (GTH_FILE_SELECTION (file_list->priv->view), pos); + gth_file_view_set_cursor (GTH_FILE_VIEW (file_list->priv->view), pos); + } +} - file_data = gth_file_store_get_file (file_store, &iter); - metadata = _gth_file_list_get_metadata (file_list, file_data); - gth_file_store_queue_set (file_store, - &iter, - GTH_FILE_STORE_METADATA_COLUMN, metadata->str, - -1); - g_string_free (metadata, TRUE); - } - while (gth_file_store_get_next (file_store, &iter)); +void +gth_file_list_make_file_visible (GthFileList *file_list, + GFile *file) +{ + GthFileListOp *op; - gth_file_store_exec_set (file_store); - } + op = gth_file_list_op_new (GTH_FILE_LIST_OP_TYPE_MAKE_FILE_VISIBLE); + op->file = g_object_ref (file); + _gth_file_list_queue_op (file_list, op); } @@ -1777,148 +1669,209 @@ _g_object_list_unref (file_list->priv->visibles); file_list->priv->visibles = gth_file_store_get_visibles ((GthFileStore *) gth_file_view_get_model (GTH_FILE_VIEW (file_list->priv->view))); file_list->priv->visibility_changed = FALSE; + file_list->priv->thumbnailer_state.phase = THUMBNAILER_PHASE_INITIALIZE; } return file_list->priv->visibles; } -static void -_gth_file_list_update_next_thumb (GthFileList *file_list) -{ - int pos; - int first_pos; - int last_pos; - GthFileData *file_data = NULL; - ThumbData *thumb_data; - GList *list, *scan; - int new_pos = -1; - GTimeVal current_time; - gboolean young_file_found = FALSE; - ThumbnailJob *job; +static gboolean +_gth_file_list_thumbnailer_iterate (GthFileList *file_list, + int *new_pos, + GTimeVal *current_time, + gboolean *young_file_found) +{ + gboolean iterate_again = TRUE; + GList *list; + GList *scan; + int pos; + GthFileData *file_data; + ThumbData *thumb_data; - if (file_list->priv->queue != NULL) { - if (file_list->priv->update_event != 0) - g_source_remove (file_list->priv->update_event); - file_list->priv->update_event = g_idle_add (update_thumbs_stopped, file_list); - return; - } + list = _gth_file_list_get_visibles (file_list); - if (file_list->priv->cancelling) - return; + switch (file_list->priv->thumbnailer_state.phase) { + case THUMBNAILER_PHASE_INITIALIZE: + file_list->priv->thumbnailer_state.first_visibile = gth_file_view_get_first_visible (GTH_FILE_VIEW (file_list->priv->view)); + file_list->priv->thumbnailer_state.last_visible = gth_file_view_get_last_visible (GTH_FILE_VIEW (file_list->priv->view)); + + /* pass to the 'update visible files' phase. */ + file_list->priv->thumbnailer_state.phase = THUMBNAILER_PHASE_UPDATE_VISIBLE; + file_list->priv->thumbnailer_state.current_pos = file_list->priv->thumbnailer_state.first_visibile; + file_list->priv->thumbnailer_state.current_item = g_list_nth (list, file_list->priv->thumbnailer_state.current_pos); + if (file_list->priv->thumbnailer_state.current_item == NULL) { + file_list->priv->thumbnailer_state.phase = THUMBNAILER_PHASE_COMPLETED; + return FALSE; + } + break; - if (! file_list->priv->load_thumbs) { - _gth_file_list_thumbs_completed (file_list); - return; - } + case THUMBNAILER_PHASE_UPDATE_VISIBLE: + /* Find a non-loaded thumbnail among the visible files. */ - /* Find first visible undone. */ + scan = file_list->priv->thumbnailer_state.current_item; + pos = file_list->priv->thumbnailer_state.current_pos; + while (scan && (pos <= file_list->priv->thumbnailer_state.last_visible)) { + file_data = scan->data; + thumb_data = g_hash_table_lookup (file_list->priv->thumb_data, file_data->file); + if (thumb_data == NULL) { + file_list->priv->thumbnailer_state.phase = THUMBNAILER_PHASE_COMPLETED; + return FALSE; + } - list = _gth_file_list_get_visibles (file_list); - first_pos = gth_file_view_get_first_visible (GTH_FILE_VIEW (file_list->priv->view)); - last_pos = gth_file_view_get_last_visible (GTH_FILE_VIEW (file_list->priv->view)); + if (! thumb_data->thumb_loaded && can_create_file_thumbnail (file_data, thumb_data, current_time, young_file_found)) { + /* found a thumbnail to load */ + file_list->priv->thumbnailer_state.current_item = scan; + file_list->priv->thumbnailer_state.current_pos = pos; + *new_pos = pos; + return FALSE; + } - scan = NULL; - pos = first_pos; - if (pos >= 0) - scan = g_list_nth (list, pos); - if (scan == NULL) { - _gth_file_list_thumbs_completed (file_list); - return; - } + pos++; + scan = scan->next; + } - /* Find a not loaded thumbnail among the visible images. */ + /* No thumbnail to load among the visible images, pass to the + * next phase. Start from the one after the last visible image. */ + file_list->priv->thumbnailer_state.phase = THUMBNAILER_PHASE_UPDATE_DOWNWARD; + file_list->priv->thumbnailer_state.current_pos = file_list->priv->thumbnailer_state.last_visible + 1; + file_list->priv->thumbnailer_state.current_item = g_list_nth (list, file_list->priv->thumbnailer_state.current_pos); + break; - g_get_current_time (¤t_time); + case THUMBNAILER_PHASE_UPDATE_DOWNWARD: + scan = file_list->priv->thumbnailer_state.current_item; + pos = file_list->priv->thumbnailer_state.current_pos; + while (scan && (pos <= file_list->priv->thumbnailer_state.last_visible + N_CREATEAHEAD)) { + gboolean requested_action_performed; + + file_data = scan->data; + thumb_data = g_hash_table_lookup (file_list->priv->thumb_data, file_data->file); + if (thumb_data == NULL) { + file_list->priv->thumbnailer_state.phase = THUMBNAILER_PHASE_COMPLETED; + return FALSE; + } + + if (pos <= file_list->priv->thumbnailer_state.last_visible + N_VIEWAHEAD) + requested_action_performed = thumb_data->thumb_loaded; + else + requested_action_performed = thumb_data->thumb_created; + + if (! requested_action_performed && can_create_file_thumbnail (file_data, thumb_data, current_time, young_file_found)) { + /* found a thumbnail to load */ + file_list->priv->thumbnailer_state.current_item = scan; + file_list->priv->thumbnailer_state.current_pos = pos; + *new_pos = pos; + return FALSE; + } - while (pos <= last_pos) { - file_data = scan->data; - thumb_data = g_hash_table_lookup (file_list->priv->thumb_data, file_data->file); - if (! thumb_data->thumb_loaded && can_create_file_thumbnail (file_data, thumb_data, ¤t_time, &young_file_found)) { - new_pos = pos; - break; - } - else { pos++; scan = scan->next; } - } - if (! file_list->priv->ignore_hidden_thumbs) { + /* No thumbnail to load, pass to the next phase. Start from the + * one before the first visible upward to the first one. */ + file_list->priv->thumbnailer_state.phase = THUMBNAILER_PHASE_UPDATE_UPWARD; + file_list->priv->thumbnailer_state.current_pos = file_list->priv->thumbnailer_state.first_visibile - 1; + file_list->priv->thumbnailer_state.current_item = g_list_nth (list, file_list->priv->thumbnailer_state.current_pos); + break; - /* Find a not created thumbnail among the not-visible images. */ + case THUMBNAILER_PHASE_UPDATE_UPWARD: + scan = file_list->priv->thumbnailer_state.current_item; + pos = file_list->priv->thumbnailer_state.current_pos; + while (scan && (pos >= file_list->priv->thumbnailer_state.first_visibile - N_CREATEAHEAD)) { + gboolean requested_action_performed; - /* start from the one after the last visible image... */ + file_data = scan->data; + thumb_data = g_hash_table_lookup (file_list->priv->thumb_data, file_data->file); + if (thumb_data == NULL) { + file_list->priv->thumbnailer_state.phase = THUMBNAILER_PHASE_COMPLETED; + return FALSE; + } - if (new_pos == -1) { - pos = last_pos + 1; - for (scan = g_list_nth (list, pos); scan && (pos <= last_pos + N_CREATEAHEAD); scan = scan->next) { - gboolean requested_action_performed; - - file_data = scan->data; - thumb_data = g_hash_table_lookup (file_list->priv->thumb_data, file_data->file); - - if (pos <= last_pos + N_VIEWAHEAD) - requested_action_performed = thumb_data->thumb_loaded; - else - requested_action_performed = thumb_data->thumb_created; - - if (! requested_action_performed && can_create_file_thumbnail (file_data, thumb_data, ¤t_time, &young_file_found)) { - new_pos = pos; - break; - } - pos++; + if (pos >= file_list->priv->thumbnailer_state.first_visibile - N_VIEWAHEAD) + requested_action_performed = thumb_data->thumb_loaded; + else + requested_action_performed = thumb_data->thumb_created; + + if (! requested_action_performed && can_create_file_thumbnail (file_data, thumb_data, current_time, young_file_found)) { + /* found a thumbnail to load */ + file_list->priv->thumbnailer_state.current_item = scan; + file_list->priv->thumbnailer_state.current_pos = pos; + *new_pos = pos; + return FALSE; } + + pos--; + scan = scan->prev; } - /* ...continue from the one before the first visible upward to - * the first one. */ + /* No thumbnail to load, terminate the process. */ + file_list->priv->thumbnailer_state.phase = THUMBNAILER_PHASE_COMPLETED; + break; - if (new_pos == -1) { - pos = first_pos - 1; - for (scan = g_list_nth (list, pos); scan && (pos >= first_pos - N_CREATEAHEAD); scan = scan->prev) { - gboolean requested_action_performed; - - file_data = scan->data; - thumb_data = g_hash_table_lookup (file_list->priv->thumb_data, file_data->file); - - if (pos >= first_pos - N_VIEWAHEAD) - requested_action_performed = thumb_data->thumb_loaded; - else - requested_action_performed = thumb_data->thumb_created; - - if (! requested_action_performed && can_create_file_thumbnail (file_data, thumb_data, ¤t_time, &young_file_found)) { - new_pos = pos; - break; - } - pos--; - } - } + case THUMBNAILER_PHASE_COMPLETED: + return FALSE; + } + + return iterate_again; +} + + +static void +_gth_file_list_update_next_thumb (GthFileList *file_list) +{ + int new_pos; + GTimeVal current_time; + gboolean young_file_found; + ThumbnailJob *job; + + /* give priority to any other operation, the thumbnailer will restart + * again soon after the operation terminates. */ + if (file_list->priv->queue != NULL) { + if (file_list->priv->update_event != 0) + g_source_remove (file_list->priv->update_event); + file_list->priv->update_event = g_idle_add (update_thumbs_stopped, file_list); + return; } - if (new_pos != -1) - file_data = g_object_ref (file_data); + if (file_list->priv->cancelling) + return; - if (new_pos == -1) { + if (! file_list->priv->load_thumbs) { + _gth_file_list_thumbs_completed (file_list); + return; + } + + /* find the new thumbnail to load */ + + new_pos = -1; + g_get_current_time (¤t_time); + young_file_found = FALSE; + while (_gth_file_list_thumbnailer_iterate (file_list, &new_pos, ¤t_time, &young_file_found)) + /* void */; + + if (file_list->priv->thumbnailer_state.phase == THUMBNAILER_PHASE_COMPLETED) { _gth_file_list_thumbs_completed (file_list); if (young_file_found && (file_list->priv->restart_thumb_update == 0)) file_list->priv->restart_thumb_update = g_timeout_add (RESTART_LOADING_THUMBS_DELAY, restart_thumb_update_cb, file_list); return; } + g_assert (file_list->priv->thumbnailer_state.current_item != NULL); + job = g_new0 (ThumbnailJob, 1); job->file_list = g_object_ref (file_list); job->loader = g_object_ref (file_list->priv->thumb_loader); job->cancellable = g_cancellable_new (); - job->file_data = file_data; /* already ref-ed above */ - job->pos = new_pos; - job->update_in_view = (new_pos >= (first_pos - N_VIEWAHEAD)) && (new_pos <= (last_pos + N_VIEWAHEAD)); + job->file_data = g_object_ref (file_list->priv->thumbnailer_state.current_item->data); + job->pos = file_list->priv->thumbnailer_state.current_pos; + job->update_in_view = (job->pos >= (file_list->priv->thumbnailer_state.first_visibile - N_VIEWAHEAD)) && (job->pos <= (file_list->priv->thumbnailer_state.last_visible + N_VIEWAHEAD)); #if 0 g_print ("%d in [%d, %d] => %d\n", job->pos, - (first_pos - N_VIEWAHEAD), - (last_pos + N_VIEWAHEAD), + (file_list->priv->thumbnailer_state.first_visibile - N_VIEWAHEAD), + (file_list->priv->thumbnailer_state.last_visible + N_VIEWAHEAD), job->update_in_view); #endif @@ -1956,6 +1909,9 @@ case GTH_FILE_LIST_OP_TYPE_UPDATE_FILES: gfl_update_files (file_list, op->file_list); break; + case GTH_FILE_LIST_OP_TYPE_UPDATE_EMBLEMS: + gfl_update_emblems (file_list, op->file_list); + break; case GTH_FILE_LIST_OP_TYPE_ENABLE_THUMBS: gfl_enable_thumbs (file_list, op->ival); exec_next_op = FALSE; @@ -1972,6 +1928,9 @@ case GTH_FILE_LIST_OP_TYPE_RENAME_FILE: gfl_rename_file (file_list, op->file, op->file_data); break; + case GTH_FILE_LIST_OP_TYPE_MAKE_FILE_VISIBLE: + gfl_make_file_visible (file_list, op->file); + break; default: exec_next_op = FALSE; break; @@ -2120,4 +2079,3 @@ return (scan != NULL) ? pos : -1; } - diff -Nru gthumb-2.14.3/gthumb/gth-file-list.h gthumb-3.0.0/gthumb/gth-file-list.h --- gthumb-2.14.3/gthumb/gth-file-list.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-list.h 2012-04-09 18:29:50.000000000 +0000 @@ -53,12 +53,12 @@ typedef struct _GthFileListPrivateData GthFileListPrivateData; struct _GthFileList { - GtkVBox __parent; + GtkBox __parent; GthFileListPrivateData *priv; }; struct _GthFileListClass { - GtkVBoxClass __parent; + GtkBoxClass __parent; }; GType gth_file_list_get_type (void); @@ -84,6 +84,8 @@ GList *list /* GFile */); void gth_file_list_update_files (GthFileList *file_list, GList *list /* GthFileData */); +void gth_file_list_update_emblems (GthFileList *file_list, + GList *list /* GthFileData */); void gth_file_list_rename_file (GthFileList *file_list, GFile *file, GthFileData *file_data); @@ -100,6 +102,8 @@ int size); void gth_file_list_set_caption (GthFileList *file_list, const char *attribute); +void gth_file_list_make_file_visible (GthFileList *file_list, + GFile *file); GtkWidget * gth_file_list_get_view (GthFileList *file_list); GtkWidget * gth_file_list_get_empty_view (GthFileList *file_list); GtkAdjustment * gth_file_list_get_vadjustment (GthFileList *file_list); diff -Nru gthumb-2.14.3/gthumb/gth-file-properties.c gthumb-3.0.0/gthumb/gth-file-properties.c --- gthumb-2.14.3/gthumb/gth-file-properties.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-properties.c 2012-04-13 08:17:25.000000000 +0000 @@ -32,7 +32,8 @@ #define GTH_FILE_PROPERTIES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_FILE_PROPERTIES, GthFilePropertiesPrivate)) #define FONT_SCALE (0.85) -#define COMMENT_HEIGHT 100 +#define MIN_HEIGHT 100 +#define COMMENT_DEFAULT_HEIGHT 100 #define CATEGORY_SIZE 1000 #define MAX_ATTRIBUTE_LENGTH 128 @@ -50,9 +51,6 @@ }; -static gpointer parent_class = NULL; - - struct _GthFilePropertiesPrivate { GtkWidget *tree_view; GtkWidget *comment_view; @@ -62,6 +60,19 @@ }; +static void gth_file_properties_gth_multipage_child_interface_init (GthMultipageChildInterface *iface); +static void gth_file_properties_gth_property_view_interface_init (GthPropertyViewInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthFileProperties, + gth_file_properties, + GTK_TYPE_BOX, + G_IMPLEMENT_INTERFACE (GTH_TYPE_MULTIPAGE_CHILD, + gth_file_properties_gth_multipage_child_interface_init) + G_IMPLEMENT_INTERFACE (GTH_TYPE_PROPERTY_VIEW, + gth_file_properties_gth_property_view_interface_init)) + + static char * get_comment (GthFileData *file_data) { @@ -126,11 +137,8 @@ if (value != NULL) { char *tmp_value; - if (g_utf8_strlen (value, -1) > MAX_ATTRIBUTE_LENGTH) { - g_utf8_strncpy (value, value, MAX_ATTRIBUTE_LENGTH - 3); - g_utf8_strncpy (g_utf8_offset_to_pointer (value, MAX_ATTRIBUTE_LENGTH - 3), "...", 3); - } - + if (g_utf8_strlen (value, -1) > MAX_ATTRIBUTE_LENGTH) + g_utf8_strncpy (g_utf8_offset_to_pointer (value, MAX_ATTRIBUTE_LENGTH - 1), "…", 1); tmp_value = _g_utf8_replace (value, "[\r\n]", " "); g_free (value); value = tmp_value; @@ -144,7 +152,7 @@ gtk_list_store_set (self->priv->tree_model, &iter, WEIGHT_COLUMN, PANGO_WEIGHT_BOLD, ID_COLUMN, category->id, - DISPLAY_NAME_COLUMN, category->display_name, + DISPLAY_NAME_COLUMN, _(category->display_name), POS_COLUMN, category->sort_order * CATEGORY_SIZE, -1); g_hash_table_insert (category_hash, g_strdup (info->category), category); @@ -219,14 +227,13 @@ if (self->priv->popup_menu != NULL) gtk_widget_destroy (self->priv->popup_menu); - G_OBJECT_CLASS (parent_class)->finalize (base); + G_OBJECT_CLASS (gth_file_properties_parent_class)->finalize (base); } static void gth_file_properties_class_init (GthFilePropertiesClass *klass) { - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthFilePropertiesPrivate)); G_OBJECT_CLASS (klass)->finalize = gth_file_properties_finalize; @@ -321,9 +328,10 @@ self->priv = GTH_FILE_PROPERTIES_GET_PRIVATE (self); + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL); gtk_box_set_spacing (GTK_BOX (self), 6); - vpaned = gtk_vpaned_new (); + vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL); gtk_widget_show (vpaned); gtk_box_pack_start (GTK_BOX (self), vpaned, TRUE, TRUE, 0); @@ -331,7 +339,8 @@ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_win), GTK_SHADOW_ETCHED_IN); gtk_widget_show (scrolled_win); - gtk_paned_pack1 (GTK_PANED (vpaned), scrolled_win, TRUE, TRUE); + gtk_widget_set_size_request (scrolled_win, -1, MIN_HEIGHT); + gtk_paned_pack1 (GTK_PANED (vpaned), scrolled_win, TRUE, FALSE); self->priv->tree_view = gtk_tree_view_new (); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (self->priv->tree_view), FALSE); @@ -414,20 +423,20 @@ self->priv->comment_win = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->priv->comment_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (self->priv->comment_win), GTK_SHADOW_ETCHED_IN); - gtk_paned_pack2 (GTK_PANED (vpaned), self->priv->comment_win, FALSE, TRUE); + gtk_widget_set_size_request (self->priv->comment_win, -1, COMMENT_DEFAULT_HEIGHT); + gtk_paned_pack2 (GTK_PANED (vpaned), self->priv->comment_win, FALSE, FALSE); self->priv->comment_view = gtk_text_view_new (); gtk_text_view_set_editable (GTK_TEXT_VIEW (self->priv->comment_view), FALSE); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (self->priv->comment_view), GTK_WRAP_WORD); gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (self->priv->comment_view), TRUE); - gtk_widget_set_size_request (self->priv->comment_view, -1, COMMENT_HEIGHT); gtk_widget_show (self->priv->comment_view); gtk_container_add (GTK_CONTAINER (self->priv->comment_win), self->priv->comment_view); } static void -gth_file_properties_gth_multipage_child_interface_init (GthMultipageChildIface *iface) +gth_file_properties_gth_multipage_child_interface_init (GthMultipageChildInterface *iface) { iface->get_name = gth_file_properties_real_get_name; iface->get_icon = gth_file_properties_real_get_icon; @@ -435,47 +444,7 @@ static void -gth_file_properties_gth_property_view_interface_init (GthPropertyViewIface *iface) +gth_file_properties_gth_property_view_interface_init (GthPropertyViewInterface *iface) { iface->set_file = gth_file_properties_real_set_file; } - - -GType -gth_file_properties_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFilePropertiesClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_properties_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileProperties), - 0, - (GInstanceInitFunc) gth_file_properties_init, - NULL - }; - static const GInterfaceInfo gth_multipage_child_info = { - (GInterfaceInitFunc) gth_file_properties_gth_multipage_child_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo gth_property_view_info = { - (GInterfaceInitFunc) gth_file_properties_gth_property_view_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - type = g_type_register_static (GTK_TYPE_VBOX, - "GthFileProperties", - &g_define_type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_MULTIPAGE_CHILD, >h_multipage_child_info); - g_type_add_interface_static (type, GTH_TYPE_PROPERTY_VIEW, >h_property_view_info); - } - - return type; -} diff -Nru gthumb-2.14.3/gthumb/gth-file-properties.h gthumb-3.0.0/gthumb/gth-file-properties.h --- gthumb-2.14.3/gthumb/gth-file-properties.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-properties.h 2012-03-06 15:26:06.000000000 +0000 @@ -39,12 +39,12 @@ typedef struct _GthFilePropertiesPrivate GthFilePropertiesPrivate; struct _GthFileProperties { - GtkVBox parent_instance; + GtkBox parent_instance; GthFilePropertiesPrivate *priv; }; struct _GthFilePropertiesClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; }; GType gth_file_properties_get_type (void); diff -Nru gthumb-2.14.3/gthumb/gth-file-selection.c gthumb-3.0.0/gthumb/gth-file-selection.c --- gthumb-2.14.3/gthumb/gth-file-selection.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-selection.c 2012-02-19 15:01:32.000000000 +0000 @@ -31,8 +31,11 @@ static guint gth_file_selection_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_INTERFACE (GthFileSelection, gth_file_selection, 0) + + static void -gth_file_selection_base_init (gpointer g_class) +gth_file_selection_default_init (GthFileSelectionInterface *iface) { static gboolean initialized = FALSE; @@ -41,7 +44,7 @@ g_signal_new ("file-selection-changed", GTH_TYPE_FILE_SELECTION, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GthFileSelectionIface, file_selection_changed), + G_STRUCT_OFFSET (GthFileSelectionInterface, file_selection_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); @@ -50,34 +53,6 @@ } -GType -gth_file_selection_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileSelectionIface), - (GBaseInitFunc) gth_file_selection_base_init, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) NULL, - (GClassFinalizeFunc) NULL, - NULL, - 0, - 0, - (GInstanceInitFunc) NULL, - NULL - }; - type = g_type_register_static (G_TYPE_INTERFACE, - "GthFileSelection", - &g_define_type_info, - 0); - } - - return type; -} - - void gth_file_selection_set_selection_mode (GthFileSelection *self, GtkSelectionMode mode) diff -Nru gthumb-2.14.3/gthumb/gth-file-selection.h gthumb-3.0.0/gthumb/gth-file-selection.h --- gthumb-2.14.3/gthumb/gth-file-selection.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-selection.h 2012-02-19 15:01:32.000000000 +0000 @@ -31,12 +31,12 @@ #define GTH_TYPE_FILE_SELECTION (gth_file_selection_get_type ()) #define GTH_FILE_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_FILE_SELECTION, GthFileSelection)) #define GTH_IS_FILE_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_FILE_SELECTION)) -#define GTH_FILE_SELECTION_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_FILE_SELECTION, GthFileSelectionIface)) +#define GTH_FILE_SELECTION_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_FILE_SELECTION, GthFileSelectionInterface)) typedef struct _GthFileSelection GthFileSelection; -typedef struct _GthFileSelectionIface GthFileSelectionIface; +typedef struct _GthFileSelectionInterface GthFileSelectionInterface; -struct _GthFileSelectionIface { +struct _GthFileSelectionInterface { GTypeInterface parent_iface; /*< signals >*/ diff -Nru gthumb-2.14.3/gthumb/gth-file-source.c gthumb-3.0.0/gthumb/gth-file-source.c --- gthumb-2.14.3/gthumb/gth-file-source.c 2011-12-11 16:09:39.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-source.c 2012-04-23 16:28:09.000000000 +0000 @@ -39,7 +39,7 @@ }; -static GObjectClass *parent_class = NULL; +G_DEFINE_TYPE (GthFileSource, gth_file_source, G_TYPE_OBJECT) /* -- queue -- */ @@ -862,7 +862,7 @@ file_source->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_source_parent_class)->finalize (object); } @@ -871,10 +871,9 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - object_class->finalize = gth_file_source_finalize; + class->get_entry_points = base_get_entry_points; class->get_current_list = base_get_current_list; class->to_gio_file = base_to_gio_file; @@ -901,34 +900,6 @@ } -GType -gth_file_source_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthFileSourceClass), - NULL, - NULL, - (GClassInitFunc) gth_file_source_class_init, - NULL, - NULL, - sizeof (GthFileSource), - 0, - (GInstanceInitFunc) gth_file_source_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthFileSource", - &type_info, - 0); - } - - return type; -} - - void gth_file_source_add_scheme (GthFileSource *file_source, const char *scheme) @@ -1329,6 +1300,8 @@ GFile *file, gboolean activate) { + g_return_if_fail (file != NULL); + GTH_FILE_SOURCE_GET_CLASS (G_OBJECT (file_source))->monitor_directory (file_source, file, activate); } diff -Nru gthumb-2.14.3/gthumb/gth-file-source-vfs.c gthumb-3.0.0/gthumb/gth-file-source-vfs.c --- gthumb-2.14.3/gthumb/gth-file-source-vfs.c 2012-02-05 10:14:04.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-source-vfs.c 2012-04-09 18:29:50.000000000 +0000 @@ -23,7 +23,6 @@ #include #include #include -#include "gconf-utils.h" #include "gth-file-data.h" #include "gio-utils.h" #include "glib-utils.h" @@ -53,12 +52,14 @@ }; -static GthFileSourceClass *parent_class = NULL; static guint mount_changed_event_id = 0; static guint mount_added_event_id = 0; static guint mount_removed_event_id = 0; +G_DEFINE_TYPE (GthFileSourceVfs, gth_file_source_vfs, GTH_TYPE_FILE_SOURCE) + + static GList * gth_file_source_vfs_add_special_dir (GList *list, GthFileSource *file_source, @@ -221,6 +222,8 @@ { GthFileSourceVfs *file_source_vfs = user_data; + performance (DEBUG_INFO, "gth_file_source_vfs_for_each_child end"); + gth_file_source_set_active (GTH_FILE_SOURCE (file_source_vfs), FALSE); file_source_vfs->priv->ready_func (G_OBJECT (file_source_vfs), error, @@ -297,6 +300,8 @@ g_cancellable_reset (gth_file_source_get_cancellable (file_source)); g_hash_table_remove_all (file_source_vfs->priv->hidden_files); + performance (DEBUG_INFO, "gth_file_source_vfs_for_each_child start"); + file_source_vfs->priv->start_dir_func = start_dir_func; file_source_vfs->priv->for_each_file_func = for_each_file_func; file_source_vfs->priv->ready_func = ready_func; @@ -388,7 +393,7 @@ GMount *mount, gpointer user_data) { - call_when_idle ((DataFunc) gth_monitor_file_entry_points_changed, gth_main_get_default_monitor ()); + call_when_idle ((DataFunc) gth_monitor_entry_points_changed, gth_main_get_default_monitor ()); } @@ -778,7 +783,10 @@ gth_file_mananger_trash_files (GtkWindow *window, GList *file_list /* GthFileData list */) { - if (eel_gconf_get_boolean (PREF_MSG_CONFIRM_DELETION, DEFAULT_MSG_CONFIRM_DELETION)) { + GSettings *settings; + + settings = g_settings_new (GTHUMB_MESSAGES_SCHEMA); + if (g_settings_get_boolean (settings, PREF_MSG_CONFIRM_DELETION)) { int file_count; char *prompt; GtkWidget *d; @@ -786,7 +794,8 @@ file_count = g_list_length (file_list); if (file_count == 1) { GthFileData *file_data = file_list->data; - prompt = g_strdup_printf (_("Are you sure you want to move \"%s\" to trash?"), g_file_info_get_display_name (file_data->info)); + prompt = g_strdup_printf (_("Are you sure you want to move \"%s\" to trash?"), + g_file_info_get_display_name (file_data->info)); } else prompt = g_strdup_printf (ngettext("Are you sure you want to move to trash " @@ -812,6 +821,8 @@ } else trash_files (window, file_list); + + g_object_unref (settings); } @@ -891,7 +902,7 @@ file_source_vfs->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_source_vfs_parent_class)->finalize (object); } @@ -901,11 +912,10 @@ GObjectClass *object_class; GthFileSourceClass *file_source_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - file_source_class = (GthFileSourceClass*) class; - object_class->finalize = gth_file_source_vfs_finalize; + + file_source_class = (GthFileSourceClass*) class; file_source_class->get_entry_points = gth_file_source_vfs_get_entry_points; file_source_class->to_gio_file = gth_file_source_vfs_to_gio_file; file_source_class->get_file_info = gth_file_source_vfs_get_file_info; @@ -930,31 +940,3 @@ for (i = 0; i < GTH_MONITOR_N_EVENTS; i++) file_source->priv->monitor_queue[i] = NULL; } - - -GType -gth_file_source_vfs_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthFileSourceVfsClass), - NULL, - NULL, - (GClassInitFunc) gth_file_source_vfs_class_init, - NULL, - NULL, - sizeof (GthFileSourceVfs), - 0, - (GInstanceInitFunc) gth_file_source_vfs_init - }; - - type = g_type_register_static (GTH_TYPE_FILE_SOURCE, - "GthFileSourceVfs", - &type_info, - 0); - } - - return type; -} diff -Nru gthumb-2.14.3/gthumb/gth-file-store.c gthumb-3.0.0/gthumb/gth-file-store.c --- gthumb-2.14.3/gthumb/gth-file-store.c 2012-03-24 16:41:37.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-store.c 2012-04-09 18:58:04.000000000 +0000 @@ -23,6 +23,8 @@ #include #include "glib-utils.h" #include "gth-file-store.h" +#include "gth-marshal.h" +#include "gth-string-list.h" #undef DEBUG_FILE_STORE @@ -31,8 +33,8 @@ enum { - CHECK_CHANGED, VISIBILITY_CHANGED, + THUMBNAIL_CHANGED, LAST_SIGNAL }; @@ -42,19 +44,18 @@ typedef struct { + int ref_count; + GthFileData *file_data; GdkPixbuf *thumbnail; - gboolean is_icon; - char *metadata; - gboolean checked; + gboolean is_icon : 1; /*< private >*/ - guint ref_count; guint pos; guint abs_pos; - gboolean visible; - gboolean changed; + gboolean visible : 1; + gboolean changed : 1; } GthFileRow; @@ -70,13 +71,22 @@ GthTest *filter; GList *queue; GthFileDataCompFunc cmp_func; - gboolean inverse_sort; - gboolean update_filter; - gboolean check_changed; + gboolean inverse_sort : 1; + gboolean update_filter : 1; }; -static GObjectClass *parent_class = NULL; +static void gtk_tree_model_interface_init (GtkTreeModelIface *iface); +static void gtk_tree_drag_source_interface_init (GtkTreeDragSourceIface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthFileStore, + gth_file_store, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, + gtk_tree_model_interface_init) + G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE, + gtk_tree_drag_source_interface_init)) static GthFileRow * @@ -117,21 +127,6 @@ } -static void -_gth_file_row_set_metadata (GthFileRow *row, - const char *metadata) -{ - if (metadata == NULL) - return; - - if (metadata == row->metadata) - return; - - g_free (row->metadata); - row->metadata = g_strdup (metadata); -} - - GthFileRow * _gth_file_row_copy (GthFileRow *row) { @@ -140,9 +135,7 @@ row2 = _gth_file_row_new (); _gth_file_row_set_file (row2, row->file_data); _gth_file_row_set_thumbnail (row2, row->thumbnail); - _gth_file_row_set_metadata (row2, row->metadata); row2->is_icon = row->is_icon; - row2->checked = row->checked; row2->pos = row->pos; row2->abs_pos = row->abs_pos; row2->visible = row->visible; @@ -170,7 +163,6 @@ g_object_unref (row->file_data); if (row->thumbnail != NULL) g_object_unref (row->thumbnail); - g_free (row->metadata); g_free (row); } @@ -212,67 +204,68 @@ file_store = GTH_FILE_STORE (object); - if (file_store->priv != NULL) { - _gth_file_store_free_rows (file_store); - if (file_store->priv->filter != NULL) - g_object_unref (file_store->priv->filter); - g_free (file_store->priv); - file_store->priv = NULL; - } + _gth_file_store_free_rows (file_store); + _g_object_unref (file_store->priv->filter); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_store_parent_class)->finalize (object); } static void -gth_file_store_class_init (GthFileStoreClass *class) +gth_file_store_class_init (GthFileStoreClass *klass) { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (klass, sizeof (GthFileStorePrivate)); - object_class = (GObjectClass*) class; + object_class = (GObjectClass*) klass; object_class->finalize = gth_file_store_finalize; - gth_file_store_signals[CHECK_CHANGED] = - g_signal_new ("check_changed", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GthFileStoreClass, check_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); gth_file_store_signals[VISIBILITY_CHANGED] = g_signal_new ("visibility_changed", - G_TYPE_FROM_CLASS (class), + G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GthFileStoreClass, visibility_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); + gth_file_store_signals[THUMBNAIL_CHANGED] = + g_signal_new ("thumbnail-changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GthFileStoreClass, thumbnail_changed), + NULL, NULL, + gth_marshal_VOID__BOXED_BOXED, + G_TYPE_NONE, + 2, + GTK_TYPE_TREE_PATH, + GTK_TYPE_TREE_ITER); } static void gth_file_store_init (GthFileStore *file_store) { - file_store->priv = g_new0 (GthFileStorePrivate, 1); + file_store->priv = G_TYPE_INSTANCE_GET_PRIVATE (file_store, GTH_TYPE_FILE_STORE, GthFileStorePrivate); + file_store->priv->all_rows = NULL; file_store->priv->rows = NULL; file_store->priv->size = 0; + file_store->priv->tot_rows = 0; file_store->priv->num_rows = 0; file_store->priv->stamp = g_random_int (); + file_store->priv->load_thumbs = FALSE; file_store->priv->filter = gth_test_new (); + file_store->priv->queue = NULL; + file_store->priv->cmp_func = NULL; + file_store->priv->inverse_sort = FALSE; + file_store->priv->update_filter = FALSE; if (column_type[0] == G_TYPE_INVALID) { column_type[GTH_FILE_STORE_FILE_DATA_COLUMN] = GTH_TYPE_FILE_DATA; column_type[GTH_FILE_STORE_THUMBNAIL_COLUMN] = GDK_TYPE_PIXBUF; column_type[GTH_FILE_STORE_IS_ICON_COLUMN] = G_TYPE_BOOLEAN; - column_type[GTH_FILE_STORE_FILENAME_COLUMN] = G_TYPE_STRING; - column_type[GTH_FILE_STORE_METADATA_COLUMN] = G_TYPE_STRING; - column_type[GTH_FILE_STORE_METADATA_VISIBLE_COLUMN] = G_TYPE_BOOLEAN; - column_type[GTH_FILE_STORE_CHECKED_COLUMN] = G_TYPE_BOOLEAN; + column_type[GTH_FILE_STORE_EMBLEMS_COLUMN] = GTH_TYPE_STRING_LIST; } } @@ -280,7 +273,7 @@ static GtkTreeModelFlags gth_file_store_get_flags (GtkTreeModel *tree_model) { - return GTK_TREE_MODEL_LIST_ONLY /*| GTK_TREE_MODEL_ITERS_PERSIST*/; + return GTK_TREE_MODEL_LIST_ONLY; } @@ -384,21 +377,9 @@ g_value_init (value, G_TYPE_BOOLEAN); g_value_set_boolean (value, row->is_icon); break; - case GTH_FILE_STORE_FILENAME_COLUMN: + case GTH_FILE_STORE_EMBLEMS_COLUMN: g_value_init (value, G_TYPE_STRING); - g_value_set_string (value, g_file_info_get_display_name (row->file_data->info)); - break; - case GTH_FILE_STORE_METADATA_COLUMN: - g_value_init (value, G_TYPE_STRING); - g_value_set_string (value, row->metadata); - break; - case GTH_FILE_STORE_METADATA_VISIBLE_COLUMN: - g_value_init (value, G_TYPE_BOOLEAN); - g_value_set_boolean (value, (row->metadata != NULL) && ! g_str_equal (row->metadata, "")); - break; - case GTH_FILE_STORE_CHECKED_COLUMN: - g_value_init (value, G_TYPE_BOOLEAN); - g_value_set_boolean (value, row->checked); + g_value_set_object (value, g_file_info_get_attribute_object (row->file_data->info, GTH_FILE_ATTRIBUTE_EMBLEMS)); break; } } @@ -430,6 +411,31 @@ static gboolean +gth_file_store_iter_previous (GtkTreeModel *tree_model, + GtkTreeIter *iter) +{ + GthFileStore *file_store; + GthFileRow *row; + + if ((iter == NULL) || (iter->user_data == NULL)) + return FALSE; + + file_store = (GthFileStore *) tree_model; + + g_return_val_if_fail (VALID_ITER (iter, file_store), FALSE); + + row = (GthFileRow*) iter->user_data; + if (row->pos == 0) + return FALSE; + + iter->stamp = file_store->priv->stamp; + iter->user_data = file_store->priv->rows[row->pos - 1]; + + return TRUE; +} + + +static gboolean gth_file_store_iter_children (GtkTreeModel *tree_model, GtkTreeIter *iter, GtkTreeIter *parent) @@ -594,7 +600,7 @@ static void -gtk_tree_model_iface_init (GtkTreeModelIface *iface) +gtk_tree_model_interface_init (GtkTreeModelIface *iface) { iface->get_flags = gth_file_store_get_flags; iface->get_n_columns = gth_file_store_get_n_columns; @@ -603,6 +609,7 @@ iface->get_path = gth_file_store_get_path; iface->get_value = gth_file_store_get_value; iface->iter_next = gth_file_store_iter_next; + iface->iter_previous = gth_file_store_iter_previous; iface->iter_children = gth_file_store_iter_children; iface->iter_has_child = gth_file_store_iter_has_child; iface->iter_n_children = gth_file_store_iter_n_children; @@ -612,7 +619,7 @@ static void -gtk_tree_drag_source_iface_init (GtkTreeDragSourceIface *iface) +gtk_tree_drag_source_interface_init (GtkTreeDragSourceIface *iface) { iface->row_draggable = gth_file_store_row_draggable; iface->drag_data_get = gth_file_store_drag_data_get; @@ -620,43 +627,6 @@ } -GType -gth_file_store_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthFileStoreClass), - NULL, - NULL, - (GClassInitFunc) gth_file_store_class_init, - NULL, - NULL, - sizeof (GthFileStore), - 0, - (GInstanceInitFunc) gth_file_store_init - }; - static const GInterfaceInfo gtk_tree_model_info = { - (GInterfaceInitFunc) gtk_tree_model_iface_init, - NULL, - NULL - }; - static const GInterfaceInfo gtk_tree_drag_source_info = { - (GInterfaceInitFunc) gtk_tree_drag_source_iface_init, - NULL, - NULL - }; - - type = g_type_register_static (G_TYPE_OBJECT, "GthFileStore", &type_info, 0); - g_type_add_interface_static (type, GTK_TYPE_TREE_MODEL, >k_tree_model_info); - g_type_add_interface_static (type, GTK_TYPE_TREE_DRAG_SOURCE, >k_tree_drag_source_info); - } - - return type; -} - - GthFileStore * gth_file_store_new (void) { @@ -700,23 +670,6 @@ } -static void -_gth_file_store_row_changed (GthFileStore *file_store, - GthFileRow *row) -{ - GtkTreePath *path; - GtkTreeIter iter; - - path = gtk_tree_path_new (); - gtk_tree_path_append_index (path, row->pos); - gth_file_store_get_iter (GTK_TREE_MODEL (file_store), &iter, path); - - gtk_tree_model_row_changed (GTK_TREE_MODEL (file_store), path, &iter); - - gtk_tree_path_free (path); -} - - static int campare_row_func (gconstpointer a, gconstpointer b, @@ -829,10 +782,12 @@ guint new_rows_n = 0; int i; GList *files; + GHashTable *files_index; GList *scan; GthFileData *file; int j, k; gboolean row_deleted; + GHashTable *new_rows_index; #ifdef DEBUG_FILE_STORE @@ -873,11 +828,18 @@ _gth_file_store_sort (file_store, all_rows, all_rows_n); + /* store the new_rows file positions in an hash table for + * faster searching. */ + files_index = g_hash_table_new (g_direct_hash, g_direct_equal); files = NULL; for (i = 0; i < all_rows_n; i++) { GthFileRow *row = all_rows[i]; row->abs_pos = i; + /* store i + 1 instead of i to distinguish when a file is + * present and when the file is in the first position. + * (g_hash_table_lookup returns NULL if the file is not present) */ + g_hash_table_insert (files_index, row->file_data, GINT_TO_POINTER (i + 1)); files = g_list_prepend (files, g_object_ref (row->file_data)); } files = g_list_reverse (files); @@ -885,21 +847,16 @@ new_rows_n = 0; gth_test_set_file_list (file_store->priv->filter, files); while ((file = gth_test_get_next (file_store->priv->filter)) != NULL) { - GthFileRow *row = NULL; - - for (i = 0; i < all_rows_n; i++) { - row = all_rows[i]; - if (row->file_data == file) - break; - } + i = GPOINTER_TO_INT (g_hash_table_lookup (files_index, file)); + g_assert (i != 0); + i--; /* in files_index (i + 1) was stored, see above. */ - g_assert (i < all_rows_n); - - row->visible = TRUE; + all_rows[i]->visible = TRUE; new_rows_n++; } _g_object_list_unref (files); + g_hash_table_unref (files_index); /* create the new visible rows array */ @@ -918,15 +875,18 @@ /* hide filtered out files */ + /* store the new_rows file positions in an hash table for + * faster searching. */ + new_rows_index = g_hash_table_new (g_direct_hash, g_direct_equal); + for (j = 0; j < new_rows_n; j++) + g_hash_table_insert (new_rows_index, new_rows[j]->file_data, GINT_TO_POINTER (j + 1)); + row_deleted = FALSE; for (i = old_rows_n - 1; i >= 0; i--) { /* search old_rows[i] in new_rows */ - for (j = 0; j < new_rows_n; j++) - if (old_rows[i]->file_data == new_rows[j]->file_data) - break; - - if (j < new_rows_n) + j = GPOINTER_TO_INT (g_hash_table_lookup (new_rows_index, old_rows[i]->file_data)); + if (j > 0) continue; /* old_rows[i] is not present in new_rows, emit a deleted @@ -942,6 +902,8 @@ row_deleted = TRUE; } + g_hash_table_unref (new_rows_index); + /* compact the old visible rows array if needed */ if (row_deleted) { @@ -960,21 +922,26 @@ * Reorder the two arrays according to the new_rows order */ if (old_rows_n > 0) { + GHashTable *old_rows_index; gboolean order_changed; int *new_order; GthFileRow *tmp_row; + /* store the old_rows file positions in an hash table for + * faster searching. */ + old_rows_index = g_hash_table_new (g_direct_hash, g_direct_equal); + for (j = 0; j < old_rows_n; j++) + g_hash_table_insert (old_rows_index, old_rows[j]->file_data, GINT_TO_POINTER (j + 1)); + order_changed = FALSE; new_order = g_new0 (int, old_rows_n); for (i = 0, k = 0; i < new_rows_n; i++) { /* search new_rows[i] in old_rows */ - for (j = 0; j < old_rows_n; j++) - if (new_rows[i]->file_data == old_rows[j]->file_data) - break; - - if (j >= old_rows_n) + j = GPOINTER_TO_INT (g_hash_table_lookup (old_rows_index, new_rows[i]->file_data)); + if (j == 0) continue; + j--; /* in old_rows_index we stored j+1, decrement to get the real position */ /* old_rows[j] == new_rows[i] */ @@ -1018,6 +985,7 @@ } g_free (new_order); + g_hash_table_unref (old_rows_index); } /* set the new state */ @@ -1074,7 +1042,6 @@ } g_signal_emit (file_store, gth_file_store_signals[VISIBILITY_CHANGED], 0); - g_signal_emit (file_store, gth_file_store_signals[CHECK_CHANGED], 0); g_free (new_rows); g_free (old_rows); @@ -1184,40 +1151,6 @@ } -GList * -gth_file_store_get_checked (GthFileStore *file_store) -{ - GList *list = NULL; - int i; - - for (i = 0; i < file_store->priv->num_rows; i++) { - GthFileRow *row = file_store->priv->rows[i]; - - if ((row != NULL) && row->checked) - list = g_list_prepend (list, g_object_ref (file_store->priv->rows[i]->file_data)); - } - - return g_list_reverse (list); -} - - -int -gth_file_store_get_n_checked (GthFileStore *file_store) -{ - int n = 0; - int i; - - for (i = 0; i < file_store->priv->num_rows; i++) { - GthFileRow *row = file_store->priv->rows[i]; - - if ((row != NULL) && row->checked) - n++; - } - - return n; -} - - GthFileData * gth_file_store_get_file (GthFileStore *file_store, GtkTreeIter *iter) @@ -1421,11 +1354,9 @@ GthFileData *file, GdkPixbuf *thumbnail, gboolean is_icon, - const char *metadata, - gboolean checked, int position) { - gth_file_store_queue_add (file_store, file, thumbnail, is_icon, metadata, checked); + gth_file_store_queue_add (file_store, file, thumbnail, is_icon); gth_file_store_exec_add (file_store, position); } @@ -1434,9 +1365,7 @@ gth_file_store_queue_add (GthFileStore *file_store, GthFileData *file, GdkPixbuf *thumbnail, - gboolean is_icon, - const char *metadata, - gboolean checked) + gboolean is_icon) { GthFileRow *row; @@ -1445,9 +1374,7 @@ row = _gth_file_row_new (); _gth_file_row_set_file (row, file); _gth_file_row_set_thumbnail (row, thumbnail); - _gth_file_row_set_metadata (row, metadata); row->is_icon = is_icon; - row->checked = checked; file_store->priv->queue = g_list_prepend (file_store->priv->queue, row); } @@ -1474,11 +1401,11 @@ row = (GthFileRow*) iter->user_data; - column = va_arg (var_args, int); + column = va_arg (var_args, int); while (column != -1) { - GthFileData *file_data; - GdkPixbuf *thumbnail; - const char *metadata; + GthFileData *file_data; + GdkPixbuf *thumbnail; + GthStringList *string_list; switch (column) { case GTH_FILE_STORE_FILE_DATA_COLUMN: @@ -1498,17 +1425,10 @@ row->is_icon = va_arg (var_args, gboolean); row->changed = TRUE; break; - case GTH_FILE_STORE_METADATA_COLUMN: - metadata = va_arg (var_args, const char *); - _gth_file_row_set_metadata (row, metadata); - row->changed = TRUE; - break; - case GTH_FILE_STORE_METADATA_VISIBLE_COLUMN: - break; - case GTH_FILE_STORE_CHECKED_COLUMN: - row->checked = va_arg (var_args, gboolean); + case GTH_FILE_STORE_EMBLEMS_COLUMN: + string_list = va_arg (var_args, GthStringList *); + g_file_info_set_attribute_object (row->file_data->info, GTH_FILE_ATTRIBUTE_EMBLEMS, G_OBJECT (string_list)); row->changed = TRUE; - file_store->priv->check_changed = TRUE; break; default: g_warning ("%s: Invalid column number %d added to iter (remember to end your list of columns with a -1)", G_STRLOC, column); @@ -1549,6 +1469,25 @@ static void +_gth_file_store_row_changed (GthFileStore *file_store, + GthFileRow *row) +{ + GtkTreePath *path; + GtkTreeIter iter; + + path = gtk_tree_path_new (); + gtk_tree_path_append_index (path, row->pos); + + iter.stamp = file_store->priv->stamp; + iter.user_data = row; + + gtk_tree_model_row_changed (GTK_TREE_MODEL (file_store), path, &iter); + + gtk_tree_path_free (path); +} + + +static void _gth_file_store_list_changed (GthFileStore *file_store) { int i; @@ -1563,19 +1502,60 @@ } +static void +_gth_file_store_thumbnail_changed (GthFileStore *file_store, + GthFileRow *row) +{ + GtkTreePath *path; + GtkTreeIter iter; + + path = gtk_tree_path_new (); + gtk_tree_path_append_index (path, row->pos); + + iter.stamp = file_store->priv->stamp; + iter.user_data = row; + + g_signal_emit (file_store, gth_file_store_signals[THUMBNAIL_CHANGED], 0, path, &iter); + + gtk_tree_path_free (path); +} + + +static void +_gth_file_store_thumbnails_changed (GthFileStore *file_store) +{ + int i; + + for (i = 0; i < file_store->priv->num_rows; i++) { + GthFileRow *row = file_store->priv->rows[i]; + + if (row->visible && row->changed) + _gth_file_store_thumbnail_changed (file_store, row); + row->changed = FALSE; + } +} + + void gth_file_store_exec_set (GthFileStore *file_store) { - _gth_file_store_list_changed (file_store); + /* This is an speed optimization. When the thumbnails are updated in + * the store the visibility doesn't need to be updated, so we avoid to + * emit the 'row-changed' signal for each row, which causes the + * GtkIconView to invalidate the size of all the items, and instead + * emit a single 'thumbnail-changed' signal that can be used to just + * redraw the GthFileView. */ + if (file_store->priv->update_filter) + _gth_file_store_list_changed (file_store); + else + _gth_file_store_thumbnails_changed (file_store); + _gth_file_store_clear_queue (file_store); + if (file_store->priv->update_filter) { _gth_file_store_update_visibility (file_store, NULL, -1); file_store->priv->update_filter = FALSE; } - else if (file_store->priv->check_changed) { - g_signal_emit (file_store, gth_file_store_signals[CHECK_CHANGED], 0); - file_store->priv->check_changed = FALSE; - } } diff -Nru gthumb-2.14.3/gthumb/gth-file-store.h gthumb-3.0.0/gthumb/gth-file-store.h --- gthumb-2.14.3/gthumb/gth-file-store.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-store.h 2012-04-09 18:58:11.000000000 +0000 @@ -43,10 +43,7 @@ GTH_FILE_STORE_FILE_DATA_COLUMN, GTH_FILE_STORE_THUMBNAIL_COLUMN, GTH_FILE_STORE_IS_ICON_COLUMN, - GTH_FILE_STORE_FILENAME_COLUMN, - GTH_FILE_STORE_METADATA_COLUMN, - GTH_FILE_STORE_METADATA_VISIBLE_COLUMN, - GTH_FILE_STORE_CHECKED_COLUMN, + GTH_FILE_STORE_EMBLEMS_COLUMN, GTH_FILE_STORE_N_COLUMNS }; @@ -61,7 +58,9 @@ GObjectClass __parent_class; void (*visibility_changed) (GthFileStore *self); - void (*check_changed) (GthFileStore *self); + void (*thumbnail_changed) (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter); }; GType gth_file_store_get_type (void) G_GNUC_CONST; @@ -75,8 +74,6 @@ int gth_file_store_n_files (GthFileStore *file_store); GList * gth_file_store_get_visibles (GthFileStore *file_store); int gth_file_store_n_visibles (GthFileStore *file_store); -GList * gth_file_store_get_checked (GthFileStore *file_store); -int gth_file_store_get_n_checked (GthFileStore *file_store); GthFileData * gth_file_store_get_file (GthFileStore *file_store, GtkTreeIter *iter); gboolean gth_file_store_find (GthFileStore *file_store, @@ -105,15 +102,11 @@ GthFileData *file, GdkPixbuf *thumbnail, gboolean is_icon, - const char *metadata, - gboolean checked, int position); void gth_file_store_queue_add (GthFileStore *file_store, GthFileData *file, GdkPixbuf *thumbnail, - gboolean is_icon, - const char *metadata, - gboolean checked); + gboolean is_icon); void gth_file_store_exec_add (GthFileStore *file_store, int position); void gth_file_store_set (GthFileStore *file_store, diff -Nru gthumb-2.14.3/gthumb/gth-file-tool.c gthumb-3.0.0/gthumb/gth-file-tool.c --- gthumb-2.14.3/gthumb/gth-file-tool.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-tool.c 2012-02-19 15:01:32.000000000 +0000 @@ -30,7 +30,6 @@ }; -static gpointer parent_class = NULL; static guint gth_file_tool_signals[LAST_SIGNAL] = { 0 }; @@ -43,6 +42,9 @@ }; +G_DEFINE_TYPE (GthFileTool, gth_file_tool, GTK_TYPE_BUTTON) + + static void gth_file_tool_base_update_sensitivity (GthFileTool *self) { @@ -78,7 +80,7 @@ g_return_if_fail (GTH_IS_FILE_TOOL (object)); /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_file_tool_parent_class)->finalize (object); } @@ -87,7 +89,6 @@ { GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthFileToolPrivate)); gobject_class = (GObjectClass*) klass; @@ -120,7 +121,7 @@ static void -gth_file_tool_instance_init (GthFileTool *self) +gth_file_tool_init (GthFileTool *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_FILE_TOOL, GthFileToolPrivate); self->priv->icon_name = NULL; @@ -131,28 +132,6 @@ } -GType -gth_file_tool_get_type (void) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileToolClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_file_tool_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthFileTool), - 0, - (GInstanceInitFunc) gth_file_tool_instance_init, - NULL - }; - type_id = g_type_register_static (GTK_TYPE_BUTTON, "GthFileTool", &g_define_type_info, 0); - } - return type_id; -} - - void gth_file_tool_construct (GthFileTool *self, const char *icon_name, @@ -169,7 +148,7 @@ self->priv->options_title = options_title; self->priv->separator = separator; - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); gtk_widget_show (icon); diff -Nru gthumb-2.14.3/gthumb/gth-file-view.c gthumb-3.0.0/gthumb/gth-file-view.c --- gthumb-2.14.3/gthumb/gth-file-view.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-view.c 2012-02-19 15:01:32.000000000 +0000 @@ -19,10 +19,15 @@ * along with this program. If not, see . */ +#include #include "gth-file-view.h" +#define DEFAULT_THUMBNAIL_SIZE 128 + + enum { + CURSOR_CHANGED, FILE_ACTIVATED, LAST_SIGNAL }; @@ -31,51 +36,56 @@ static guint gth_file_view_signals[LAST_SIGNAL] = { 0 }; -static void -gth_file_view_base_init (gpointer g_class) -{ - static gboolean initialized = FALSE; - - if (! initialized) { - gth_file_view_signals[FILE_ACTIVATED] = - g_signal_new ("file-activated", - GTH_TYPE_FILE_VIEW, - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GthFileViewIface, file_activated), - NULL, NULL, - g_cclosure_marshal_VOID__BOXED, - G_TYPE_NONE, 1, - GTK_TYPE_TREE_PATH); - initialized = TRUE; - } -} +G_DEFINE_INTERFACE (GthFileView, gth_file_view, 0) -GType -gth_file_view_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthFileViewIface), - (GBaseInitFunc) gth_file_view_base_init, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) NULL, - (GClassFinalizeFunc) NULL, - NULL, - 0, - 0, - (GInstanceInitFunc) NULL, - NULL - }; - type = g_type_register_static (G_TYPE_INTERFACE, - "GthFileView", - &g_define_type_info, - 0); - } +static void +gth_file_view_default_init (GthFileViewInterface *iface) +{ + /* signals */ - return type; + gth_file_view_signals[CURSOR_CHANGED] = + g_signal_new ("cursor-changed", + GTH_TYPE_FILE_VIEW, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GthFileViewInterface, cursor_changed), + NULL, NULL, + g_cclosure_marshal_VOID__INT, + G_TYPE_NONE, 1, + G_TYPE_INT); + + gth_file_view_signals[FILE_ACTIVATED] = + g_signal_new ("file-activated", + GTH_TYPE_FILE_VIEW, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GthFileViewInterface, file_activated), + NULL, NULL, + g_cclosure_marshal_VOID__BOXED, + G_TYPE_NONE, 1, + GTK_TYPE_TREE_PATH); + + /* properties */ + + g_object_interface_install_property (iface, + g_param_spec_string ("caption", + "Caption", + "The file attributes to view in the caption", + "none", + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + g_object_interface_install_property (iface, + g_param_spec_object ("model", + "Data Store", + "The data to view", + GTK_TYPE_TREE_MODEL, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + g_object_interface_install_property (iface, + g_param_spec_int ("thumbnail-size", + "Thumbnail size", + "The max width and height of the thumbnails", + 0, + G_MAXINT32, + DEFAULT_THUMBNAIL_SIZE, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); } @@ -83,14 +93,68 @@ gth_file_view_set_model (GthFileView *self, GtkTreeModel *model) { - GTH_FILE_VIEW_GET_INTERFACE (self)->set_model (self, model); + g_return_if_fail (GTH_IS_FILE_VIEW (self)); + + g_object_set (self, "model", model, NULL); } GtkTreeModel * gth_file_view_get_model (GthFileView *self) { - return GTH_FILE_VIEW_GET_INTERFACE (self)->get_model (self); + GtkTreeModel *model; + + g_return_val_if_fail (GTH_IS_FILE_VIEW (self), NULL); + + g_object_get (self, "model", &model, NULL); + + return model; +} + + +void +gth_file_view_set_caption (GthFileView *self, + const char *attributes) +{ + g_return_if_fail (GTH_IS_FILE_VIEW (self)); + + g_object_set (self, "caption", attributes, NULL); +} + + +char * +gth_file_view_get_caption (GthFileView *self) +{ + char *attributes; + + g_return_val_if_fail (GTH_IS_FILE_VIEW (self), NULL); + + g_object_get (self, "caption", &attributes, NULL); + + return attributes; +} + + +void +gth_file_view_set_thumbnail_size (GthFileView *self, + int value) +{ + g_return_if_fail (GTH_IS_FILE_VIEW (self)); + + g_object_set (self, "thumbnail-size", value, NULL); +} + + +gboolean +gth_file_view_get_thumbnail_size (GthFileView *self) +{ + int value; + + g_return_val_if_fail (GTH_IS_FILE_VIEW (self), FALSE); + + g_object_get (self, "thumbnail-size", &value, NULL); + + return value; } @@ -138,7 +202,14 @@ gth_file_view_activated (GthFileView *self, int pos) { - GTH_FILE_VIEW_GET_INTERFACE (self)->activated (self, pos); + GtkTreePath *path; + + g_return_if_fail (GTH_IS_FILE_VIEW (self)); + + path = gtk_tree_path_new_from_indices (pos, -1); + g_signal_emit (self, gth_file_view_signals[FILE_ACTIVATED], 0, path); + + gtk_tree_path_free (path); } @@ -146,7 +217,9 @@ gth_file_view_set_cursor (GthFileView *self, int pos) { - GTH_FILE_VIEW_GET_INTERFACE (self)->set_cursor (self, pos); + g_return_if_fail (GTH_IS_FILE_VIEW (self)); + + g_signal_emit (self, gth_file_view_signals[CURSOR_CHANGED], 0, pos); } @@ -158,14 +231,6 @@ void -gth_file_view_set_spacing (GthFileView *self, - int spacing) -{ - GTH_FILE_VIEW_GET_INTERFACE (self)->set_spacing (self, spacing); -} - - -void gth_file_view_enable_drag_source (GthFileView *self, GdkModifierType start_button_mask, const GtkTargetEntry *targets, @@ -212,36 +277,9 @@ } -GtkCellLayout * -gth_file_view_add_renderer (GthFileView *self, - GthFileViewRendererType renderer_type, - GtkCellRenderer *renderer) -{ - return GTH_FILE_VIEW_GET_INTERFACE (self)->add_renderer (self, renderer_type, renderer); -} - - -void -gth_file_view_update_attributes (GthFileView *self, - GtkCellRenderer *checkbox_renderer, - GtkCellRenderer *thumbnail_renderer, - GtkCellRenderer *text_renderer, - int thumb_size) -{ - GTH_FILE_VIEW_GET_INTERFACE (self)->update_attributes (self, checkbox_renderer, thumbnail_renderer, text_renderer, thumb_size); -} - - -gboolean -gth_file_view_truncate_metadata (GthFileView *self) -{ - return GTH_FILE_VIEW_GET_INTERFACE (self)->truncate_metadata (self); -} - - void -gth_file_view_activate_file (GthFileView *self, - GtkTreePath *path) +gth_file_view_get_drag_dest_pos (GthFileView *self, + int *pos) { - g_signal_emit (self, gth_file_view_signals[FILE_ACTIVATED], 0, path); + GTH_FILE_VIEW_GET_INTERFACE (self)->get_drag_dest_pos (self, pos); } diff -Nru gthumb-2.14.3/gthumb/gth-file-view.h gthumb-3.0.0/gthumb/gth-file-view.h --- gthumb-2.14.3/gthumb/gth-file-view.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-file-view.h 2012-02-19 15:01:32.000000000 +0000 @@ -31,12 +31,10 @@ #define GTH_TYPE_FILE_VIEW (gth_file_view_get_type ()) #define GTH_FILE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_FILE_VIEW, GthFileView)) #define GTH_IS_FILE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_FILE_VIEW)) -#define GTH_FILE_VIEW_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_FILE_VIEW, GthFileViewIface)) +#define GTH_FILE_VIEW_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_FILE_VIEW, GthFileViewInterface)) typedef struct _GthFileView GthFileView; -typedef struct _GthFileViewIface GthFileViewIface; - -#define THUMBNAIL_BORDER (8 * 2) +typedef struct _GthFileViewInterface GthFileViewInterface; typedef enum { GTH_VISIBILITY_NONE, @@ -52,19 +50,18 @@ GTH_FILE_VIEW_RENDERER_TEXT } GthFileViewRendererType; -struct _GthFileViewIface { +struct _GthFileViewInterface { GTypeInterface parent_iface; /*< signals >*/ + void (*cursor_changed) (GthFileView *self, + int pos); void (*file_activated) (GthFileView *self, - GtkTreePath *path); + int pos); /*< virtual functions >*/ - void (*set_model) (GthFileView *self, - GtkTreeModel *model); - GtkTreeModel * (*get_model) (GthFileView *self); void (*scroll_to) (GthFileView *self, int pos, double yalign); @@ -75,13 +72,7 @@ int y); int (*get_first_visible) (GthFileView *self); int (*get_last_visible) (GthFileView *self); - void (*activated) (GthFileView *self, - int pos); - void (*set_cursor) (GthFileView *self, - int pos); int (*get_cursor) (GthFileView *self); - void (*set_spacing) (GthFileView *self, - int spacing); void (*enable_drag_source) (GthFileView *self, GdkModifierType start_button_mask, const GtkTargetEntry *targets, @@ -99,21 +90,21 @@ int y, guint time, int *pos); - GtkCellLayout * (*add_renderer) (GthFileView *self, - GthFileViewRendererType renderer_type, - GtkCellRenderer *renderer); - void (*update_attributes) (GthFileView *self, - GtkCellRenderer *checkbox_renderer, - GtkCellRenderer *thumbnail_renderer, - GtkCellRenderer *text_renderer, - int thumb_size); - gboolean (*truncate_metadata) (GthFileView *self); + void (*get_drag_dest_pos) (GthFileView *self, + int *pos); + }; GType gth_file_view_get_type (void); void gth_file_view_set_model (GthFileView *self, GtkTreeModel *model); GtkTreeModel * gth_file_view_get_model (GthFileView *self); +void gth_file_view_set_caption (GthFileView *self, + const char *attributes); +char * gth_file_view_get_caption (GthFileView *self); +void gth_file_view_set_thumbnail_size (GthFileView *self, + int value); +gboolean gth_file_view_get_thumbnail_size (GthFileView *self); void gth_file_view_scroll_to (GthFileView *self, int pos, double yalign); @@ -129,8 +120,6 @@ void gth_file_view_set_cursor (GthFileView *self, int pos); int gth_file_view_get_cursor (GthFileView *self); -void gth_file_view_set_spacing (GthFileView *self, - int spacing); void gth_file_view_enable_drag_source (GthFileView *self, GdkModifierType start_button_mask, const GtkTargetEntry *targets, @@ -148,17 +137,8 @@ int y, guint time, int *pos); -GtkCellLayout * gth_file_view_add_renderer (GthFileView *self, - GthFileViewRendererType renderer_type, - GtkCellRenderer *renderer); -void gth_file_view_update_attributes (GthFileView *self, - GtkCellRenderer *checkbox_renderer, - GtkCellRenderer *thumbnail_renderer, - GtkCellRenderer *text_renderer, - int thumb_size); -gboolean gth_file_view_truncate_metadata (GthFileView *self); -void gth_file_view_activate_file (GthFileView *self, - GtkTreePath *path); +void gth_file_view_get_drag_dest_pos (GthFileView *self, + int *pos); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/gth-filterbar.c gthumb-3.0.0/gthumb/gth-filterbar.c --- gthumb-2.14.3/gthumb/gth-filterbar.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-filterbar.c 2012-03-06 15:26:06.000000000 +0000 @@ -63,10 +63,12 @@ }; -static GtkHBoxClass *parent_class = NULL; static guint gth_filterbar_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (GthFilterbar, gth_filterbar, GTK_TYPE_BOX) + + static void gth_filterbar_finalize (GObject *object) { @@ -82,7 +84,7 @@ filterbar->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_filterbar_parent_class)->finalize (object); } @@ -91,8 +93,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass*) class; object_class->finalize = gth_filterbar_finalize; @@ -130,6 +130,7 @@ gth_filterbar_init (GthFilterbar *filterbar) { filterbar->priv = g_new0 (GthFilterbarPrivate, 1); + gtk_orientable_set_orientation (GTK_ORIENTABLE (filterbar), GTK_ORIENTATION_HORIZONTAL); } @@ -392,7 +393,7 @@ /* test control box */ - filterbar->priv->control_box = gtk_hbox_new (FALSE, 0); + filterbar->priv->control_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (filterbar->priv->control_box); /* close button */ @@ -429,34 +430,6 @@ } -GType -gth_filterbar_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthFilterbarClass), - NULL, - NULL, - (GClassInitFunc) gth_filterbar_class_init, - NULL, - NULL, - sizeof (GthFilterbar), - 0, - (GInstanceInitFunc) gth_filterbar_init - }; - - type = g_type_register_static (GTK_TYPE_HBOX, - "GthFilterbar", - &type_info, - 0); - } - - return type; -} - - GtkWidget* gth_filterbar_new (const char *selected_filter) { diff -Nru gthumb-2.14.3/gthumb/gth-filterbar.h gthumb-3.0.0/gthumb/gth-filterbar.h --- gthumb-2.14.3/gthumb/gth-filterbar.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-filterbar.h 2012-03-06 15:26:06.000000000 +0000 @@ -40,13 +40,13 @@ struct _GthFilterbar { - GtkHBox __parent; + GtkBox __parent; GthFilterbarPrivate *priv; }; struct _GthFilterbarClass { - GtkHBoxClass __parent_class; + GtkBoxClass __parent_class; /* -- Signals -- */ diff -Nru gthumb-2.14.3/gthumb/gth-filter.c gthumb-3.0.0/gthumb/gth-filter.c --- gthumb-2.14.3/gthumb/gth-filter.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-filter.c 2012-03-24 13:57:26.000000000 +0000 @@ -59,7 +59,17 @@ }; -static gpointer parent_class = NULL; +static void gth_filter_dom_domizable_interface_init (DomDomizableInterface *iface); +static void gth_filter_gth_duplicable_interface_init (GthDuplicableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthFilter, + gth_filter, + GTH_TYPE_TEST, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + gth_filter_dom_domizable_interface_init) + G_IMPLEMENT_INTERFACE (GTH_TYPE_DUPLICABLE, + gth_filter_gth_duplicable_interface_init)) static DomElement* @@ -172,7 +182,7 @@ { GthFilter *filter = GTH_FILTER (test); - GTH_TEST_CLASS (parent_class)->set_file_list (test, files); + GTH_TEST_CLASS (gth_filter_parent_class)->set_file_list (test, files); if ((filter->priv->limit_type != GTH_LIMIT_TYPE_NONE) && (filter->priv->sort_name != NULL) @@ -253,7 +263,7 @@ GtkWidget *label; char *value; - control = gtk_hbox_new (FALSE, 6); + control = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); /* limit label */ @@ -325,7 +335,7 @@ int i, size_idx; gboolean size_set = FALSE; - control = gtk_hbox_new (FALSE, 6); + control = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); /* limit label */ @@ -435,7 +445,7 @@ _g_object_unref (filter->priv->test); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_filter_parent_class)->finalize (object); } @@ -445,7 +455,6 @@ GObjectClass *object_class; GthTestClass *test_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthFilterPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -460,7 +469,7 @@ static void -gth_filter_dom_domizable_interface_init (DomDomizableIface *iface) +gth_filter_dom_domizable_interface_init (DomDomizableInterface *iface) { iface->create_element = gth_filter_real_create_element; iface->load_from_element = gth_filter_real_load_from_element; @@ -468,7 +477,7 @@ static void -gth_filter_gth_duplicable_interface_init (GthDuplicableIface *iface) +gth_filter_gth_duplicable_interface_init (GthDuplicableInterface *iface) { iface->duplicate = gth_filter_real_duplicate; } @@ -486,46 +495,6 @@ } -GType -gth_filter_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthFilterClass), - NULL, - NULL, - (GClassInitFunc) gth_filter_class_init, - NULL, - NULL, - sizeof (GthFilter), - 0, - (GInstanceInitFunc) gth_filter_init - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) gth_filter_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo gth_duplicable_info = { - (GInterfaceInitFunc) gth_filter_gth_duplicable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (GTH_TYPE_TEST, - "GthFilter", - &type_info, - 0); - g_type_add_interface_static (type, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - g_type_add_interface_static (type, GTH_TYPE_DUPLICABLE, >h_duplicable_info); - } - - return type; -} - - GthFilter* gth_filter_new (void) { diff -Nru gthumb-2.14.3/gthumb/gth-filter-editor-dialog.c gthumb-3.0.0/gthumb/gth-filter-editor-dialog.c --- gthumb-2.14.3/gthumb/gth-filter-editor-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-filter-editor-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -39,9 +39,6 @@ #define GET_WIDGET(name) _gtk_builder_get_widget (self->priv->builder, (name)) -static gpointer parent_class = NULL; - - struct _GthFilterEditorDialogPrivate { GtkBuilder *builder; GtkWidget *match_type_combobox; @@ -53,6 +50,9 @@ }; +G_DEFINE_TYPE (GthFilterEditorDialog, gth_filter_editor_dialog, GTK_TYPE_DIALOG) + + static void gth_filter_editor_dialog_finalize (GObject *object) { @@ -67,7 +67,7 @@ dialog->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_filter_editor_dialog_parent_class)->finalize (object); } @@ -76,9 +76,7 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - object_class->finalize = gth_filter_editor_dialog_finalize; } @@ -90,34 +88,6 @@ } -GType -gth_filter_editor_dialog_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthFilterEditorDialogClass), - NULL, - NULL, - (GClassInitFunc) gth_filter_editor_dialog_class_init, - NULL, - NULL, - sizeof (GthFilterEditorDialog), - 0, - (GInstanceInitFunc) gth_filter_editor_dialog_init - }; - - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthFilterEditorDialog", - &type_info, - 0); - } - - return type; -} - - static void update_sensitivity (GthFilterEditorDialog *self) { diff -Nru gthumb-2.14.3/gthumb/gth-folder-tree.c gthumb-3.0.0/gthumb/gth-folder-tree.c --- gthumb-2.14.3/gthumb/gth-folder-tree.c 2011-12-11 16:10:50.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-folder-tree.c 2012-04-23 17:31:23.000000000 +0000 @@ -93,8 +93,10 @@ }; -static gpointer parent_class = NULL; -static guint gth_folder_tree_signals[LAST_SIGNAL] = { 0 }; +static guint gth_folder_tree_signals[LAST_SIGNAL] = { 0 }; + + +G_DEFINE_TYPE (GthFolderTree, gth_folder_tree, GTK_TYPE_TREE_VIEW) static void @@ -116,7 +118,7 @@ folder_tree->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_folder_tree_parent_class)->finalize (object); } @@ -126,8 +128,6 @@ GObjectClass *object_class; GtkWidgetClass *widget_class; - parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass*) class; object_class->finalize = gth_folder_tree_finalize; @@ -549,11 +549,11 @@ event->x, event->y)) { - GtkTreePath *path = NULL; - GdkDragContext *context; - int cell_x; - int cell_y; - GdkPixmap *dnd_icon; + GtkTreePath *path = NULL; + GdkDragContext *context; + int cell_x; + int cell_y; + cairo_surface_t *dnd_surface; if (! gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (folder_tree), event->x, @@ -577,15 +577,10 @@ 1, (GdkEvent *) event); - dnd_icon = gtk_tree_view_create_row_drag_icon (GTK_TREE_VIEW (folder_tree), path); - gtk_drag_set_icon_pixmap (context, - gdk_drawable_get_colormap (dnd_icon), - dnd_icon, - NULL, - cell_x, - cell_y); + dnd_surface = gtk_tree_view_create_row_drag_icon (GTK_TREE_VIEW (folder_tree), path); + gtk_drag_set_icon_surface (context, dnd_surface); - g_object_unref (dnd_icon); + cairo_surface_destroy (dnd_surface); gtk_tree_path_free (path); } @@ -1059,34 +1054,6 @@ } -GType -gth_folder_tree_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthFolderTreeClass), - NULL, - NULL, - (GClassInitFunc) gth_folder_tree_class_init, - NULL, - NULL, - sizeof (GthFolderTree), - 0, - (GInstanceInitFunc) gth_folder_tree_init - }; - - type = g_type_register_static (GTK_TYPE_TREE_VIEW, - "GthFolderTree", - &type_info, - 0); - } - - return type; -} - - GtkWidget * gth_folder_tree_new (const char *uri) { @@ -1123,7 +1090,7 @@ GtkTreeIter iter; sort_key = g_utf8_collate_key_for_filename (PARENT_URI, -1); - pixbuf = gtk_widget_render_icon (GTK_WIDGET (folder_tree), GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU, "folder-list"); + pixbuf = gtk_widget_render_icon_pixbuf (GTK_WIDGET (folder_tree), GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU); gtk_tree_store_append (folder_tree->priv->tree_store, &iter, NULL); gtk_tree_store_set (folder_tree->priv->tree_store, &iter, @@ -1636,6 +1603,18 @@ } +void +gth_folder_tree_collapse_all (GthFolderTree *folder_tree) +{ + GtkTreeSelection *selection; + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_tree)); + g_signal_handlers_block_by_func (selection, selection_changed_cb, folder_tree); + gtk_tree_view_collapse_all (GTK_TREE_VIEW (folder_tree)); + g_signal_handlers_unblock_by_func (selection, selection_changed_cb, folder_tree); +} + + GthFileData * gth_folder_tree_get_file (GthFolderTree *folder_tree, GtkTreePath *path) diff -Nru gthumb-2.14.3/gthumb/gth-folder-tree.h gthumb-3.0.0/gthumb/gth-folder-tree.h --- gthumb-2.14.3/gthumb/gth-folder-tree.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-folder-tree.h 2012-04-23 17:31:40.000000000 +0000 @@ -97,6 +97,7 @@ void gth_folder_tree_expand_row (GthFolderTree *folder_tree, GtkTreePath *path, gboolean open_all); +void gth_folder_tree_collapse_all (GthFolderTree *folder_tree); void gth_folder_tree_select_path (GthFolderTree *folder_tree, GtkTreePath *path); GFile * gth_folder_tree_get_root (GthFolderTree *folder_tree); diff -Nru gthumb-2.14.3/gthumb/gth-grid-view.c gthumb-3.0.0/gthumb/gth-grid-view.c --- gthumb-2.14.3/gthumb/gth-grid-view.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-grid-view.c 2012-04-12 20:35:33.000000000 +0000 @@ -0,0 +1,3874 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2001-2011 The Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "cairo-utils.h" +#include "glib-utils.h" +#include "gth-file-data.h" +#include "gth-file-selection.h" +#include "gth-file-store.h" +#include "gth-file-view.h" +#include "gth-icon-cache.h" +#include "gth-grid-view.h" +#include "gth-marshal.h" +#include "gth-enum-types.h" +#include "gtk-utils.h" + + +#define GTH_GRID_VIEW_ITEM(x) ((GthGridViewItem *)(x)) +#define GTH_GRID_VIEW_LINE(x) ((GthGridViewLine *)(x)) +#define CAPTION_LINE_SPACING 4 +#define DEFAULT_CAPTION_SPACING 4 +#define DEFAULT_CAPTION_PADDING 2 +#define DEFAULT_CELL_SPACING 16 +#define DEFAULT_CELL_PADDING 5 +#define DEFAULT_THUMBNAIL_BORDER 6 +#define SCROLL_DELAY 30 +#define LAYOUT_DELAY 20 +#define MAX_DELTA_FOR_SCROLLING 1024.0 +#define RUBBERBAND_BORDER 2 +#define STEP_INCREMENT 0.10 +#define PAGE_INCREMENT 0.33 + + +static void gth_grid_view_gth_file_selection_interface_init (GthFileSelectionInterface *iface); +static void gth_grid_view_gth_file_view_interface_init (GthFileViewInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthGridView, + gth_grid_view, + GTK_TYPE_WIDGET, + G_IMPLEMENT_INTERFACE (GTH_TYPE_FILE_SELECTION, + gth_grid_view_gth_file_selection_interface_init) + G_IMPLEMENT_INTERFACE (GTH_TYPE_FILE_VIEW, + gth_grid_view_gth_file_view_interface_init) + G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL)) + + +enum { + SELECT_ALL, + UNSELECT_ALL, + MOVE_CURSOR, + SELECT_CURSOR_ITEM, + TOGGLE_CURSOR_ITEM, + ACTIVATE_CURSOR_ITEM, + LAST_SIGNAL +}; + + +enum { + PROP_0, + PROP_CAPTION, + PROP_CELL_SPACING, + PROP_HADJUSTMENT, + PROP_HSCROLL_POLICY, + PROP_MODEL, + PROP_THUMBNAIL_SIZE, + PROP_VADJUSTMENT, + PROP_VSCROLL_POLICY +}; + + +typedef enum { + SYNC_INSERT, + SYNC_REMOVE +} SyncType; + + +static guint grid_view_signals[LAST_SIGNAL] = { 0 }; + + +typedef struct { + /* data */ + + guint ref; + GthFileData *file_data; + GdkPixbuf *thumbnail; + gboolean is_icon : 1; + char *caption; + gboolean is_image : 1; + gboolean is_video : 1; + + /* item state */ + + GtkStateFlags state; + GtkStateFlags tmp_state; + gboolean update_caption_height : 1; + + /* geometry info */ + + cairo_rectangle_int_t area; /* union of thumbnail_area and caption_area */ + cairo_rectangle_int_t thumbnail_area; + cairo_rectangle_int_t pixbuf_area; + cairo_rectangle_int_t caption_area; +} GthGridViewItem; + + +typedef struct { + int y; + int height; + GList *items; +} GthGridViewLine; + + +struct _GthGridViewPrivate { + GtkTreeModel *model; + GList *items; + int n_items; + GList *lines; + GList *selection; + int focused_item; + int first_focused_item; /* Used to do multiple selection with the keyboard. */ + guint make_focused_visible : 1; + guint needs_relayout : 1; + + guint layout_timeout; + int relayout_from_line; + guint update_caption_height : 1; + + int width; /* size of the view */ + int height; + int thumbnail_size; + int thumbnail_border; + int cell_size; /* max size of any cell area */ + int cell_spacing; /* space between adjacent cell areas both horizontally and vertically */ + int cell_padding; /* space between the cell area border and its content */ + int caption_spacing; /* space between the thumbnail area and the caption area */ + int caption_padding; /* space between the caption area border and its content */ + + guint scroll_timeout; /* timeout ID for autoscrolling */ + double autoscroll_y_delta; /* change the adjustment value by this amount when autoscrolling */ + + double event_last_x; /* mouse position for autoscrolling */ + double event_last_y; + + /* selection */ + + guint selecting : 1; /* whether the user is performing a rubberband selection. */ + guint select_pending : 1; /* whether selection is pending after a button press. */ + int select_pending_pos; + GthGridViewItem *select_pending_item; + GtkSelectionMode selection_mode; + cairo_rectangle_int_t selection_area; + int last_selected_pos; + GthGridViewItem *last_selected_item; + guint multi_selecting_with_keyboard : 1; /* Whether a multi selection with the keyboard has started. */ + guint selection_changed : 1; + int sel_start_x; /* The point where the mouse selection started. */ + int sel_start_y; + guint sel_state; /* Modifier state when the selection began. */ + + /* drag and drop */ + + guint dragging : 1; /* Whether the user is dragging items. */ + guint drag_started : 1; /* Whether the drag has started. */ + gboolean drag_source_enabled; + GdkModifierType drag_start_button_mask; + int drag_button; + GtkTargetList *drag_target_list; + GdkDragAction drag_actions; + int drag_start_x; /* The point where the drag started. */ + int drag_start_y; + int drop_item; + GthDropPosition drop_pos; + + /* */ + + GtkAdjustment *hadjustment; + GtkAdjustment *vadjustment; + GdkWindow *bin_window; + + char *caption_attributes; + char **caption_attributes_v; + PangoLayout *caption_layout; + + GthIconCache *icon_cache; +}; + + +/* -- gth_grid_view_item -- */ + + +static void +gth_grid_view_item_set_file_data (GthGridViewItem *item, + GthFileData *file_data) +{ + _g_object_unref (item->file_data); + item->file_data = _g_object_ref (file_data); + + item->is_video = (item->file_data != NULL) ? _g_mime_type_is_video (gth_file_data_get_mime_type (item->file_data)) : FALSE; + item->is_image = (item->file_data != NULL) ? _g_mime_type_is_image (gth_file_data_get_mime_type (item->file_data)) : FALSE; +} + + +static void +gth_grid_view_item_set_thumbnail (GthGridViewItem *item, + GdkPixbuf *thumbnail) +{ + _g_object_unref (item->thumbnail); + item->thumbnail = _g_object_ref (thumbnail); + + if (item->thumbnail != NULL) { + item->pixbuf_area.width = gdk_pixbuf_get_width (item->thumbnail); + item->pixbuf_area.height = gdk_pixbuf_get_height (item->thumbnail); + } + else { + item->pixbuf_area.width = 0; + item->pixbuf_area.height = 0; + } + + item->pixbuf_area.x = item->thumbnail_area.x + ((item->thumbnail_area.width - item->pixbuf_area.width) / 2); + item->pixbuf_area.y = item->thumbnail_area.y + ((item->thumbnail_area.height - item->pixbuf_area.height) / 2); +} + + +#define MAX_TEXT_LENGTH 70 +#define ODD_ROW_ATTR_STYLE "" +#define EVEN_ROW_ATTR_STYLE " style='italic'" + + +static void +gth_grid_view_item_update_caption (GthGridViewItem *item, + char **attributes_v) +{ + GString *metadata; + gboolean odd; + int i; + + item->update_caption_height = TRUE; + + g_free (item->caption); + item->caption = NULL; + + if ((item->file_data == NULL) + || (attributes_v == NULL) + || g_str_equal (attributes_v[0], "none")) + { + return; + } + + metadata = g_string_new (NULL); + + odd = TRUE; + for (i = 0; attributes_v[i] != NULL; i++) { + char *value; + + value = gth_file_data_get_attribute_as_string (item->file_data, attributes_v[i]); + if ((value != NULL) && ! g_str_equal (value, "")) { + char *escaped; + + if (metadata->len > 0) + g_string_append (metadata, "\n"); + if (g_utf8_strlen (value, -1) > MAX_TEXT_LENGTH) { + char *tmp; + + tmp = g_strdup (value); + g_utf8_strncpy (tmp, value, MAX_TEXT_LENGTH); + g_free (value); + value = g_strdup_printf ("%s…", tmp); + + g_free (tmp); + } + + escaped = g_markup_escape_text (value, -1); + g_string_append_printf (metadata, "%s", (odd ? ODD_ROW_ATTR_STYLE : EVEN_ROW_ATTR_STYLE), escaped); + + g_free (escaped); + } + odd = ! odd; + + g_free (value); + } + + item->caption = g_string_free (metadata, FALSE); +} + + +static GthGridViewItem * +gth_grid_view_item_new (GthGridView *grid_view, + GthFileData *file_data, + GdkPixbuf *thumbnail, + gboolean is_icon, + char **attributes_v) +{ + GthGridViewItem *item; + + item = g_new0 (GthGridViewItem, 1); + item->ref = 1; + gth_grid_view_item_set_file_data (item, file_data); + gth_grid_view_item_set_thumbnail (item, thumbnail); + item->is_icon = is_icon; + gth_grid_view_item_update_caption (item, attributes_v); + + return item; +} + + +static GthGridViewItem * +gth_grid_view_item_ref (GthGridViewItem *item) +{ + if (item != NULL) + item->ref++; + return item; +} + + +static void +gth_grid_view_item_unref (GthGridViewItem *item) +{ + if ((item == NULL) || (--item->ref > 0)) + return; + + g_free (item->caption); + _g_object_unref (item->thumbnail); + _g_object_unref (item->file_data); + g_free (item); +} + + +/* -- gth_grid_view_line -- */ + + +static void +gth_grid_view_line_free (GthGridViewLine *line) +{ + g_list_foreach (line->items, (GFunc) gth_grid_view_item_unref, NULL); + g_list_free (line->items); + g_free (line); +} + + +/**/ + + +static void +_gth_grid_view_free_lines (GthGridView *self) +{ + g_list_foreach (self->priv->lines, (GFunc) gth_grid_view_line_free, NULL); + g_list_free (self->priv->lines); + self->priv->lines = NULL; + self->priv->height = 0; +} + + +static void +_gth_grid_view_free_items (GthGridView *self) +{ + g_list_foreach (self->priv->items, (GFunc) gth_grid_view_item_unref, NULL); + g_list_free (self->priv->items); + self->priv->items = NULL; + + g_list_free (self->priv->selection); + self->priv->selection = NULL; +} + + +static void +gth_grid_view_finalize (GObject *object) +{ + GthGridView *self; + + self = GTH_GRID_VIEW (object); + + if (self->priv->layout_timeout != 0) { + g_source_remove (self->priv->layout_timeout); + self->priv->layout_timeout = 0; + } + + if (self->priv->scroll_timeout != 0) { + g_source_remove (self->priv->scroll_timeout); + self->priv->scroll_timeout = 0; + } + + _gth_grid_view_free_items (self); + _gth_grid_view_free_lines (self); + g_list_free (self->priv->selection); + + if (self->priv->hadjustment != NULL) { + g_signal_handlers_disconnect_by_data (self->priv->hadjustment, self); + g_object_unref (self->priv->hadjustment); + self->priv->hadjustment = NULL; + } + + if (self->priv->vadjustment != NULL) { + g_signal_handlers_disconnect_by_data (self->priv->vadjustment, self); + g_object_unref (self->priv->vadjustment); + self->priv->vadjustment = NULL; + } + + if (self->priv->drag_target_list != NULL) { + gtk_target_list_unref (self->priv->drag_target_list); + self->priv->drag_target_list = NULL; + } + g_free (self->priv->caption_attributes); + g_strfreev (self->priv->caption_attributes_v); + _g_object_unref (self->priv->model); + + G_OBJECT_CLASS (gth_grid_view_parent_class)->finalize (object); +} + + +static gboolean +adjustment_value_changed (GtkAdjustment *adj, + GthGridView *self) +{ + if (gtk_widget_get_realized (GTK_WIDGET (self))) + gdk_window_move (self->priv->bin_window, + (int) - gtk_adjustment_get_value (self->priv->hadjustment), + (int) - gtk_adjustment_get_value (self->priv->vadjustment)); + + return FALSE; +} + + +static void +gth_grid_view_map (GtkWidget *widget) +{ + GthGridView *self = GTH_GRID_VIEW (widget); + + gtk_widget_set_mapped (widget, TRUE); + gdk_window_show (self->priv->bin_window); + gdk_window_show (gtk_widget_get_window (widget)); +} + + +static void +_gth_grid_view_stop_dragging (GthGridView *self) +{ + if (! self->priv->dragging) + return; + + self->priv->dragging = FALSE; + self->priv->drag_started = FALSE; +} + + +static void +gth_grid_view_unmap (GtkWidget *widget) +{ + GthGridView *self = GTH_GRID_VIEW (widget); + + _gth_grid_view_stop_dragging (self); + GTK_WIDGET_CLASS (gth_grid_view_parent_class)->unmap (widget); +} + + +/* -- _gth_grid_view_make_item_fully_visible -- */ + + +static void +gth_grid_view_scroll_to (GthFileView *file_view, + int pos, + double yalign) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + int n_line; + int y; + int i; + GList *line; + + g_return_if_fail ((pos >= 0) && (pos < self->priv->n_items)); + g_return_if_fail ((yalign >= 0.0) && (yalign <= 1.0)); + + if (self->priv->lines == NULL) + return; + + n_line = pos / gth_grid_view_get_items_per_line (self); + y = self->priv->cell_spacing; + for (i = 0, line = self->priv->lines; + (i < n_line) && (line != NULL); + i++, line = line->next) + { + y += GTH_GRID_VIEW_LINE (line->data)->height + self->priv->cell_spacing; + } + + if (line != NULL) { + int h; + double value; + + h = gtk_widget_get_allocated_height (GTK_WIDGET (self)) - GTH_GRID_VIEW_LINE (line->data)->height - self->priv->cell_spacing; + value = CLAMP ((y - (h * yalign) - ((1.0 - yalign) * self->priv->cell_spacing)), + 0.0, + self->priv->height - gtk_widget_get_allocated_height (GTK_WIDGET (self))); + gtk_adjustment_set_value (self->priv->vadjustment, value); + } +} + + +static GthVisibility +gth_grid_view_get_visibility (GthFileView *file_view, + int pos) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + int cell_top; + int line_n; + int i; + GList *line; + int cell_bottom; + int window_top; + int window_bottom; + + g_return_val_if_fail ((pos >= 0) && (pos < self->priv->n_items), GTH_VISIBILITY_NONE); + + if (self->priv->lines == NULL) + return GTH_VISIBILITY_NONE; + + cell_top = self->priv->cell_spacing; + line_n = pos / gth_grid_view_get_items_per_line (self); + for (i = 0, line = self->priv->lines; + (i < line_n) && (line != NULL); + i++, line = line->next) + { + cell_top += GTH_GRID_VIEW_LINE (line->data)->height + self->priv->cell_spacing; + } + + if (line == NULL) + return GTH_VISIBILITY_NONE; + + cell_bottom = cell_top + GTH_GRID_VIEW_LINE (line->data)->height + self->priv->cell_spacing; + window_top = gtk_adjustment_get_value (self->priv->vadjustment); + window_bottom = window_top + gtk_widget_get_allocated_height (GTK_WIDGET (self)); + + if (cell_bottom < window_top) + return GTH_VISIBILITY_NONE; + + if (cell_top > window_bottom) + return GTH_VISIBILITY_NONE; + + if ((cell_top >= window_top) && (cell_bottom <= window_bottom)) + return GTH_VISIBILITY_FULL; + + if ((cell_top < window_top) && (cell_bottom >= window_top)) + return GTH_VISIBILITY_PARTIAL_TOP; + + if ((cell_top <= window_bottom) && (cell_bottom > window_bottom)) + return GTH_VISIBILITY_PARTIAL_BOTTOM; + + return GTH_VISIBILITY_PARTIAL; +} + + +static void +_gth_grid_view_make_item_fully_visible (GthGridView *self, + int pos) +{ + GthVisibility visibility; + + if (pos < 0) + return; + + visibility = gth_grid_view_get_visibility (GTH_FILE_VIEW (self), pos); + if (visibility != GTH_VISIBILITY_FULL) { + double y_alignment = -1.0; + + switch (visibility) { + case GTH_VISIBILITY_NONE: + y_alignment = 0.5; + break; + + case GTH_VISIBILITY_PARTIAL_TOP: + y_alignment = 0.0; + break; + + case GTH_VISIBILITY_PARTIAL_BOTTOM: + y_alignment = 1.0; + break; + + case GTH_VISIBILITY_PARTIAL: + case GTH_VISIBILITY_FULL: + y_alignment = -1.0; + break; + } + + if (y_alignment >= 0.0) + gth_grid_view_scroll_to (GTH_FILE_VIEW (self), + pos, + y_alignment); + } +} + + +/* -- grid layout -- */ + + +static void +_gth_grid_view_update_item_size (GthGridView *self, + GthGridViewItem *item) +{ + int thumbnail_size; + + thumbnail_size = self->priv->cell_size - (self->priv->cell_padding * 2); + + if (! item->is_icon && item->is_video) { + item->thumbnail_area.width = item->pixbuf_area.width; + item->thumbnail_area.height = thumbnail_size - (self->priv->thumbnail_border * 2); + } + else { + item->thumbnail_area.width = thumbnail_size; + item->thumbnail_area.height = thumbnail_size; + } + + item->caption_area.width = thumbnail_size; + + item->area.width = self->priv->cell_size; + item->area.height = self->priv->cell_padding + thumbnail_size; + + if ((self->priv->caption_layout != NULL) && (self->priv->update_caption_height || item->update_caption_height)) { + if ((item->caption != NULL) && (g_strcmp0 (item->caption, "") != 0)) { + pango_layout_set_markup (self->priv->caption_layout, item->caption, -1); + pango_layout_get_pixel_size (self->priv->caption_layout, NULL, &item->caption_area.height); + item->caption_area.height += self->priv->caption_padding * 2; + } + else + item->caption_area.height = 0; + + item->update_caption_height = FALSE; + } + + if (item->caption_area.height > 0) + item->area.height += self->priv->caption_spacing + item->caption_area.height; + + item->area.height += self->priv->cell_padding; +} + + +static void +_gth_grid_view_place_item_at (GthGridView *self, + GthGridViewItem *item, + int x, + int y) +{ + item->area.x = x; + item->area.y = y; + + if (! item->is_icon && item->is_video) { + item->thumbnail_area.x = item->area.x + self->priv->cell_padding + self->priv->thumbnail_border; + item->thumbnail_area.y = item->area.y + self->priv->cell_padding + self->priv->thumbnail_border; + } + else { + item->thumbnail_area.x = item->area.x + self->priv->cell_padding; + item->thumbnail_area.y = item->area.y + self->priv->cell_padding; + } + + item->pixbuf_area.x = item->thumbnail_area.x + ((item->thumbnail_area.width - item->pixbuf_area.width) / 2); + item->pixbuf_area.y = item->thumbnail_area.y + ((item->thumbnail_area.height - item->pixbuf_area.height) / 2); + + item->caption_area.x = item->area.x + self->priv->cell_padding; + item->caption_area.y = item->area.y + self->priv->cell_size - self->priv->cell_padding + self->priv->caption_spacing; +} + + +static void +_gth_grid_view_layout_line (GthGridView *self, + GthGridViewLine *line) +{ + int x; + int direction; + GList *scan; + + if (gtk_widget_get_direction (GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL) { + x = self->priv->width - self->priv->cell_size; + direction = -1; + } + else { + x = 0; + direction = 1; + } + + for (scan = line->items; scan; scan = scan->next) { + GthGridViewItem *item = scan->data; + + x += direction * self->priv->cell_spacing; + _gth_grid_view_place_item_at (self, item, x, line->y); + x += direction * self->priv->cell_size; + } +} + + +static void +_gth_grid_view_add_and_layout_line (GthGridView *self, + GList *items, + int y, + int height) +{ + GthGridViewLine *line; + + line = g_new0 (GthGridViewLine, 1); + line->items = g_list_reverse (items); + line->y = y; + line->height = height; + _gth_grid_view_layout_line (self, line); + + self->priv->lines = g_list_prepend (self->priv->lines, line); +} + + +static void +_gth_grid_view_configure_hadjustment (GthGridView *self) +{ + double page_size; + double value; + + if (self->priv->hadjustment == NULL) + return; + + page_size = gtk_widget_get_allocated_width (GTK_WIDGET (self)); + value = gtk_adjustment_get_value (self->priv->hadjustment); + if (value + page_size > self->priv->width) + value = MAX (self->priv->width - page_size, 0); + + gtk_adjustment_configure (self->priv->hadjustment, + value, + 0.0, + MAX (page_size, self->priv->width), + STEP_INCREMENT * page_size, + PAGE_INCREMENT * page_size, + page_size); +} + + +static void +_gth_grid_view_configure_vadjustment (GthGridView *self) +{ + double page_size; + double value; + + if (self->priv->vadjustment == NULL) + return; + + page_size = gtk_widget_get_allocated_height (GTK_WIDGET (self)); + value = gtk_adjustment_get_value (self->priv->vadjustment); + if (value + page_size > self->priv->height) + value = MAX (self->priv->height - page_size, 0); + + gtk_adjustment_configure (self->priv->vadjustment, + value, + 0.0, + MAX (page_size, self->priv->height), + STEP_INCREMENT * page_size, + PAGE_INCREMENT * page_size, + page_size); +} + + +static void +_gth_grid_view_relayout_at (GthGridView *self, + int pos, + int y) +{ + int items_per_line; + GList *items; + int max_height; + GList *scan; + int n; + + items_per_line = gth_grid_view_get_items_per_line (self); + items = NULL; + max_height = 0; + for (scan = g_list_nth (self->priv->items, pos), n = pos; + scan; + scan = scan->next, n++) + { + GthGridViewItem *item = scan->data; + + if ((n % items_per_line) == 0) { + if (items != NULL) { + _gth_grid_view_add_and_layout_line (self, items, y, max_height); + items = NULL; + y += max_height + self->priv->cell_spacing; + } + max_height = 0; + } + + _gth_grid_view_update_item_size (self, item); + max_height = MAX (item->area.height, max_height); + + items = g_list_prepend (items, gth_grid_view_item_ref (item)); + } + + if (items != NULL) { + _gth_grid_view_add_and_layout_line (self, items, y, max_height); + y += max_height + self->priv->cell_spacing; + } + + self->priv->lines = g_list_reverse (self->priv->lines); + + if (y != self->priv->height) { + GtkAllocation allocation; + + self->priv->height = y; + + gtk_widget_get_allocation (GTK_WIDGET (self), &allocation); + gdk_window_resize (self->priv->bin_window, + MAX (self->priv->width, allocation.width), + MAX (self->priv->height, allocation.height)); + } + + _gth_grid_view_configure_hadjustment (self); + _gth_grid_view_configure_vadjustment (self); +} + + +static void +_gth_grid_view_free_lines_from (GthGridView *self, + int first_line) +{ + GList *lines; + GList *scan; + + lines = g_list_nth (self->priv->lines, first_line); + if (lines == NULL) + return; + + /* truncate self->priv->lines before the first line to free */ + if (lines->prev != NULL) + lines->prev->next = NULL; + else + self->priv->lines = NULL; + + for (scan = lines; scan; scan = scan->next) + gth_grid_view_line_free (GTH_GRID_VIEW_LINE (scan->data)); + g_list_free (lines); +} + + +static void +_gth_grid_view_relayout_from_line (GthGridView *self, + int line) +{ + int y; + GList *scan; + + if (! gtk_widget_get_realized (GTK_WIDGET (self))) { + self->priv->needs_relayout = TRUE; + return; + } + + if (self->priv->update_caption_height) + pango_layout_set_width (self->priv->caption_layout, + (self->priv->cell_size - (self->priv->cell_padding * 2)) * PANGO_SCALE); + + _gth_grid_view_free_lines_from (self, line); + y = self->priv->cell_spacing; + for (scan = self->priv->lines; scan; scan = scan->next) + y += GTH_GRID_VIEW_LINE (scan->data)->height + self->priv->cell_spacing; + + _gth_grid_view_relayout_at (self, + line * gth_grid_view_get_items_per_line (self), + y); + + self->priv->update_caption_height = FALSE; + self->priv->relayout_from_line = -1; + self->priv->needs_relayout = FALSE; + + gtk_widget_queue_draw (GTK_WIDGET (self)); +} + + +static gboolean +_gth_grid_view_relayout_cb (gpointer data) +{ + GthGridView *self = data; + + if (self->priv->layout_timeout != 0) { + g_source_remove (self->priv->layout_timeout); + self->priv->layout_timeout = 0; + } + + _gth_grid_view_relayout_from_line (self, self->priv->relayout_from_line); + + if (self->priv->make_focused_visible) { + self->priv->make_focused_visible = FALSE; + _gth_grid_view_make_item_fully_visible (self, self->priv->focused_item); + } + + return FALSE; +} + + +static void +_gth_grid_view_queue_relayout_from_line (GthGridView *self, + int line) +{ + if (self->priv->relayout_from_line != -1) + self->priv->relayout_from_line = MIN (line, self->priv->relayout_from_line); + else + self->priv->relayout_from_line = line; + + if (! gtk_widget_get_realized (GTK_WIDGET (self))) { + self->priv->needs_relayout = TRUE; + return; + } + + if (self->priv->layout_timeout == 0) + self->priv->layout_timeout = g_timeout_add (LAYOUT_DELAY, + _gth_grid_view_relayout_cb, + self); +} + + +static void +_gth_grid_view_queue_relayout (GthGridView *self) +{ + _gth_grid_view_queue_relayout_from_line (self, 0); +} + + +static void +_gth_grid_view_queue_relayout_from_position (GthGridView *self, + int pos) +{ + _gth_grid_view_queue_relayout_from_line (self, pos / gth_grid_view_get_items_per_line (self)); +} + + +static void +gth_grid_view_realize (GtkWidget *widget) +{ + GthGridView *self; + GtkAllocation allocation; + GdkWindowAttr attributes; + int attributes_mask; + GdkWindow *window; + GtkStyleContext *style_context; + + self = GTH_GRID_VIEW (widget); + + gtk_widget_set_realized (widget, TRUE); + gtk_widget_get_allocation (widget, &allocation); + + /* view window */ + + attributes.window_type = GDK_WINDOW_CHILD; + attributes.x = allocation.x; + attributes.y = allocation.y; + attributes.width = allocation.width; + attributes.height = allocation.height; + attributes.wclass = GDK_INPUT_OUTPUT; + attributes.visual = gtk_widget_get_visual (widget); + attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK; + attributes_mask = (GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL); + window = gdk_window_new (gtk_widget_get_parent_window (widget), + &attributes, + attributes_mask); + gtk_widget_set_window (widget, window); + gdk_window_set_user_data (window, widget); + + /* bin window */ + + attributes.x = 0; + attributes.y = 0; + attributes.width = MAX (self->priv->width, allocation.width); + attributes.height = MAX (self->priv->height, allocation.height); + attributes.event_mask = (GDK_EXPOSURE_MASK + | GDK_SCROLL_MASK + | GDK_POINTER_MOTION_MASK + | GDK_ENTER_NOTIFY_MASK + | GDK_LEAVE_NOTIFY_MASK + | GDK_BUTTON_PRESS_MASK + | GDK_BUTTON_RELEASE_MASK + | gtk_widget_get_events (widget)); + + self->priv->bin_window = gdk_window_new (gtk_widget_get_window (widget), + &attributes, + attributes_mask); + gdk_window_set_user_data (self->priv->bin_window, widget); + + /* style */ + + style_context = gtk_widget_get_style_context (widget); + gtk_style_context_save (style_context); + gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_VIEW); + gtk_style_context_set_background (style_context, self->priv->bin_window); + gtk_style_context_restore (style_context); + + self->priv->caption_layout = gtk_widget_create_pango_layout (widget, NULL); + pango_layout_set_wrap (self->priv->caption_layout, PANGO_WRAP_WORD_CHAR); + pango_layout_set_alignment (self->priv->caption_layout, PANGO_ALIGN_CENTER); + pango_layout_set_spacing (self->priv->caption_layout, CAPTION_LINE_SPACING); + + /**/ + + gdk_window_show (self->priv->bin_window); + self->priv->needs_relayout = TRUE; +} + + +static void +gth_grid_view_unrealize (GtkWidget *widget) +{ + GthGridView *self; + + self = GTH_GRID_VIEW (widget); + + gdk_window_set_user_data (self->priv->bin_window, NULL); + gdk_window_destroy (self->priv->bin_window); + self->priv->bin_window = NULL; + + g_object_unref (self->priv->caption_layout); + self->priv->caption_layout = NULL; + + gth_icon_cache_free (self->priv->icon_cache); + self->priv->icon_cache = NULL; + + GTK_WIDGET_CLASS (gth_grid_view_parent_class)->unrealize (widget); +} + + +static void +_gth_grid_view_update_background (GthGridView *self) +{ + GtkWidget *widget = GTK_WIDGET (self); + GtkStyleContext *style_context; + + if (! gtk_widget_get_realized (widget)) + return; + + style_context = gtk_widget_get_style_context (widget); + gtk_style_context_save (style_context); + gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_VIEW); + gtk_style_context_set_background (style_context, gtk_widget_get_window (widget)); + gtk_style_context_set_background (style_context, self->priv->bin_window); + gtk_style_context_restore (style_context); +} + + +static void +gth_grid_view_state_flags_changed (GtkWidget *widget, + GtkStateFlags previous_state) +{ + _gth_grid_view_update_background (GTH_GRID_VIEW (widget)); + gtk_widget_queue_draw (widget); +} + + +static void +gth_grid_view_style_updated (GtkWidget *widget) +{ + GTK_WIDGET_CLASS (gth_grid_view_parent_class)->style_updated (widget); + + _gth_grid_view_update_background (GTH_GRID_VIEW (widget)); + gtk_widget_queue_resize (widget); +} + + +static void +gth_grid_view_get_preferred_width (GtkWidget *widget, + int *minimum, + int *natural) +{ + GthGridView *self = GTH_GRID_VIEW (widget); + + if (minimum != NULL) + *minimum = self->priv->cell_size; + if (natural != NULL) + *natural = *minimum; +} + + +static void +gth_grid_view_get_preferred_height (GtkWidget *widget, + int *minimum, + int *natural) +{ + GthGridView *self = GTH_GRID_VIEW (widget); + + if (minimum != NULL) + *minimum = self->priv->cell_size; + if (natural != NULL) + *natural = *minimum; +} + + +static void +gth_grid_view_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + GthGridView *self; + int old_cells_per_line; + + self = GTH_GRID_VIEW (widget); + + old_cells_per_line = gth_grid_view_get_items_per_line (self); + self->priv->width = allocation->width; + + gtk_widget_set_allocation (widget, allocation); + + if (gtk_widget_get_realized (widget)) { + gdk_window_move_resize (gtk_widget_get_window (widget), + allocation->x, + allocation->y, + allocation->width, + allocation->height); + gdk_window_resize (self->priv->bin_window, + MAX (self->priv->width, allocation->width), + MAX (self->priv->height, allocation->height)); + + if (self->priv->needs_relayout || (old_cells_per_line != gth_grid_view_get_items_per_line (self))) + _gth_grid_view_queue_relayout (self); + } + + _gth_grid_view_configure_hadjustment (self); + _gth_grid_view_configure_vadjustment (self); +} + + +static int +get_first_visible_at_offset (GthGridView *self, + double ofs) +{ + int n_line; + GList *scan; + int pos; + + if ((self->priv->n_items == 0) || (self->priv->lines == NULL)) + return -1; + + n_line = 0; + for (scan = self->priv->lines; scan && (ofs > 0.0); scan = scan->next) { + ofs -= GTH_GRID_VIEW_LINE (scan->data)->height + self->priv->cell_spacing; + n_line++; + } + pos = gth_grid_view_get_items_per_line (self) * (n_line - 1); + + return CLAMP (pos, 0, self->priv->n_items - 1); +} + + +static int +gth_grid_view_get_first_visible (GthFileView *file_view) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + + return get_first_visible_at_offset (self, gtk_adjustment_get_value (self->priv->vadjustment)); +} + + +static int +get_last_visible_at_offset (GthGridView *self, + double ofs) +{ + int n_line; + GList *scan; + int pos; + + if ((self->priv->n_items == 0) || (self->priv->lines == NULL)) + return -1; + + n_line = 0; + for (scan = self->priv->lines; scan && (ofs > 0.0); scan = scan->next) { + ofs -= GTH_GRID_VIEW_LINE (scan->data)->height + self->priv->cell_spacing; + n_line++; + } + pos = gth_grid_view_get_items_per_line (self) * n_line - 1; + + return CLAMP (pos, 0, self->priv->n_items - 1); +} + + +static int +gth_grid_view_get_last_visible (GthFileView *file_view) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + + return get_last_visible_at_offset (self, + (gtk_adjustment_get_value (self->priv->vadjustment) + + gtk_adjustment_get_page_size (self->priv->vadjustment))); +} + + +/* -- gth_grid_view_draw -- */ + + +static cairo_pattern_t * +_cairo_film_pattern_create (void) +{ + static cairo_pattern_t *film_pattern = NULL; + cairo_pattern_t *pattern; + static GStaticMutex mutex = G_STATIC_MUTEX_INIT; + + g_static_mutex_lock (&mutex); + if (film_pattern == NULL) { + char *filename; + cairo_surface_t *surface; + + filename = g_build_filename (GTHUMB_DATADIR, "filmholes.png", NULL); + surface = cairo_image_surface_create_from_png (filename); + film_pattern = cairo_pattern_create_for_surface (surface); + cairo_pattern_set_filter (film_pattern, CAIRO_FILTER_GOOD); + cairo_pattern_set_extend (film_pattern, CAIRO_EXTEND_REPEAT); + + cairo_surface_destroy (surface); + g_free (filename); + + } + pattern = cairo_pattern_reference (film_pattern); + g_static_mutex_unlock (&mutex); + + return pattern; +} + + +static void +_gth_grid_view_item_draw_thumbnail (GthGridViewItem *item, + cairo_t *cr, + GtkWidget *widget, + GtkStateFlags item_state, + GthGridView *grid_view) +{ + GdkPixbuf *pixbuf; + GtkStyleContext *style_context; + cairo_rectangle_int_t frame_rect; + GdkRGBA background_color; + GdkRGBA lighter_color; + GdkRGBA darker_color; + + pixbuf = item->thumbnail; + if (pixbuf == NULL) + return; + + g_object_ref (pixbuf); + + cairo_save (cr); + style_context = gtk_widget_get_style_context (widget); + gtk_style_context_save (style_context); + gtk_style_context_remove_class (style_context, GTK_STYLE_CLASS_VIEW); + gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_CELL); + + frame_rect = item->pixbuf_area; + + if (item->is_icon + || ((item->pixbuf_area.width < grid_view->priv->thumbnail_size) && (item->pixbuf_area.height < grid_view->priv->thumbnail_size)) + || (item->file_data == NULL) + || ! (item->is_image || (item_state & GTK_STATE_FLAG_SELECTED) || (item_state == GTK_STATE_FLAG_NORMAL))) + { + GdkRGBA background_color; + + /* use a gray rounded box for icons or when the original size + * is smaller than the thumbnail size... */ + + gtk_style_context_get_background_color (style_context, item_state, &background_color); + gdk_cairo_set_source_rgba (cr, &background_color); + + _cairo_draw_rounded_box (cr, + item->thumbnail_area.x, + item->thumbnail_area.y, + item->thumbnail_area.width, + item->thumbnail_area.height, + 4); + cairo_fill (cr); + } + + gdk_rgba_parse (&background_color, "#edeceb"); + gtk_style_context_get_background_color (style_context, item_state, &background_color); + _gdk_rgba_darker (&background_color, &lighter_color); + _gdk_rgba_darker (&lighter_color, &darker_color); + + if (! item->is_icon && item->is_image) { + + /* ...draw a frame with a drop-shadow effect */ + + cairo_translate (cr, 0.5, 0.5); + cairo_set_line_width (cr, 0.5); + cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); + + frame_rect = item->thumbnail_area; + + /* the drop shadow */ + + gdk_cairo_set_source_rgba (cr, &darker_color); + _cairo_draw_rounded_box (cr, + frame_rect.x + 2, + frame_rect.y + 2, + frame_rect.width - 2, + frame_rect.height - 2, + 1); + cairo_fill (cr); + + /* the outer frame */ + + gdk_cairo_set_source_rgba (cr, &background_color); + _cairo_draw_rounded_box (cr, + frame_rect.x, + frame_rect.y, + frame_rect.width - 2, + frame_rect.height - 2, + 1); + cairo_fill_preserve (cr); + + if (item_state == GTK_STATE_FLAG_SELECTED) + gdk_cairo_set_source_rgba (cr, &darker_color); + else + gdk_cairo_set_source_rgba (cr, &lighter_color); + cairo_stroke (cr); + + /* the inner frame */ + + cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); + cairo_rectangle (cr, + item->pixbuf_area.x, + item->pixbuf_area.y, + item->pixbuf_area.width, + item->pixbuf_area.height); + cairo_fill (cr); + + gdk_cairo_set_source_rgba (cr, &lighter_color); + cairo_move_to (cr, + item->pixbuf_area.x - 1, + item->pixbuf_area.y + item->pixbuf_area.height + 1); + cairo_rel_line_to (cr, 0, - item->pixbuf_area.height - 2); + cairo_rel_line_to (cr, item->pixbuf_area.width + 2, 0); + cairo_stroke (cr); + + /* + cairo_set_source_rgb (cr, 0.9, 0.9, 0.9); + cairo_move_to (cr, + item->pixbuf_area.x - 1, + item->pixbuf_area.y + item->pixbuf_area.height); + cairo_rel_line_to (cr, item->pixbuf_area.width + 1, 0); + cairo_rel_line_to (cr, 0, - item->pixbuf_area.height - 1); + cairo_stroke (cr); + */ + + cairo_identity_matrix (cr); + } + + if (! item->is_icon && item->is_video) { + cairo_pattern_t *pattern; + double x; + double film_scale; + cairo_matrix_t matrix; + double film_strip; + + frame_rect = item->thumbnail_area; + + /* the drop shadow */ + + gdk_cairo_set_source_rgba (cr, &darker_color); + cairo_rectangle (cr, + frame_rect.x + 2, + frame_rect.y + 2, + frame_rect.width, + frame_rect.height); + cairo_fill (cr); + + /* dark background */ + + cairo_set_source_rgb (cr, 0.1, 0.1, 0.1); + cairo_rectangle (cr, + frame_rect.x, + frame_rect.y , + frame_rect.width, + frame_rect.height); + cairo_fill (cr); + + /* left film strip */ + + pattern = _cairo_film_pattern_create (); + + if (grid_view->priv->thumbnail_size > 128) + film_scale = 256.0 / grid_view->priv->thumbnail_size; + else + film_scale = 128.0 / grid_view->priv->thumbnail_size; + film_strip = 9.0 / film_scale; + + x = frame_rect.x; + cairo_matrix_init_identity (&matrix); + cairo_matrix_scale (&matrix, film_scale, film_scale); + cairo_matrix_translate (&matrix, -frame_rect.x, -item->pixbuf_area.y); + cairo_pattern_set_matrix (pattern, &matrix); + cairo_set_source (cr, pattern); + cairo_rectangle (cr, + x, + frame_rect.y, + film_strip, + frame_rect.height); + cairo_fill (cr); + + /* right film strip */ + + x = frame_rect.x + item->pixbuf_area.width - film_strip; + cairo_matrix_init_identity (&matrix); + cairo_matrix_scale (&matrix, film_scale, film_scale); + cairo_matrix_translate (&matrix, -x, -item->pixbuf_area.y); + cairo_pattern_set_matrix (pattern, &matrix); + cairo_set_source (cr, pattern); + cairo_rectangle (cr, + x, + frame_rect.y, + film_strip, + frame_rect.height); + cairo_fill (cr); + + cairo_pattern_destroy (pattern); + } + + /* thumbnail */ + + gdk_cairo_set_source_pixbuf (cr, pixbuf, item->pixbuf_area.x, item->pixbuf_area.y); + cairo_rectangle (cr, item->pixbuf_area.x, item->pixbuf_area.y, item->pixbuf_area.width, item->pixbuf_area.height); + cairo_fill (cr); + + if (item_state & GTK_STATE_FLAG_SELECTED) { + GdkRGBA color; + + gtk_style_context_get_background_color (style_context, item_state, &color); + cairo_set_source_rgba (cr, color.red, color.green, color.blue, 0.33); + cairo_rectangle (cr, + frame_rect.x, + frame_rect.y, + frame_rect.width, + frame_rect.height); + cairo_fill (cr); + } + + gtk_style_context_restore (style_context); + cairo_restore (cr); + + g_object_unref (pixbuf); +} + + +static void +_gth_grid_view_item_draw_caption (GthGridViewItem *item, + cairo_t *cr, + GtkWidget *widget, + GtkStateFlags item_state, + PangoLayout *pango_layout, + GthGridView *grid_view) +{ + GtkStyleContext *style_context; + GdkRGBA color; + + if (item->caption_area.height == 0) + return; + + cairo_save (cr); + + style_context = gtk_widget_get_style_context (widget); + gtk_style_context_get_color (style_context, item_state, &color); + gdk_cairo_set_source_rgba (cr, &color); + cairo_move_to (cr, item->caption_area.x, item->caption_area.y + grid_view->priv->caption_padding); + pango_layout_set_markup (pango_layout, item->caption, -1); + pango_cairo_show_layout (cr, pango_layout); + + if (item_state & GTK_STATE_FLAG_FOCUSED) + gtk_render_focus (style_context, + cr, + item->caption_area.x, + item->caption_area.y, + item->caption_area.width, + item->caption_area.height); + + cairo_restore (cr); +} + + +#define EMBLEM_SIZE 16 + + +static void +_gth_grid_view_item_draw_emblems (GthGridViewItem *item, + cairo_t *cr, + GtkWidget *widget, + GtkStateFlags item_state, + GthGridView *grid_view) +{ + GthStringList *emblems; + GList *scan; + int emblem_offset; + + cairo_save (cr); + + emblem_offset = 0; + emblems = (GthStringList *) g_file_info_get_attribute_object (item->file_data->info, GTH_FILE_ATTRIBUTE_EMBLEMS); + for (scan = gth_string_list_get_list (emblems); scan; scan = scan->next) { + char *emblem = scan->data; + GIcon *icon; + GdkPixbuf *pixbuf; + + if (grid_view->priv->icon_cache == NULL) + grid_view->priv->icon_cache = gth_icon_cache_new (gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (grid_view))), EMBLEM_SIZE); + + icon = g_themed_icon_new (emblem); + pixbuf = gth_icon_cache_get_pixbuf (grid_view->priv->icon_cache, icon); + if (pixbuf != NULL) { + gdk_cairo_set_source_pixbuf (cr, pixbuf, item->thumbnail_area.x + emblem_offset + 1, item->thumbnail_area.y + 1); + cairo_rectangle (cr, item->thumbnail_area.x + emblem_offset + 1, item->thumbnail_area.y + 1, gdk_pixbuf_get_width (pixbuf), gdk_pixbuf_get_height (pixbuf)); + cairo_fill (cr); + + g_object_unref (pixbuf); + + emblem_offset += EMBLEM_SIZE + (EMBLEM_SIZE / 2); + } + + g_object_unref (icon); + } + + cairo_restore (cr); +} + + +static void +_gth_grid_view_draw_item (GthGridView *self, + GthGridViewItem *item, + cairo_t *cr) +{ + GtkStateType item_state; + + item_state = item->state; + if (! gtk_widget_has_focus (GTK_WIDGET (self)) && (item_state & GTK_STATE_FLAG_FOCUSED)) + item_state ^= GTK_STATE_FLAG_FOCUSED; + if (! gtk_widget_has_focus (GTK_WIDGET (self)) && (item_state & GTK_STATE_FLAG_ACTIVE)) + item_state ^= GTK_STATE_FLAG_ACTIVE; + + if (item_state ^ GTK_STATE_FLAG_NORMAL) { + GtkStyleContext *style_context; + GdkRGBA color; + + cairo_save (cr); + style_context = gtk_widget_get_style_context (GTK_WIDGET (self)); + gtk_style_context_get_background_color (style_context, item_state, &color); + _gdk_rgba_lighter (&color, &color); + cairo_set_source_rgba (cr, color.red, color.green, color.blue, color.alpha); + _cairo_draw_rounded_box (cr, + item->area.x, + item->area.y, + item->area.width, + item->area.height, + 4); + cairo_fill (cr); + + cairo_restore (cr); + } + + _gth_grid_view_item_draw_thumbnail (item, cr, GTK_WIDGET (self), item_state, self); + _gth_grid_view_item_draw_caption (item, cr, GTK_WIDGET (self), item_state, self->priv->caption_layout, self); + _gth_grid_view_item_draw_emblems (item, cr, GTK_WIDGET (self), item_state, self); +} + + +static void +_gth_grid_view_draw_rubberband (GthGridView *self, + cairo_t *cr) +{ + GtkStyleContext *style_context; + + if ((self->priv->selection_area.width <= 1.0) || (self->priv->selection_area.height <= 1.0)) + return; + + cairo_save (cr); + + style_context = gtk_widget_get_style_context (GTK_WIDGET (self)); + gtk_style_context_save (style_context); + gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_RUBBERBAND); + + gdk_cairo_rectangle (cr, &self->priv->selection_area); + cairo_clip (cr); + gtk_render_background (style_context, + cr, + self->priv->selection_area.x, + self->priv->selection_area.y, + self->priv->selection_area.width, + self->priv->selection_area.height); + gtk_render_frame (style_context, + cr, + self->priv->selection_area.x, + self->priv->selection_area.y, + self->priv->selection_area.width, + self->priv->selection_area.height); + + gtk_style_context_restore (style_context); + cairo_restore (cr); +} + + +static void +_gth_grid_view_draw_drop_target (GthGridView *self, + cairo_t *cr) +{ + GtkStyleContext *style_context; + GthGridViewItem *item; + int x; + + if ((self->priv->drop_item < 0) || (self->priv->drop_item >= self->priv->n_items)) + return; + + style_context = gtk_widget_get_style_context (GTK_WIDGET (self)); + + item = g_list_nth (self->priv->items, self->priv->drop_item)->data; + + x = 0; + if (self->priv->drop_pos == GTH_DROP_POSITION_LEFT) + x = item->area.x - (self->priv->cell_spacing / 2); + else if (self->priv->drop_pos == GTH_DROP_POSITION_RIGHT) + x = item->area.x + self->priv->cell_size + (self->priv->cell_spacing / 2); + + gtk_render_focus (style_context, + cr, + x - 1, + item->area.y + self->priv->cell_padding, + 2, + item->area.height - (self->priv->cell_padding * 2)); +} + + +static gboolean +gth_grid_view_draw (GtkWidget *widget, + cairo_t *cr) +{ + GthGridView *self = (GthGridView*) widget; + int first_visible; + int last_visible; + int i; + GList *scan; + + if (! gtk_cairo_should_draw_window (cr, self->priv->bin_window)) + return FALSE; + + first_visible = gth_grid_view_get_first_visible (GTH_FILE_VIEW (self)); + if (first_visible == -1) + return TRUE; + + last_visible = gth_grid_view_get_last_visible (GTH_FILE_VIEW (self)); + + cairo_save (cr); + gtk_cairo_transform_to_window (cr, widget, self->priv->bin_window); + cairo_set_line_width (cr, 1.0); + + for (i = first_visible, scan = g_list_nth (self->priv->items, first_visible); + (i <= last_visible) && scan; + i++, scan = scan->next) + { + _gth_grid_view_draw_item (self, GTH_GRID_VIEW_ITEM (scan->data), cr); + } + + if (self->priv->selecting || self->priv->multi_selecting_with_keyboard) + _gth_grid_view_draw_rubberband (self, cr); + + if (self->priv->drop_pos != GTH_DROP_POSITION_NONE) + _gth_grid_view_draw_drop_target (self, cr); + + cairo_restore (cr); + + return TRUE; +} + + +static void +_gth_grid_view_keep_focus_consistent (GthGridView *self) +{ + if (self->priv->focused_item > self->priv->n_items - 1) + self->priv->focused_item = - 1; +} + + +static gboolean +gth_grid_view_focus_in (GtkWidget *widget, + GdkEventFocus *event) +{ + GthGridView *self = GTH_GRID_VIEW (widget); + + _gth_grid_view_keep_focus_consistent (self); + gtk_widget_queue_draw (widget); + + return TRUE; +} + + +static gboolean +gth_grid_view_focus_out (GtkWidget *widget, + GdkEventFocus *event) +{ + gtk_widget_queue_draw (widget); + + return TRUE; +} + + +static gboolean +gth_grid_view_key_press (GtkWidget *widget, + GdkEventKey *event) +{ + GthGridView *self = GTH_GRID_VIEW (widget); + gboolean handled; + + if (! self->priv->multi_selecting_with_keyboard + && (event->state & GDK_SHIFT_MASK) + && ((event->keyval == GDK_KEY_Left) + || (event->keyval == GDK_KEY_Right) + || (event->keyval == GDK_KEY_Up) + || (event->keyval == GDK_KEY_Down) + || (event->keyval == GDK_KEY_Page_Up) + || (event->keyval == GDK_KEY_Page_Down) + || (event->keyval == GDK_KEY_Home) + || (event->keyval == GDK_KEY_End))) + { + self->priv->multi_selecting_with_keyboard = TRUE; + self->priv->first_focused_item = self->priv->focused_item; + + self->priv->selection_area.x = 0; + self->priv->selection_area.y = 0; + self->priv->selection_area.width = 0; + self->priv->selection_area.height = 0; + } + + handled = gtk_bindings_activate (G_OBJECT (widget), + event->keyval, + event->state); + + if (handled) + return TRUE; + + if ((GTK_WIDGET_CLASS (gth_grid_view_parent_class)->key_press_event != NULL) + && GTK_WIDGET_CLASS (gth_grid_view_parent_class)->key_press_event (widget, event)) + { + return TRUE; + } + + return FALSE; +} + + +static gboolean +gth_grid_view_key_release (GtkWidget *widget, + GdkEventKey *event) +{ + GthGridView *self = GTH_GRID_VIEW (widget); + + if (self->priv->multi_selecting_with_keyboard + && (event->state & GDK_SHIFT_MASK) + && ((event->keyval == GDK_KEY_Shift_L) + || (event->keyval == GDK_KEY_Shift_R))) + { + self->priv->multi_selecting_with_keyboard = FALSE; + } + + gtk_widget_queue_draw (widget); + + if ((GTK_WIDGET_CLASS (gth_grid_view_parent_class)->key_press_event != NULL) + && GTK_WIDGET_CLASS (gth_grid_view_parent_class)->key_press_event (widget, event)) + { + return TRUE; + } + + return FALSE; +} + + +static gboolean +gth_grid_view_scroll_event (GtkWidget *widget, + GdkEventScroll *event) +{ + GtkAdjustment *adj; + gdouble new_value; + double step; + + if (event->direction != GDK_SCROLL_UP && + event->direction != GDK_SCROLL_DOWN) + { + return FALSE; + } + + adj = GTH_GRID_VIEW (widget)->priv->vadjustment; + + new_value = gtk_adjustment_get_value (adj); + step = gtk_adjustment_get_page_increment (adj); + if (event->direction == GDK_SCROLL_UP) + new_value -= step; + else + new_value += step; + new_value = CLAMP (new_value, + gtk_adjustment_get_lower (adj), + gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj)); + + gtk_adjustment_set_value (adj, new_value); + + return TRUE; +} + + +/* -- GthFileSelection interface -- */ + + +static void +gth_grid_view_set_selection_mode (GthFileSelection *selection, + GtkSelectionMode mode) +{ + GthGridView *self = GTH_GRID_VIEW (selection); + + self->priv->selection_mode = mode; + + /* the cell padding is used to show the selection, set it to 0 if + * selection is not allowed. */ + self->priv->cell_padding = (mode == GTK_SELECTION_NONE) ? 0 : DEFAULT_CELL_PADDING; +} + + +static GList * +gth_grid_view_get_selected (GthFileSelection *selection) +{ + GthGridView *self = GTH_GRID_VIEW (selection); + GList *selected; + GList *scan; + + selected = NULL; + for (scan = self->priv->selection; scan; scan = scan->next) { + int pos; + + pos = GPOINTER_TO_INT (scan->data); + selected = g_list_prepend (selected, gtk_tree_path_new_from_indices (pos, -1)); + } + + return g_list_reverse (selected); +} + + +static void +_gth_grid_view_queue_draw_item (GthGridView *self, + GthGridViewItem *item) +{ + if (gtk_widget_get_realized (GTK_WIDGET (self))) + gdk_window_invalidate_rect (self->priv->bin_window, &item->area, FALSE); +} + + +static void +_gth_grid_view_select_item (GthGridView *self, + int pos) +{ + GList *link; + GthGridViewItem *item; + + g_return_if_fail ((pos >= 0) && (pos < self->priv->n_items)); + + if (self->priv->selection_mode == GTK_SELECTION_NONE) + return; + + link = g_list_nth (self->priv->items, pos); + g_return_if_fail (link != NULL); + + item = link->data; + if (item->state & GTK_STATE_FLAG_SELECTED) + return; + + item->state |= GTK_STATE_FLAG_SELECTED; + self->priv->selection = g_list_prepend (self->priv->selection, GINT_TO_POINTER (pos)); + self->priv->selection_changed = TRUE; + + _gth_grid_view_queue_draw_item (self, item); +} + + +static void +_gth_grid_view_unselect_item (GthGridView *self, + int pos) +{ + GList *link; + GthGridViewItem *item; + + g_return_if_fail ((pos >= 0) && (pos < self->priv->n_items)); + + if (self->priv->selection_mode == GTK_SELECTION_NONE) + return; + + link = g_list_nth (self->priv->items, pos); + g_return_if_fail (link != NULL); + + item = link->data; + + if (! (item->state & GTK_STATE_FLAG_SELECTED)) + return; + + item->state ^= GTK_STATE_FLAG_SELECTED; + self->priv->selection = g_list_remove (self->priv->selection, GINT_TO_POINTER (pos)); + self->priv->selection_changed = TRUE; + + _gth_grid_view_queue_draw_item (self, item); +} + + +static void +_gth_grid_view_set_item_selected (GthGridView *self, + gboolean selected, + int pos) +{ + if (selected) + _gth_grid_view_select_item (self, pos); + else + _gth_grid_view_unselect_item (self, pos); +} + + +static void +_gth_grid_view_emit_selection_changed (GthGridView *self) +{ + if (self->priv->selection_changed && (self->priv->selection_mode != GTK_SELECTION_NONE)) { + gth_file_selection_changed (GTH_FILE_SELECTION (self)); + self->priv->selection_changed = FALSE; + } +} + + +static void +_gth_grid_view_set_item_selected_and_emit_signal (GthGridView *self, + gboolean select, + int pos) +{ + _gth_grid_view_set_item_selected (self, select, pos); + _gth_grid_view_emit_selection_changed (self); +} + + +static int +_gth_grid_view_unselect_all (GthGridView *self, + gpointer keep_selected) +{ + GthGridViewPrivate *priv = self->priv; + int idx; + GList *scan; + int i; + + idx = 0; + for (scan = priv->items, i = 0; + scan != NULL; + scan = scan->next, i++) + { + GthGridViewItem *item = scan->data; + + if (item == keep_selected) + idx = i; + else if (item->state & GTK_STATE_FLAG_SELECTED) + _gth_grid_view_set_item_selected (self, FALSE, i); + } + + return idx; +} + + +static void +gth_grid_view_select (GthFileSelection *selection, + int pos) +{ + GthGridView *self = GTH_GRID_VIEW (selection); + GList *list; + int i; + + switch (self->priv->selection_mode) { + case GTK_SELECTION_SINGLE: + for (list = self->priv->items, i = 0; + list != NULL; + list = list->next, i++) + { + GthGridViewItem *item = list->data; + + if ((i != pos) && (item->state & GTK_STATE_FLAG_SELECTED)) + _gth_grid_view_set_item_selected (self, FALSE, i); + } + _gth_grid_view_set_item_selected (self, TRUE, pos); + _gth_grid_view_emit_selection_changed (self); + break; + + case GTK_SELECTION_MULTIPLE: + self->priv->select_pending = FALSE; + + _gth_grid_view_unselect_all (self, NULL); + _gth_grid_view_set_item_selected_and_emit_signal (self, TRUE, pos); + self->priv->last_selected_pos = pos; + self->priv->last_selected_item = g_list_nth (self->priv->items, pos)->data; + break; + + default: + break; + } +} + + +static void +gth_grid_view_unselect (GthFileSelection *selection, + int pos) +{ + _gth_grid_view_set_item_selected_and_emit_signal (GTH_GRID_VIEW (selection), FALSE, pos); +} + + +static void +_gth_grid_view_select_all (GthGridView *self) +{ + GList *scan; + int i; + + for (scan = self->priv->items, i = 0; + scan != NULL; + scan = scan->next, i++) + { + GthGridViewItem *item = scan->data; + + if (! (item->state & GTK_STATE_FLAG_SELECTED)) + _gth_grid_view_set_item_selected (self, TRUE, i); + } +} + + +static void +gth_grid_view_select_all (GthFileSelection *selection) +{ + GthGridView *self = GTH_GRID_VIEW (selection); + + _gth_grid_view_select_all (self); + _gth_grid_view_emit_selection_changed (self); +} + + +static void +gth_grid_view_unselect_all (GthFileSelection *selection) +{ + GthGridView *self = GTH_GRID_VIEW (selection); + + _gth_grid_view_unselect_all (self, NULL); + _gth_grid_view_emit_selection_changed (self); +} + + +static gboolean +gth_grid_view_is_selected (GthFileSelection *selection, + int pos) +{ + GthGridView *self = GTH_GRID_VIEW (selection); + GList *scan; + + for (scan = self->priv->selection; scan; scan = scan->next) + if (GPOINTER_TO_INT (scan->data) == pos) + return TRUE; + + return FALSE; +} + + +static GtkTreePath * +gth_grid_view_get_first_selected (GthFileSelection *selection) +{ + GthGridView *self = GTH_GRID_VIEW (selection); + GList *scan; + int pos; + + scan = self->priv->selection; + if (scan == NULL) + return NULL; + + pos = GPOINTER_TO_INT (scan->data); + for (scan = scan->next; scan; scan = scan->next) + pos = MIN (pos, GPOINTER_TO_INT (scan->data)); + + return gtk_tree_path_new_from_indices (pos, -1); +} + + +static GtkTreePath * +gth_grid_view_get_last_selected (GthFileSelection *selection) +{ + GthGridView *self = GTH_GRID_VIEW (selection); + GList *scan; + int pos; + + scan = self->priv->selection; + if (scan == NULL) + return NULL; + + pos = GPOINTER_TO_INT (scan->data); + for (scan = scan->next; scan; scan = scan->next) + pos = MAX (pos, GPOINTER_TO_INT (scan->data)); + + return gtk_tree_path_new_from_indices (pos, -1); +} + + +static guint +gth_grid_view_get_n_selected (GthFileSelection *selection) +{ + return g_list_length (GTH_GRID_VIEW (selection)->priv->selection); +} + + +/* -- GthFileView interface -- */ + + +static void +model_row_changed_cb (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + GthGridView *self = user_data; + int pos; + GList *link; + GthFileData *file_data; + GdkPixbuf *thumbnail; + gboolean is_icon; + GthGridViewItem *item; + + gtk_tree_model_get (tree_model, + iter, + GTH_FILE_STORE_FILE_DATA_COLUMN, &file_data, + GTH_FILE_STORE_THUMBNAIL_COLUMN, &thumbnail, + GTH_FILE_STORE_IS_ICON_COLUMN, &is_icon, + -1); + + pos = gtk_tree_path_get_indices (path)[0]; + link = g_list_nth (self->priv->items, pos); + g_return_if_fail (link != NULL); + + item = GTH_GRID_VIEW_ITEM (link->data); + gth_grid_view_item_set_file_data (item, file_data); + gth_grid_view_item_set_thumbnail (item, thumbnail); + item->is_icon = is_icon; + gth_grid_view_item_update_caption (item, self->priv->caption_attributes_v); + + _gth_grid_view_queue_relayout_from_position (self, pos); + + g_object_unref (file_data); + g_object_unref (thumbnail); +} + + +static void +model_row_deleted_cb (GtkTreeModel *tree_model, + GtkTreePath *path, + gpointer user_data) +{ + GthGridView *self = user_data; + int pos; + GList *link; + GList *scan; + GList *selected_link; + + pos = gtk_tree_path_get_indices (path)[0]; + link = g_list_nth (self->priv->items, pos); + self->priv->items = g_list_remove_link (self->priv->items, link); + self->priv->n_items--; + + /* update the selection */ + + selected_link = NULL; + for (scan = self->priv->selection; scan; scan = scan->next) { + int selected_pos = GPOINTER_TO_INT (scan->data); + if (selected_pos > pos) + scan->data = GINT_TO_POINTER (selected_pos - 1); + else if (selected_pos == pos) + selected_link = scan; + } + if (selected_link != NULL) { + self->priv->selection = g_list_remove_link (self->priv->selection, selected_link); + g_list_free (selected_link); + } + + /* relayout from the minimum changed position */ + + _gth_grid_view_keep_focus_consistent (self); + _gth_grid_view_queue_relayout_from_position (self, pos); + + gth_grid_view_item_unref (GTH_GRID_VIEW_ITEM (link->data)); + g_list_free (link); +} + + +static void +model_row_inserted_cb (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + GthGridView *self = user_data; + GthFileData *file_data; + GdkPixbuf *thumbnail; + gboolean is_icon; + GthGridViewItem *item; + int pos; + GList *scan; + + gtk_tree_model_get (tree_model, + iter, + GTH_FILE_STORE_FILE_DATA_COLUMN, &file_data, + GTH_FILE_STORE_THUMBNAIL_COLUMN, &thumbnail, + GTH_FILE_STORE_IS_ICON_COLUMN, &is_icon, + -1); + item = gth_grid_view_item_new (self, + file_data, + thumbnail, + is_icon, + self->priv->caption_attributes_v); + pos = gtk_tree_path_get_indices (path)[0]; + self->priv->items = g_list_insert (self->priv->items, item, pos); + self->priv->n_items++; + + /* update the selection */ + + for (scan = self->priv->selection; scan; scan = scan->next) { + int selected_pos = GPOINTER_TO_INT (scan->data); + if (selected_pos >= pos) + scan->data = GINT_TO_POINTER (selected_pos + 1); + } + + /* relayout from the minimum changed position */ + + _gth_grid_view_queue_relayout_from_position (self, pos); + + g_object_unref (file_data); + g_object_unref (thumbnail); +} + + +static void +model_rows_reordered_cb (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer new_order, + gpointer user_data) +{ + GthGridView *self = user_data; + GList *items; + int i; + int min_changed_pos; + GList *scan; + + /* change the order of the items list */ + + min_changed_pos = -1; + items = NULL; + for (i = 0; i < self->priv->n_items; i++) { + GList *link; + int old_pos; + + old_pos = ((int *) new_order)[i]; + if ((min_changed_pos == -1) && (old_pos != i)) + min_changed_pos = i; + + link = g_list_nth (self->priv->items, old_pos); + g_return_if_fail (link != NULL); + items = g_list_prepend (items, link->data); + } + items = g_list_reverse (items); + + g_list_free (self->priv->items); + self->priv->items = items; + + /* update the selection */ + + for (scan = self->priv->selection; scan; scan = scan->next) { + int selected_pos = GPOINTER_TO_INT (scan->data); + + for (i = 0; i < self->priv->n_items; i++) { + int old_pos = ((int *) new_order)[i]; + + if (selected_pos == old_pos) { + scan->data = GINT_TO_POINTER (i); + break; + } + } + } + + /* relayout from the minimum changed position */ + + if (min_changed_pos >= 0) + _gth_grid_view_queue_relayout_from_position (self, min_changed_pos); +} + + +static void +model_thumbnail_changed_cb (GtkTreeModel *tree_model, + GtkTreePath *path, + GtkTreeIter *iter, + gpointer user_data) +{ + GthGridView *self = user_data; + int pos; + GList *link; + GdkPixbuf *thumbnail; + gboolean is_icon; + GthGridViewItem *item; + + gtk_tree_model_get (tree_model, + iter, + GTH_FILE_STORE_THUMBNAIL_COLUMN, &thumbnail, + GTH_FILE_STORE_IS_ICON_COLUMN, &is_icon, + -1); + + pos = gtk_tree_path_get_indices (path)[0]; + link = g_list_nth (self->priv->items, pos); + g_return_if_fail (link != NULL); + + item = GTH_GRID_VIEW_ITEM (link->data); + gth_grid_view_item_set_thumbnail (item, thumbnail); + item->is_icon = is_icon; + + _gth_grid_view_update_item_size (self, item); + _gth_grid_view_place_item_at (self, item, item->area.x, item->area.y); + _gth_grid_view_queue_draw_item (self, item); + + g_object_unref (thumbnail); +} + + +static void +gth_grid_view_set_model (GthFileView *file_view, + GtkTreeModel *model) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + + if (model != NULL) + g_object_ref (model); + if (self->priv->model != NULL) { + g_signal_handlers_disconnect_by_data (self->priv->model, self); + g_object_unref (self->priv->model); + } + self->priv->model = model; + g_object_notify (G_OBJECT (self), "model"); + + if (self->priv->model == NULL) + return; + + g_signal_connect (self->priv->model, + "row-changed", + G_CALLBACK (model_row_changed_cb), + self); + g_signal_connect (self->priv->model, + "row-deleted", + G_CALLBACK (model_row_deleted_cb), + self); + g_signal_connect (self->priv->model, + "row-inserted", + G_CALLBACK (model_row_inserted_cb), + self); + g_signal_connect (self->priv->model, + "rows-reordered", + G_CALLBACK (model_rows_reordered_cb), + self); + g_signal_connect (self->priv->model, + "thumbnail-changed", + G_CALLBACK (model_thumbnail_changed_cb), + self); +} + + +static int +gth_grid_view_get_at_position (GthFileView *file_view, + int x, + int y) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + GList *scan; + int n; + + for (scan = self->priv->items, n = 0; + scan != NULL; + scan = scan->next, n++) + { + GthGridViewItem *item = scan->data; + + if (_cairo_rectangle_contains_point (&item->thumbnail_area, x, y) + || _cairo_rectangle_contains_point (&item->caption_area, x, y)) + { + return n; + } + } + + return -1; +} + + +static void +gth_grid_view_cursor_changed (GthFileView *file_view, + int pos) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + GthGridViewItem *old_item; + GList *link; + GthGridViewItem *new_item; + + old_item = NULL; + if (self->priv->focused_item >= 0) { + link = g_list_nth (self->priv->items, self->priv->focused_item); + if (link != NULL) + old_item = link->data; + } + + link = g_list_nth (self->priv->items, pos); + g_return_if_fail (link != NULL); + + self->priv->focused_item = pos; + if (old_item != NULL) { + old_item->state ^= GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_ACTIVE; + _gth_grid_view_queue_draw_item (self, old_item); + } + + new_item = link->data; + new_item->state |= GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_ACTIVE; + _gth_grid_view_queue_draw_item (self, new_item); + + self->priv->make_focused_visible = TRUE; + _gth_grid_view_make_item_fully_visible (self, self->priv->focused_item); +} + + +static int +gth_grid_view_get_cursor (GthFileView *file_view) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + + if (! gtk_widget_has_focus (GTK_WIDGET (self))) + return -1; + else + return self->priv->focused_item; +} + + +static void +gth_grid_view_enable_drag_source (GthFileView *file_view, + GdkModifierType start_button_mask, + const GtkTargetEntry *targets, + int n_targets, + GdkDragAction actions) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + + if (self->priv->drag_target_list != NULL) + gtk_target_list_unref (self->priv->drag_target_list); + + self->priv->drag_source_enabled = TRUE; + self->priv->drag_start_button_mask = start_button_mask; + self->priv->drag_target_list = gtk_target_list_new (targets, n_targets); + self->priv->drag_actions = actions; +} + + +static void +gth_grid_view_unset_drag_source (GthFileView *file_view) +{ + GTH_GRID_VIEW (file_view)->priv->drag_source_enabled = FALSE; +} + + +static void +gth_grid_view_enable_drag_dest (GthFileView *file_view, + const GtkTargetEntry *targets, + int n_targets, + GdkDragAction actions) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + + gtk_drag_dest_set (GTK_WIDGET (self), + 0, + targets, + n_targets, + actions); +} + + +static void +gth_grid_view_unset_drag_dest (GthFileView *file_view) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + + gtk_drag_dest_unset (GTK_WIDGET (self)); +} + + +static int +_gth_grid_view_get_drop_target_at (GthGridView *self, + int x, + int y) +{ + int row; + int height; + GList *scan; + int items_per_line; + int col; + + x += gtk_adjustment_get_value (self->priv->hadjustment); + y += gtk_adjustment_get_value (self->priv->vadjustment); + + row = -1; + height = self->priv->cell_spacing; + for (scan = self->priv->lines; scan && (height < y); scan = scan->next) { + height += GTH_GRID_VIEW_LINE (scan->data)->height + self->priv->cell_spacing; + row++; + } + if (height < y) + row++; + row = MAX (row, 0); + + items_per_line = gth_grid_view_get_items_per_line (self); + col = (x - (self->priv->cell_spacing / 2)) / (self->priv->cell_size + self->priv->cell_spacing) + 1; + col = MIN (col, items_per_line); + + return (items_per_line * row) + col - 1; +} + + +static void +gth_grid_view_set_drag_dest_pos (GthFileView *file_view, + GdkDragContext *context, + int x, + int y, + guint time, + int *pos) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + GthDropPosition drop_pos; + int drop_image; + + g_return_if_fail (GTH_IS_GRID_VIEW (self)); + + drop_pos = self->priv->drop_pos; + drop_image = self->priv->drop_item; + + if ((x < 0) && (y < 0) && (drop_pos != GTH_DROP_POSITION_NONE)) { + if (drop_pos == GTH_DROP_POSITION_RIGHT) + drop_image++; + drop_pos = GTH_DROP_POSITION_NONE; + } + else { + drop_image = _gth_grid_view_get_drop_target_at (self, x, y); + + if (drop_image < 0) { + drop_image = 0; + drop_pos = GTH_DROP_POSITION_LEFT; + } + else if (drop_image >= self->priv->n_items) { + drop_image = self->priv->n_items - 1; + drop_pos = GTH_DROP_POSITION_RIGHT; + } + else { + GthGridViewItem *item = g_list_nth (self->priv->items, drop_image)->data; + if (x - item->area.x > self->priv->cell_size / 2) + drop_pos = GTH_DROP_POSITION_RIGHT; + else + drop_pos = GTH_DROP_POSITION_LEFT; + } + } + + if (pos != NULL) { + *pos = drop_image; + if (gtk_widget_get_direction(GTK_WIDGET (self)) == GTK_TEXT_DIR_RTL) { + if (drop_pos == GTH_DROP_POSITION_LEFT) + *pos = *pos + 1; + } + else { + if (drop_pos == GTH_DROP_POSITION_RIGHT) + *pos = *pos + 1; + } + } + + if ((drop_pos != self->priv->drop_pos) || (drop_image != self->priv->drop_item)) { + self->priv->drop_pos = drop_pos; + self->priv->drop_item = drop_image; + gtk_widget_queue_draw (GTK_WIDGET (self)); + } +} + + +void +gth_grid_view_get_drag_dest_pos (GthFileView *file_view, + int *pos) +{ + GthGridView *self = GTH_GRID_VIEW (file_view); + + g_return_if_fail (pos != NULL); + *pos = self->priv->drop_item; +} + + +/* GtkWidget methods */ + + +static void +_gth_grid_view_select_range (GthGridView *self, + GthGridViewItem *item, + int pos) +{ + int a, b; + GList *scan; + + if (self->priv->last_selected_pos == -1) { + self->priv->last_selected_pos = pos; + self->priv->last_selected_item = item; + } + + if (pos < self->priv->last_selected_pos) { + a = pos; + b = self->priv->last_selected_pos; + } + else { + a = self->priv->last_selected_pos; + b = pos; + } + + for (scan = g_list_nth (self->priv->items, a); + a <= b; + a++, scan = scan->next) + { + GthGridViewItem *item = scan->data; + + if (! (item->state & GTK_STATE_FLAG_SELECTED)) + _gth_grid_view_set_item_selected (self, TRUE, a); + } + + _gth_grid_view_set_item_selected (self, TRUE, pos); + _gth_grid_view_emit_selection_changed (self); + + gth_file_view_set_cursor (GTH_FILE_VIEW (self), pos); +} + + +static void +_gth_grid_view_select_single (GthGridView *self, + GthGridViewItem *item, + int pos, + GdkEventButton *event) +{ + if (item->state & GTK_STATE_FLAG_SELECTED) { + /* postpone selection to handle dragging. */ + self->priv->select_pending = TRUE; + self->priv->select_pending_pos = pos; + self->priv->select_pending_item = item; + } + else { + _gth_grid_view_unselect_all (self, NULL); + _gth_grid_view_set_item_selected_and_emit_signal (self, TRUE, pos); + self->priv->last_selected_pos = pos; + self->priv->last_selected_item = item; + } + + gth_file_view_set_cursor (GTH_FILE_VIEW (self), pos); +} + + +static void +_gth_grid_view_select_multiple (GthGridView *self, + GthGridViewItem *item, + int pos, + GdkEventButton *event) +{ + gboolean range; + gboolean additive; + + range = (event->state & GDK_SHIFT_MASK) != 0; + additive = (event->state & GDK_CONTROL_MASK) != 0; + + if (! additive && ! range) { + _gth_grid_view_select_single (self, item, pos, event); + return; + } + + if (range) { + _gth_grid_view_unselect_all (self, item); + _gth_grid_view_select_range (self, item, pos); + } + else if (additive) { + _gth_grid_view_set_item_selected_and_emit_signal (self, ! (item->state & GTK_STATE_FLAG_SELECTED), pos); + self->priv->last_selected_pos = pos; + self->priv->last_selected_item = item; + } + + gth_file_view_set_cursor (GTH_FILE_VIEW (self), pos); +} + + +static void +gth_grid_view_store_items_state (GthGridView *self) +{ + GList *scan; + + for (scan = self->priv->items; scan; scan = scan->next) { + GthGridViewItem *item = scan->data; + item->tmp_state = item->state; + } +} + + +static int +gth_grid_view_button_press (GtkWidget *widget, + GdkEventButton *event) +{ + GthGridView *self = GTH_GRID_VIEW (widget); + int retval = FALSE; + int pos; + + if (event->window != self->priv->bin_window) + return FALSE; + + if (! gtk_widget_has_focus (widget)) + gtk_widget_grab_focus (widget); + + pos = gth_grid_view_get_at_position (GTH_FILE_VIEW (self), event->x, event->y); + + if ((pos != -1) && (event->button == 1) && (event->type == GDK_2BUTTON_PRESS)) { + /* Double click activates the item */ + + if (((event->state & GDK_CONTROL_MASK) != GDK_CONTROL_MASK) + && ((event->state & GDK_SHIFT_MASK) != GDK_SHIFT_MASK)) + { + gth_file_view_activated (GTH_FILE_VIEW (self), pos); + } + retval = TRUE; + } + else if ((pos != -1) && (event->button == 2) && (event->type == GDK_BUTTON_PRESS)) { + /* This can be the start of a dragging action. */ + + if (! (event->state & GDK_CONTROL_MASK) + && ! (event->state & GDK_SHIFT_MASK) + && self->priv->drag_source_enabled) + { + self->priv->dragging = TRUE; + self->priv->drag_button = 2; + self->priv->drag_start_x = event->x; + self->priv->drag_start_y = event->y; + } + retval = TRUE; + } + else if ((pos != -1) && (event->button == 1) && (event->type == GDK_BUTTON_PRESS)) { + /* This can be the start of a dragging action. */ + + if (! (event->state & GDK_CONTROL_MASK) + && ! (event->state & GDK_SHIFT_MASK) + && self->priv->drag_source_enabled) + { + self->priv->dragging = TRUE; + self->priv->drag_button = 1; + self->priv->drag_start_x = event->x; + self->priv->drag_start_y = event->y; + } + + if (self->priv->selection_mode != GTK_SELECTION_NONE) { + GthGridViewItem *item; + + item = g_list_nth (self->priv->items, pos)->data; + if (self->priv->selection_mode == GTK_SELECTION_MULTIPLE) + _gth_grid_view_select_multiple (self, item, pos, event); + else + _gth_grid_view_select_single (self, item, pos, event); + } + else + gth_file_view_set_cursor (GTH_FILE_VIEW (self), pos); + + retval = TRUE; + } + else if ((pos == -1) && (event->button == 1) && (event->type == GDK_BUTTON_PRESS) && (self->priv->selection_mode == GTK_SELECTION_MULTIPLE)) { + /* This can be the start of a selection */ + + if ((event->state & GDK_CONTROL_MASK) == 0) + _gth_grid_view_unselect_all (self, NULL); + + if (! self->priv->selecting) { + gth_grid_view_store_items_state (self); + + self->priv->sel_start_x = event->x; + self->priv->sel_start_y = event->y; + self->priv->selection_area.x = event->x; + self->priv->selection_area.y = event->y; + self->priv->selection_area.width = 0; + self->priv->selection_area.height = 0; + self->priv->sel_state = event->state; + self->priv->selecting = TRUE; + } + retval = TRUE; + } + + return retval; +} + + +static gboolean +gth_grid_view_item_is_inside_area (GthGridViewItem *item, + int x1, + int y1, + int x2, + int y2) +{ + GdkRectangle area; + GdkRectangle item_area; + double x_ofs; + double y_ofs; + + if ((x1 == x2) && (y1 == y2)) + return FALSE; + + area.x = x1; + area.y = y1; + area.width = x2 - x1; + area.height = y2 - y1; + + item_area = item->area; + x_ofs = item_area.width / 6; + y_ofs = item_area.height / 6; + item_area.x += x_ofs; + item_area.y += y_ofs; + item_area.width -= x_ofs * 2; + item_area.height -= y_ofs * 2; + + return gdk_rectangle_intersect (&item_area, &area, NULL); +} + + +static void +_gth_grid_view_update_mouse_selection (GthGridView *self, + int x, + int y) +{ + cairo_rectangle_int_t old_selection_area; + cairo_region_t *invalid_region; + int x1, y1, x2, y2; + GtkAllocation allocation; + cairo_region_t *common_region; + gboolean additive; + gboolean invert; + int min_y, max_y; + GList *l, *begin, *end; + int i, begin_idx, end_idx; + + old_selection_area = self->priv->selection_area; + + /* calculate the new selection area */ + + if (self->priv->sel_start_x < x) { + x1 = self->priv->sel_start_x; + x2 = x; + } + else { + x1 = x; + x2 = self->priv->sel_start_x; + } + + if (self->priv->sel_start_y < y) { + y1 = self->priv->sel_start_y; + y2 = y; + } + else { + y1 = y; + y2 = self->priv->sel_start_y; + } + + gtk_widget_get_allocation (GTK_WIDGET (self), &allocation); + allocation.width = MAX (allocation.width, self->priv->width); + allocation.height = MAX (allocation.height, self->priv->height); + x1 = CLAMP (x1, 0, allocation.width); + y1 = CLAMP (y1, 0, allocation.height); + x2 = CLAMP (x2, 0, allocation.width); + y2 = CLAMP (y2, 0, allocation.height); + + self->priv->selection_area.x = x1; + self->priv->selection_area.y = y1; + self->priv->selection_area.width = x2 - x1; + self->priv->selection_area.height = y2 - y1; + + /* repaint the changed area */ + + invalid_region = cairo_region_create_rectangle (&old_selection_area); + cairo_region_union_rectangle (invalid_region, &self->priv->selection_area); + + common_region = cairo_region_create_rectangle (&old_selection_area); + cairo_region_intersect_rectangle (common_region, &self->priv->selection_area); + + if (! cairo_region_is_empty (common_region)) { + cairo_rectangle_int_t common_region_extents; + + /* invalidate the border as well */ + cairo_region_get_extents (common_region, &common_region_extents); + common_region_extents.x += RUBBERBAND_BORDER; + common_region_extents.y += RUBBERBAND_BORDER; + common_region_extents.width -= RUBBERBAND_BORDER * 2; + common_region_extents.height -= RUBBERBAND_BORDER * 2; + + cairo_region_subtract_rectangle (invalid_region, &common_region_extents); + } + + gdk_window_invalidate_region (self->priv->bin_window, invalid_region, FALSE); + + cairo_region_destroy (common_region); + cairo_region_destroy (invalid_region); + + /* select or unselect images as appropriate */ + + additive = self->priv->sel_state & GDK_SHIFT_MASK; + invert = self->priv->sel_state & GDK_CONTROL_MASK; + + /* Consider only images in the min_y --> max_y offset. */ + + min_y = self->priv->selection_area.y; + max_y = self->priv->selection_area.y + self->priv->selection_area.height; + + begin_idx = get_first_visible_at_offset (self, min_y); + begin = g_list_nth (self->priv->items, begin_idx); + + end_idx = get_last_visible_at_offset (self, max_y); + end = g_list_nth (self->priv->items, end_idx); + + if (end != NULL) + end = end->next; + + gdk_window_freeze_updates (self->priv->bin_window); + + x1 = self->priv->selection_area.x; + y1 = self->priv->selection_area.y; + x2 = x1 + self->priv->selection_area.width; + y2 = y1 + self->priv->selection_area.height; + + for (l = begin, i = begin_idx; l != end; l = l->next, i++) { + GthGridViewItem *item = l->data; + gboolean selection_changed; + + selection_changed = (item->state & GTK_STATE_FLAG_SELECTED) != (item->tmp_state & GTK_STATE_FLAG_SELECTED); + if (gth_grid_view_item_is_inside_area (item, x1, y1, x2, y2)) { + if (invert) { + if (! selection_changed) + _gth_grid_view_set_item_selected (self, ! (item->state & GTK_STATE_FLAG_SELECTED), i); + } + else if (additive) { + if (! (item->state & GTK_STATE_FLAG_SELECTED)) + _gth_grid_view_set_item_selected (self, TRUE, i); + } + else { + if (! (item->state & GTK_STATE_FLAG_SELECTED)) + _gth_grid_view_set_item_selected (self, TRUE, i); + } + } + else if (selection_changed) + _gth_grid_view_set_item_selected (self, (item->tmp_state & GTK_STATE_FLAG_SELECTED), i); + } + + gdk_window_thaw_updates (self->priv->bin_window); + + _gth_grid_view_emit_selection_changed (self); +} + + +static void +_gth_grid_view_stop_selecting (GthGridView *self) +{ + if (! self->priv->selecting) + return; + + self->priv->selecting = FALSE; + self->priv->sel_start_x = 0; + self->priv->sel_start_y = 0; + + if (self->priv->scroll_timeout != 0) { + g_source_remove (self->priv->scroll_timeout); + self->priv->scroll_timeout = 0; + } + + gdk_window_invalidate_rect (self->priv->bin_window, + &self->priv->selection_area, + FALSE); +} + + +static gboolean +gth_grid_view_button_release (GtkWidget *widget, + GdkEventButton *event) +{ + GthGridView *self = GTH_GRID_VIEW (widget); + + if (self->priv->dragging) { + self->priv->select_pending = self->priv->select_pending && ! self->priv->drag_started; + _gth_grid_view_stop_dragging (self); + } + + if (self->priv->selecting) { + _gth_grid_view_update_mouse_selection (self, event->x, event->y); + _gth_grid_view_stop_selecting (self); + } + + if (self->priv->select_pending) { + self->priv->select_pending = FALSE; + _gth_grid_view_unselect_all (self, NULL); + _gth_grid_view_set_item_selected_and_emit_signal (self, TRUE, self->priv->select_pending_pos); + self->priv->last_selected_pos = self->priv->select_pending_pos; + self->priv->last_selected_item = self->priv->select_pending_item; + } + + return FALSE; +} + + +static gboolean +autoscroll_cb (gpointer user_data) +{ + GthGridView *self = user_data; + double max_value; + double value; + + GDK_THREADS_ENTER (); + + max_value = gtk_adjustment_get_upper (self->priv->vadjustment) - gtk_adjustment_get_page_size (self->priv->vadjustment); + value = gtk_adjustment_get_value (self->priv->vadjustment) + self->priv->autoscroll_y_delta; + if (value > max_value) + value = max_value; + + gtk_adjustment_set_value (self->priv->vadjustment, value); + self->priv->event_last_y = self->priv->event_last_y + self->priv->autoscroll_y_delta; + _gth_grid_view_update_mouse_selection (self, self->priv->event_last_x, self->priv->event_last_y); + + GDK_THREADS_LEAVE (); + + return TRUE; +} + + +static gboolean +gth_grid_view_motion_notify (GtkWidget *widget, + GdkEventMotion *event) +{ + GthGridView *self = GTH_GRID_VIEW (widget); + + if (self->priv->dragging) { + if (! self->priv->drag_started + && (self->priv->selection != NULL) + && gtk_drag_check_threshold (widget, + self->priv->drag_start_x, + self->priv->drag_start_y, + event->x, + event->y)) + { + int pos; + GdkDragContext *context; + gboolean multi_dnd; + + /**/ + + pos = gth_grid_view_get_at_position (GTH_FILE_VIEW (self), + self->priv->drag_start_x, + self->priv->drag_start_y); + if (pos != -1) + gth_file_view_set_cursor (GTH_FILE_VIEW (self), pos); + + /**/ + + self->priv->drag_started = TRUE; + context = gtk_drag_begin (widget, + self->priv->drag_target_list, + self->priv->drag_actions, + self->priv->drag_button, + (GdkEvent *) event); + if (self->priv->drag_button == 2) + gdk_drag_status (context, GDK_ACTION_ASK, event->time); + + /* FIXME: create a cool drag icon here */ + multi_dnd = self->priv->selection->next != NULL; + gtk_drag_set_icon_stock (context, + multi_dnd ? GTK_STOCK_DND_MULTIPLE : GTK_STOCK_DND, + -4, -4); + } + + return TRUE; + } + else if (self->priv->selecting) { + double y_delta; + + y_delta = event->y - gtk_adjustment_get_value (self->priv->vadjustment); + if (fabs (y_delta) > MAX_DELTA_FOR_SCROLLING) + event->y = gtk_adjustment_get_upper (self->priv->vadjustment); + + _gth_grid_view_update_mouse_selection (self, event->x, event->y); + + /* If we are out of bounds, schedule a timeout that will do + * the scrolling */ + + y_delta = event->y - gtk_adjustment_get_value (self->priv->vadjustment); + if ((y_delta < 0) || (y_delta > gtk_widget_get_allocated_height (widget))) { + self->priv->event_last_x = event->x; + self->priv->event_last_y = event->y; + + /* Make the stepping relative to the mouse + * distance from the canvas. + * Also notice the timeout below is small to give a + * more smooth movement. + */ + if (y_delta < 0) + self->priv->autoscroll_y_delta = y_delta; + else + self->priv->autoscroll_y_delta = y_delta - gtk_widget_get_allocated_height (widget); + self->priv->autoscroll_y_delta /= 2; + + if (self->priv->scroll_timeout == 0) + self->priv->scroll_timeout = g_timeout_add (SCROLL_DELAY, autoscroll_cb, self); + } + else if (self->priv->scroll_timeout != 0) { + g_source_remove (self->priv->scroll_timeout); + self->priv->scroll_timeout = 0; + } + + return TRUE; + } + + return FALSE; +} + + +static void +select_range_with_keyboard (GthGridView *self, + int next_focused_item) +{ + int begin_idx; + int end_idx; + GList *begin; + GList *end; + int i; + GList *link; + + begin_idx = MIN (MIN (self->priv->first_focused_item, self->priv->focused_item), next_focused_item); + end_idx = MAX (MAX (self->priv->first_focused_item, self->priv->focused_item), next_focused_item); + begin = g_list_nth (self->priv->items, begin_idx); + end = g_list_nth (self->priv->items, end_idx); + if (end != NULL) + end = end->next; + + gdk_window_freeze_updates (self->priv->bin_window); + + for (link = begin, i = begin_idx; link != end; link = link->next, i++) { + if (next_focused_item > self->priv->first_focused_item) { + if ((i >= self->priv->first_focused_item) && (i <= next_focused_item)) + _gth_grid_view_select_item (self, i); + else + _gth_grid_view_unselect_item (self, i); + } + else { + if ((i >= next_focused_item) && (i <= self->priv->first_focused_item)) + _gth_grid_view_select_item (self, i); + else + _gth_grid_view_unselect_item (self, i); + } + } + + gdk_window_thaw_updates (self->priv->bin_window); + + _gth_grid_view_emit_selection_changed (self); +} + + +static GList * +_gth_grid_view_get_line_at_position (GthGridView *self, + int pos) +{ + GList *link; + GthGridViewItem *item; + GList *scan; + + link = g_list_nth (self->priv->items, pos); + g_return_val_if_fail (link != NULL, NULL); + + item = link->data; + for (scan = self->priv->lines; scan; scan = scan->next) { + GthGridViewLine *line = scan->data; + + if (g_list_find (line->items, item) != NULL) + return scan; + } + + return NULL; +} + + +static int +_gth_grid_view_get_item_at_page_distance (GthGridView *self, + int focused_item, + gboolean downward) +{ + int old_focused_item; + int direction; + int h; + GList *line; + int items_per_line; + + old_focused_item = focused_item; + direction = downward ? 1 : -1; + h = gtk_widget_get_allocated_height (GTK_WIDGET (self)); + line = _gth_grid_view_get_line_at_position (self, focused_item); + items_per_line = gth_grid_view_get_items_per_line (self); + + while ((h > 0) && (line != NULL)) { + h -= GTH_GRID_VIEW_LINE (line->data)->height + self->priv->cell_spacing; + if (h > 0) { + focused_item = focused_item + direction * items_per_line; + if ((focused_item >= self->priv->n_items - 1) || (focused_item <= 0)) + return focused_item; + } + + if (downward) + line = line->next; + else + line = line->prev; + } + + if (old_focused_item == focused_item) + focused_item = focused_item + (direction * items_per_line); + + return focused_item; +} + + +static gboolean +gth_grid_view_move_cursor (GthGridView *self, + GthCursorMovement dir, + GthSelectionChange sel_change) +{ + int items_per_line; + int next_focused_item; + + if (self->priv->n_items == 0) + return FALSE; + + if (! gtk_widget_has_focus (GTK_WIDGET (self))) + return FALSE; + + items_per_line = gth_grid_view_get_items_per_line (self); + next_focused_item = self->priv->focused_item; + + if (self->priv->focused_item == -1) { + self->priv->first_focused_item = 0; + next_focused_item = 0; + } + else { + switch (dir) { + case GTH_CURSOR_MOVE_RIGHT: + next_focused_item++; + break; + + case GTH_CURSOR_MOVE_LEFT: + next_focused_item--; + break; + + case GTH_CURSOR_MOVE_DOWN: + next_focused_item += items_per_line; + break; + + case GTH_CURSOR_MOVE_UP: + next_focused_item -= items_per_line; + break; + + case GTH_CURSOR_MOVE_PAGE_UP: + next_focused_item = _gth_grid_view_get_item_at_page_distance (self, + next_focused_item, + FALSE); + break; + + case GTH_CURSOR_MOVE_PAGE_DOWN: + next_focused_item = _gth_grid_view_get_item_at_page_distance (self, + next_focused_item, + TRUE); + break; + + case GTH_CURSOR_MOVE_BEGIN: + next_focused_item = 0; + break; + + case GTH_CURSOR_MOVE_END: + next_focused_item = self->priv->n_items - 1; + break; + + default: + break; + } + + if (((next_focused_item < 0) && (self->priv->focused_item == 0)) + || ((next_focused_item > self->priv->n_items - 1) && (self->priv->focused_item == self->priv->n_items - 1))) + { + gdk_beep (); + } + next_focused_item = CLAMP (next_focused_item, 0, self->priv->n_items - 1); + } + + if (sel_change == GTH_SELECTION_SET_CURSOR) { + _gth_grid_view_unselect_all (self, NULL); + _gth_grid_view_set_item_selected (self, TRUE, next_focused_item); + _gth_grid_view_emit_selection_changed (self); + } + else if (sel_change == GTH_SELECTION_SET_RANGE) + select_range_with_keyboard (self, next_focused_item); + + gth_file_view_set_cursor (GTH_FILE_VIEW (self), next_focused_item); + + return TRUE; +} + + +static gboolean +gth_grid_view_select_cursor_item (GthGridView *self) +{ + GthGridViewItem *item; + + if (self->priv->focused_item == -1) + return FALSE; + + item = g_list_nth (self->priv->items, self->priv->focused_item)->data; + g_return_val_if_fail (item != NULL, FALSE); + + _gth_grid_view_unselect_all (self, item); + _gth_grid_view_select_item (self, self->priv->focused_item); + self->priv->last_selected_pos = self->priv->select_pending_pos; + self->priv->last_selected_item = self->priv->select_pending_item; + _gth_grid_view_emit_selection_changed (self); + + return TRUE; +} + + +static gboolean +gth_grid_view_toggle_cursor_item (GthGridView *self) +{ + GList *link; + GthGridViewItem *item; + + if (self->priv->focused_item == -1) + return FALSE; + + link = g_list_nth (self->priv->items, self->priv->focused_item); + g_return_val_if_fail (link != NULL, FALSE); + + item = link->data; + if (item->state & GTK_STATE_FLAG_SELECTED) + _gth_grid_view_unselect_item (self, self->priv->focused_item); + else + _gth_grid_view_select_item (self, self->priv->focused_item); + _gth_grid_view_emit_selection_changed (self); + + return TRUE; +} + + +static gboolean +gth_grid_view_activate_cursor_item (GthGridView *self) +{ + if (self->priv->focused_item >= 0) { + gth_file_view_activated (GTH_FILE_VIEW (self), self->priv->focused_item); + return TRUE; + } + + return FALSE; +} + + +static void +_gtk_binding_entry_add_move_cursor_signals (GtkBindingSet *binding_set, + guint keyval, + GthCursorMovement dir) +{ + gtk_binding_entry_add_signal (binding_set, keyval, 0, + "move-cursor", 2, + G_TYPE_ENUM, dir, + G_TYPE_ENUM, GTH_SELECTION_SET_CURSOR); + + gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK, + "move-cursor", 2, + G_TYPE_ENUM, dir, + G_TYPE_ENUM, GTH_SELECTION_KEEP); + + gtk_binding_entry_add_signal (binding_set, keyval, GDK_SHIFT_MASK, + "move-cursor", 2, + G_TYPE_ENUM, dir, + G_TYPE_ENUM, GTH_SELECTION_SET_RANGE); +} + + +static void +_gth_grid_view_set_hadjustment (GthGridView *self, + GtkAdjustment *adjustment) +{ + if (adjustment != NULL) + g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); + else + adjustment = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + + if ((self->priv->hadjustment != NULL) && (self->priv->hadjustment != adjustment)) { + g_signal_handlers_disconnect_by_data (self->priv->hadjustment, self); + g_object_unref (self->priv->hadjustment); + self->priv->hadjustment = NULL; + } + + if (self->priv->hadjustment != adjustment) { + self->priv->hadjustment = adjustment; + g_object_ref (self->priv->hadjustment); + g_object_ref_sink (self->priv->hadjustment); + + _gth_grid_view_configure_hadjustment (self); + + g_signal_connect (self->priv->hadjustment, + "value-changed", + G_CALLBACK (adjustment_value_changed), + self); + } +} + + +static void +_gth_grid_view_set_vadjustment (GthGridView *self, + GtkAdjustment *adjustment) +{ + if (adjustment != NULL) + g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); + else + adjustment = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + + if ((self->priv->vadjustment != NULL) && (self->priv->vadjustment != adjustment)) { + g_signal_handlers_disconnect_by_data (self->priv->vadjustment, self); + g_object_unref (self->priv->vadjustment); + self->priv->vadjustment = NULL; + } + + if (self->priv->vadjustment != adjustment) { + self->priv->vadjustment = adjustment; + g_object_ref (self->priv->vadjustment); + g_object_ref_sink (self->priv->vadjustment); + + _gth_grid_view_configure_vadjustment (self); + + g_signal_connect (self->priv->vadjustment, + "value-changed", + G_CALLBACK (adjustment_value_changed), + self); + } +} + + +static void +_gth_grid_view_set_thumbnail_size (GthGridView *self, + int size) +{ + self->priv->thumbnail_size = size; + self->priv->cell_size = self->priv->thumbnail_size + (self->priv->thumbnail_border * 2) + (self->priv->cell_padding * 2); + self->priv->update_caption_height = TRUE; + g_object_notify (G_OBJECT (self), "thumbnail-size"); + + _gth_grid_view_queue_relayout (self); +} + + +static void +_gth_grid_view_set_caption (GthGridView *self, + const char *attributes) +{ + GList *scan; + + g_free (self->priv->caption_attributes); + self->priv->caption_attributes = g_strdup (attributes); + + if (self->priv->caption_attributes_v != NULL) { + g_strfreev (self->priv->caption_attributes_v); + self->priv->caption_attributes_v = NULL; + } + if (self->priv->caption_attributes != NULL) + self->priv->caption_attributes_v = g_strsplit (self->priv->caption_attributes, ",", -1); + + for (scan = self->priv->items; scan; scan = scan->next) + gth_grid_view_item_update_caption (GTH_GRID_VIEW_ITEM (scan->data), self->priv->caption_attributes_v); + self->priv->update_caption_height = TRUE; + + g_object_notify (G_OBJECT (self), "caption"); + + _gth_grid_view_queue_relayout (self); +} + + +static void +gth_grid_view_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GthGridView *self; + + self = GTH_GRID_VIEW (object); + + switch (prop_id) { + case PROP_CAPTION: + _gth_grid_view_set_caption (self, g_value_get_string (value)); + break; + case PROP_HADJUSTMENT: + _gth_grid_view_set_hadjustment (self, g_value_get_object (value)); + break; + case PROP_HSCROLL_POLICY: + /* FIXME */ + break; + case PROP_MODEL: + gth_grid_view_set_model (GTH_FILE_VIEW (self), g_value_get_object (value)); + break; + case PROP_THUMBNAIL_SIZE: + _gth_grid_view_set_thumbnail_size (self, g_value_get_int (value)); + break; + case PROP_VADJUSTMENT: + _gth_grid_view_set_vadjustment (self, g_value_get_object (value)); + break; + case PROP_VSCROLL_POLICY: + /* FIXME */ + break; + default: + break; + } +} + + +static void +gth_grid_view_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GthGridView *self; + + self = GTH_GRID_VIEW (object); + + switch (prop_id) { + case PROP_CAPTION: + g_value_set_string (value, self->priv->caption_attributes); + break; + case PROP_CELL_SPACING: + g_value_set_int (value, self->priv->cell_spacing); + break; + case PROP_HADJUSTMENT: + g_value_set_object (value, self->priv->hadjustment); + break; + case PROP_HSCROLL_POLICY: + /* FIXME */ + break; + case PROP_MODEL: + g_value_set_object (value, self->priv->model); + break; + case PROP_THUMBNAIL_SIZE: + g_value_set_int (value, self->priv->thumbnail_size); + break; + case PROP_VADJUSTMENT: + g_value_set_object (value, self->priv->vadjustment); + break; + case PROP_VSCROLL_POLICY: + /* FIXME */ + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + + +static void +gth_grid_view_class_init (GthGridViewClass *grid_view_class) +{ + GObjectClass *gobject_class; + GtkWidgetClass *widget_class; + GtkBindingSet *binding_set; + + g_type_class_add_private (grid_view_class, sizeof (GthGridViewPrivate)); + + /* Methods */ + + gobject_class = (GObjectClass*) grid_view_class; + gobject_class->finalize = gth_grid_view_finalize; + gobject_class->set_property = gth_grid_view_set_property; + gobject_class->get_property = gth_grid_view_get_property; + + widget_class = (GtkWidgetClass*) grid_view_class; + widget_class->map = gth_grid_view_map; + widget_class->unmap = gth_grid_view_unmap; + widget_class->realize = gth_grid_view_realize; + widget_class->unrealize = gth_grid_view_unrealize; + widget_class->state_flags_changed = gth_grid_view_state_flags_changed; + widget_class->style_updated = gth_grid_view_style_updated; + widget_class->get_preferred_width = gth_grid_view_get_preferred_width; + widget_class->get_preferred_height = gth_grid_view_get_preferred_height; + widget_class->size_allocate = gth_grid_view_size_allocate; + widget_class->draw = gth_grid_view_draw; + widget_class->focus_in_event = gth_grid_view_focus_in; + widget_class->focus_out_event = gth_grid_view_focus_out; + widget_class->key_press_event = gth_grid_view_key_press; + widget_class->key_release_event = gth_grid_view_key_release; + widget_class->scroll_event = gth_grid_view_scroll_event; + widget_class->button_press_event = gth_grid_view_button_press; + widget_class->button_release_event = gth_grid_view_button_release; + widget_class->motion_notify_event = gth_grid_view_motion_notify; + + grid_view_class->select_all = gth_grid_view_select_all; + grid_view_class->unselect_all = gth_grid_view_unselect_all; + grid_view_class->toggle_cursor_item = gth_grid_view_toggle_cursor_item; + grid_view_class->select_cursor_item = gth_grid_view_select_cursor_item; + grid_view_class->move_cursor = gth_grid_view_move_cursor; + grid_view_class->activate_cursor_item = gth_grid_view_activate_cursor_item; + + /* Signals */ + + grid_view_signals[SELECT_ALL] = + g_signal_new ("select-all", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GthGridViewClass, select_all), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + grid_view_signals[UNSELECT_ALL] = + g_signal_new ("unselect-all", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GthGridViewClass, unselect_all), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + grid_view_signals[ACTIVATE_CURSOR_ITEM] = + g_signal_new ("activate-cursor-item", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GthGridViewClass, activate_cursor_item), + NULL, NULL, + gth_marshal_BOOLEAN__VOID, + G_TYPE_BOOLEAN, 0); + grid_view_signals[MOVE_CURSOR] = + g_signal_new ("move-cursor", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GthGridViewClass, move_cursor), + NULL, NULL, + gth_marshal_BOOLEAN__ENUM_ENUM, + G_TYPE_BOOLEAN, 2, + GTH_TYPE_CURSOR_MOVEMENT, + GTH_TYPE_SELECTION_CHANGE); + grid_view_signals[SELECT_CURSOR_ITEM] = + g_signal_new ("select-cursor-item", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GthGridViewClass, select_cursor_item), + NULL, NULL, + gth_marshal_BOOLEAN__VOID, + G_TYPE_BOOLEAN, 0); + grid_view_signals[TOGGLE_CURSOR_ITEM] = + g_signal_new ("toggle-cursor-item", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + G_STRUCT_OFFSET (GthGridViewClass, toggle_cursor_item), + NULL, NULL, + gth_marshal_BOOLEAN__VOID, + G_TYPE_BOOLEAN, 0); + + /* Properties */ + + g_object_class_install_property (gobject_class, + PROP_CELL_SPACING, + g_param_spec_int ("cell-spacing", + "Cell Spacing", + "Spacing between cells both horizontally and vertically", + 0, + G_MAXINT32, + DEFAULT_CELL_SPACING, + G_PARAM_READWRITE)); + + /* GtkScrollable properties */ + + g_object_class_override_property (gobject_class, PROP_HADJUSTMENT, "hadjustment"); + g_object_class_override_property (gobject_class, PROP_VADJUSTMENT, "vadjustment"); + g_object_class_override_property (gobject_class, PROP_HSCROLL_POLICY, "hscroll-policy"); + g_object_class_override_property (gobject_class, PROP_VSCROLL_POLICY, "vscroll-policy"); + + /* GthFileView properties */ + + g_object_class_override_property (gobject_class, PROP_CAPTION, "caption"); + g_object_class_override_property (gobject_class, PROP_MODEL, "model"); + g_object_class_override_property (gobject_class, PROP_THUMBNAIL_SIZE, "thumbnail-size"); + + /* Key bindings */ + + binding_set = gtk_binding_set_by_class (grid_view_class); + + _gtk_binding_entry_add_move_cursor_signals (binding_set, GDK_KEY_Right, GTH_CURSOR_MOVE_RIGHT); + _gtk_binding_entry_add_move_cursor_signals (binding_set, GDK_KEY_Left, GTH_CURSOR_MOVE_LEFT); + _gtk_binding_entry_add_move_cursor_signals (binding_set, GDK_KEY_Down, GTH_CURSOR_MOVE_DOWN); + _gtk_binding_entry_add_move_cursor_signals (binding_set, GDK_KEY_Up, GTH_CURSOR_MOVE_UP); + _gtk_binding_entry_add_move_cursor_signals (binding_set, GDK_KEY_Page_Up, GTH_CURSOR_MOVE_PAGE_UP); + _gtk_binding_entry_add_move_cursor_signals (binding_set, GDK_KEY_Page_Down, GTH_CURSOR_MOVE_PAGE_DOWN); + _gtk_binding_entry_add_move_cursor_signals (binding_set, GDK_KEY_Home, GTH_CURSOR_MOVE_BEGIN); + _gtk_binding_entry_add_move_cursor_signals (binding_set, GDK_KEY_End, GTH_CURSOR_MOVE_END); + + gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, 0, + "select-cursor-item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, 0, + "select-cursor-item", 0); + + gtk_binding_entry_add_signal (binding_set, GDK_KEY_space, GDK_CONTROL_MASK, + "toggle-cursor-item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Space, GDK_CONTROL_MASK, + "toggle-cursor-item", 0); + + gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK, + "select-all", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK, + "select-all", 0); + + gtk_binding_entry_add_signal (binding_set, GDK_KEY_A, GDK_SHIFT_MASK | GDK_CONTROL_MASK, + "unselect-all", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_CONTROL_MASK, + "unselect-all", 0); + + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0, + "activate-cursor-item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, 0, + "activate-cursor-item", 0); + gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0, + "activate-cursor-item", 0); +} + + +static void +gth_grid_view_gth_file_selection_interface_init (GthFileSelectionInterface *iface) +{ + iface->set_selection_mode = gth_grid_view_set_selection_mode; + iface->get_selected = gth_grid_view_get_selected; + iface->select = gth_grid_view_select; + iface->unselect = gth_grid_view_unselect; + iface->select_all = gth_grid_view_select_all; + iface->unselect_all = gth_grid_view_unselect_all; + iface->is_selected = gth_grid_view_is_selected; + iface->get_first_selected = gth_grid_view_get_first_selected; + iface->get_last_selected = gth_grid_view_get_last_selected; + iface->get_n_selected = gth_grid_view_get_n_selected; +} + + +static void +gth_grid_view_gth_file_view_interface_init (GthFileViewInterface *iface) +{ + iface->scroll_to = gth_grid_view_scroll_to; + iface->get_visibility = gth_grid_view_get_visibility; + iface->get_at_position = gth_grid_view_get_at_position; + iface->get_first_visible = gth_grid_view_get_first_visible; + iface->get_last_visible = gth_grid_view_get_last_visible; + iface->cursor_changed = gth_grid_view_cursor_changed; + iface->get_cursor = gth_grid_view_get_cursor; + iface->enable_drag_source = gth_grid_view_enable_drag_source; + iface->unset_drag_source = gth_grid_view_unset_drag_source; + iface->enable_drag_dest = gth_grid_view_enable_drag_dest; + iface->unset_drag_dest = gth_grid_view_unset_drag_dest; + iface->set_drag_dest_pos = gth_grid_view_set_drag_dest_pos; + iface->get_drag_dest_pos = gth_grid_view_get_drag_dest_pos; +} + + +static void +gth_grid_view_init (GthGridView *self) +{ + gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE); + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_GRID_VIEW, GthGridViewPrivate); + + /* self->priv->model = NULL; */ + self->priv->items = NULL; + self->priv->n_items = 0; + self->priv->lines = NULL; + self->priv->selection = NULL; + self->priv->focused_item = -1; + self->priv->first_focused_item = -1; + self->priv->make_focused_visible = FALSE; + self->priv->needs_relayout = FALSE; + self->priv->layout_timeout = 0; + self->priv->relayout_from_line = -1; + self->priv->update_caption_height = TRUE; + self->priv->width = 0; + self->priv->height = 0; + /* self->priv->thumbnail_size = 0; */ + self->priv->thumbnail_border = DEFAULT_THUMBNAIL_BORDER; + + /* self->priv->cell_size = 0; */ + self->priv->cell_spacing = DEFAULT_CELL_SPACING; + /* self->priv->cell_padding = DEFAULT_CELL_PADDING; */ + self->priv->caption_spacing = DEFAULT_CAPTION_SPACING; + self->priv->caption_padding = DEFAULT_CAPTION_PADDING; + + self->priv->scroll_timeout = 0; + self->priv->autoscroll_y_delta = 0; + self->priv->event_last_x = 0; + self->priv->event_last_y = 0; + + self->priv->selecting = FALSE; + self->priv->select_pending = FALSE; + self->priv->select_pending_pos = -1; + self->priv->select_pending_item = NULL; + gth_grid_view_set_selection_mode (GTH_FILE_SELECTION (self), GTK_SELECTION_MULTIPLE); + /* self->priv->selection_area = 0; */ + self->priv->last_selected_pos = -1; + self->priv->last_selected_item = NULL; + self->priv->multi_selecting_with_keyboard = FALSE; + self->priv->selection_changed = FALSE; + self->priv->sel_start_x = 0; + self->priv->sel_start_y = 0; + self->priv->sel_state = 0; + + self->priv->dragging = FALSE; + self->priv->drag_started = FALSE; + self->priv->drag_source_enabled = FALSE; + self->priv->drag_start_button_mask = 0; + self->priv->drag_button = 0; + self->priv->drag_target_list = NULL; + self->priv->drag_actions = 0; + self->priv->drag_start_x = 0; + self->priv->drag_start_y = 0; + self->priv->drop_item = -1; + self->priv->drop_pos = GTH_DROP_POSITION_NONE; + + self->priv->bin_window = NULL; + + self->priv->caption_attributes = NULL; + self->priv->caption_attributes_v = NULL; + self->priv->caption_layout = NULL; + self->priv->icon_cache = NULL; + + _gth_grid_view_set_hadjustment (self, gtk_adjustment_new (0.0, 1.0, 0.0, 0.1, 1.0, 1.0)); + _gth_grid_view_set_vadjustment (self, gtk_adjustment_new (0.0, 1.0, 0.0, 0.1, 1.0, 1.0)); +} + + +GtkWidget * +gth_grid_view_new (void) +{ + return g_object_new (GTH_TYPE_GRID_VIEW, NULL); +} + + +void +gth_grid_view_set_cell_spacing (GthGridView *self, + int cell_spacing) +{ + g_return_if_fail (GTH_IS_GRID_VIEW (self)); + + self->priv->cell_spacing = cell_spacing; + g_object_notify (G_OBJECT (self), "cell-spacing"); + + _gth_grid_view_queue_relayout (self); +} + + +int +gth_grid_view_get_items_per_line (GthGridView *self) +{ + g_return_val_if_fail (GTH_IS_GRID_VIEW (self), 0); + + return MAX (self->priv->width / (self->priv->cell_size + self->priv->cell_spacing), 1); +} diff -Nru gthumb-2.14.3/gthumb/gth-grid-view.h gthumb-3.0.0/gthumb/gth-grid-view.h --- gthumb-2.14.3/gthumb/gth-grid-view.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-grid-view.h 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,98 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2003-2011 The Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_GRID_VIEW_H +#define GTH_GRID_VIEW_H + +#include +#include "typedefs.h" +#include "gth-file-selection.h" + +G_BEGIN_DECLS + +typedef enum { + GTH_CURSOR_MOVE_UP, + GTH_CURSOR_MOVE_DOWN, + GTH_CURSOR_MOVE_RIGHT, + GTH_CURSOR_MOVE_LEFT, + GTH_CURSOR_MOVE_PAGE_UP, + GTH_CURSOR_MOVE_PAGE_DOWN, + GTH_CURSOR_MOVE_BEGIN, + GTH_CURSOR_MOVE_END, +} GthCursorMovement; + +typedef enum { + GTH_DROP_POSITION_NONE, + GTH_DROP_POSITION_INTO, + GTH_DROP_POSITION_LEFT, + GTH_DROP_POSITION_RIGHT +} GthDropPosition; + +typedef enum { + GTH_SELECTION_KEEP, /* Do not change the selection. */ + GTH_SELECTION_SET_CURSOR, /* Select the cursor image. */ + GTH_SELECTION_SET_RANGE /* Select the images contained + * in the rectangle that has as + * opposite corners the last + * focused image and the + * currently focused image. */ +} GthSelectionChange; + +#define GTH_TYPE_GRID_VIEW (gth_grid_view_get_type ()) +#define GTH_GRID_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_GRID_VIEW, GthGridView)) +#define GTH_GRID_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_GRID_VIEW, GthGridViewClass)) +#define GTH_IS_GRID_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_GRID_VIEW)) +#define GTH_IS_GRID_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_GRID_VIEW)) +#define GTH_GRID_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_GRID_VIEW, GthGridViewClass)) + +typedef struct _GthGridView GthGridView; +typedef struct _GthGridViewClass GthGridViewClass; +typedef struct _GthGridViewPrivate GthGridViewPrivate; + +struct _GthGridView { + GtkWidget __parent; + GthGridViewPrivate *priv; +}; + +struct _GthGridViewClass { + GtkWidgetClass __parent_class; + + /*< key binding signals >*/ + + void (* select_all) (GthFileSelection *grid_view); + void (* unselect_all) (GthFileSelection *grid_view); + gboolean (* select_cursor_item) (GthGridView *grid_view); + gboolean (* toggle_cursor_item) (GthGridView *grid_view); + gboolean (* move_cursor) (GthGridView *grid_view, + GthCursorMovement dir, + GthSelectionChange sel_change); + gboolean (* activate_cursor_item) (GthGridView *grid_view); +}; + +GType gth_grid_view_get_type (void); +GtkWidget * gth_grid_view_new (void); +void gth_grid_view_set_cell_spacing (GthGridView *grid_view, + int cell_spacing); +int gth_grid_view_get_items_per_line (GthGridView *self); + +G_END_DECLS + +#endif /* GTH_GRID_VIEW_H */ diff -Nru gthumb-2.14.3/gthumb/gth-histogram.c gthumb-3.0.0/gthumb/gth-histogram.c --- gthumb-2.14.3/gthumb/gth-histogram.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-histogram.c 2012-02-19 15:01:32.000000000 +0000 @@ -39,10 +39,12 @@ }; -static gpointer parent_class = NULL; static guint gth_histogram_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (GthHistogram, gth_histogram, G_TYPE_OBJECT) + + static void gth_histogram_finalize (GObject *object) { @@ -56,7 +58,7 @@ g_free (self->priv->values); g_free (self->priv->values_max); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_histogram_parent_class)->finalize (object); } @@ -65,7 +67,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthHistogramPrivate)); object_class = (GObjectClass*) klass; @@ -98,33 +99,6 @@ } -GType -gth_histogram_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthHistogramClass), - NULL, - NULL, - (GClassInitFunc) gth_histogram_class_init, - NULL, - NULL, - sizeof (GthHistogram), - 0, - (GInstanceInitFunc) gth_histogram_init - }; - type = g_type_register_static (G_TYPE_OBJECT, - "GthHistogram", - &type_info, - 0); - } - - return type; -} - - GthHistogram * gth_histogram_new (void) { diff -Nru gthumb-2.14.3/gthumb/gth-histogram-view.c gthumb-3.0.0/gthumb/gth-histogram-view.c --- gthumb-2.14.3/gthumb/gth-histogram-view.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-histogram-view.c 2012-02-19 15:01:32.000000000 +0000 @@ -48,8 +48,6 @@ CHANNEL_COLUMN_SENSITIVE }; -static gpointer gth_histogram_view_parent_class = NULL; - struct _GthHistogramViewPrivate { GthHistogram *histogram; @@ -70,6 +68,9 @@ }; +G_DEFINE_TYPE (GthHistogramView, gth_histogram_view, GTK_TYPE_BOX) + + static void gth_histogram_set_property (GObject *object, guint property_id, @@ -136,7 +137,9 @@ self = GTH_HISTOGRAM_VIEW (obj); - gth_histogram_view_set_histogram (self, NULL); + if (self->priv->histogram_changed_event != 0) + g_signal_handler_disconnect (self->priv->histogram, self->priv->histogram_changed_event); + _g_object_unref (self->priv->histogram); _g_object_unref (self->priv->builder); G_OBJECT_CLASS (gth_histogram_view_parent_class)->finalize (obj); @@ -148,7 +151,6 @@ { GObjectClass *object_class; - gth_histogram_view_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthHistogramViewPrivate)); object_class = (GObjectClass*) klass; @@ -220,6 +222,7 @@ gtk_label_set_text (GTK_LABEL (GET_WIDGET ("total_label")), ""); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("selected_label")), ""); gtk_label_set_text (GTK_LABEL (GET_WIDGET ("max_label")), ""); + return; } @@ -342,6 +345,7 @@ static void gth_histogram_paint_channel (GthHistogramView *self, + GtkStyleContext *style_context, cairo_t *cr, int channel, GtkAllocation *allocation) @@ -366,16 +370,20 @@ else max = 1.0; - step = (double) (allocation->width - 1) / 256.0; + step = (double) allocation->width / 256.0; cairo_set_line_width (cr, 0.5); for (i = 0; i <= 255; i++) { double value; int y; value = gth_histogram_get_value (self->priv->histogram, channel, i); - y = (int) ((allocation->height - 1) * convert_to_scale (self->priv->scale_type, value)) / max; + y = CLAMP ((int) (allocation->height * convert_to_scale (self->priv->scale_type, value)) / max, 0, allocation->height); - cairo_rectangle (cr, (i * step) + 0.5, allocation->height - y - 0.5, step, allocation->height); + cairo_rectangle (cr, + allocation->x + (i * step) + 0.5, + allocation->y + allocation->height - y + 0.5, + step, + y); } cairo_fill (cr); } @@ -383,15 +391,14 @@ static void gth_histogram_paint_rgb (GthHistogramView *self, + GtkStyleContext *style_context, cairo_t *cr, GtkAllocation *allocation) { - GtkStyle *style; - double max; - double step; - int i; + double max; + double step; + int i; - style = gtk_widget_get_style (GTK_WIDGET (self)); max = MAX (gth_histogram_get_channel_max (self->priv->histogram, 1), gth_histogram_get_channel_max (self->priv->histogram, 2)); max = MAX (max, gth_histogram_get_channel_max (self->priv->histogram, 3)); if (max > 0.0) @@ -399,17 +406,17 @@ else max = 1.0; - step = (double) (allocation->width - 1) / 256.0; + step = (double) allocation->width / 256.0; cairo_set_line_width (cr, 0.5); for (i = 0; i <= 255; i++) { - double value_r; - double value_g; - double value_b; - int min_c; - int mid_c; - int max_c; - int y; - double value; + double value_r; + double value_g; + double value_b; + int min_c; + int mid_c; + int max_c; + int y; + double value; value_r = gth_histogram_get_value (self->priv->histogram, 1, i); value_g = gth_histogram_get_value (self->priv->histogram, 2, i); @@ -449,8 +456,12 @@ cairo_set_operator (cr, CAIRO_OPERATOR_OVER); _cairo_set_source_color_from_channel (cr, max_c); value = gth_histogram_get_value (self->priv->histogram, max_c, i); - y = (int) ((allocation->height - 1) * convert_to_scale (self->priv->scale_type, value)) / max; - cairo_rectangle (cr, (i * step) + 0.5, allocation->height - y - 0.5, step, allocation->height); + y = CLAMP ((int) (allocation->height * convert_to_scale (self->priv->scale_type, value)) / max, 0, allocation->height); + cairo_rectangle (cr, + allocation->x + (i * step) + 0.5, + allocation->y + allocation->height - y + 0.5, + step, + y); cairo_fill (cr); /* use the ADD operator for the middle value */ @@ -458,18 +469,32 @@ cairo_set_operator (cr, CAIRO_OPERATOR_ADD); _cairo_set_source_color_from_channel (cr, mid_c); value = gth_histogram_get_value (self->priv->histogram, mid_c, i); - y = (int) ((allocation->height - 1) * convert_to_scale (self->priv->scale_type, value)) / max; - cairo_rectangle (cr, (i * step) + 0.5, allocation->height - y - 0.5, step, allocation->height); + y = CLAMP ((int) (allocation->height * convert_to_scale (self->priv->scale_type, value)) / max, 0, allocation->height); + cairo_rectangle (cr, + allocation->x + (i * step) + 0.5, + allocation->y + allocation->height - y + 0.5, + step, + y); cairo_fill (cr); /* the minimum value is shared by all the channels and is - * painted in black. */ + * painted in white if inside the selection, otherwise in black. */ cairo_set_operator (cr, CAIRO_OPERATOR_OVER); - gdk_cairo_set_source_color (cr, &style->text[gtk_widget_get_state (GTK_WIDGET (self))]); + if (((self->priv->selection_start > 0) || (self->priv->selection_end < 255)) + && (i >= self->priv->selection_start) && (i <= self->priv->selection_end)) + { + cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); + } + else + cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); value = gth_histogram_get_value (self->priv->histogram, min_c, i); - y = (int) ((allocation->height - 1) * convert_to_scale (self->priv->scale_type, value)) / max; - cairo_rectangle (cr, (i * step) + 0.5, allocation->height - y - 0.5, step, allocation->height); + y = CLAMP ((int) (allocation->height * convert_to_scale (self->priv->scale_type, value)) / max, 0, allocation->height); + cairo_rectangle (cr, + allocation->x + (i * step) + 0.5, + allocation->y + allocation->height - y + 0.5, + step, + y); cairo_fill (cr); } } @@ -477,101 +502,101 @@ static void gth_histogram_paint_grid (GthHistogramView *self, + GtkStyleContext *style_context, cairo_t *cr, GtkAllocation *allocation) { - GtkStyle *style; - double grid_step; - int i; - - cairo_set_operator (cr, CAIRO_OPERATOR_OVER); - - style = gtk_widget_get_style (GTK_WIDGET (self)); - gdk_cairo_set_source_color (cr, &style->dark[gtk_widget_get_state (GTK_WIDGET (self))]); - + GdkRGBA color; + double grid_step; + int i; + + gtk_style_context_get_border_color (style_context, + gtk_widget_get_state (GTK_WIDGET (self)), + &color); + gdk_cairo_set_source_rgba (cr, &color); cairo_set_line_width (cr, 0.5); - cairo_rectangle (cr, 0.5, 0.5, allocation->width, allocation->height); - cairo_stroke (cr); grid_step = 256.0 / 5; for (i = 1; i < 5; i++) { int x; x = (i * grid_step) * ((double) allocation->width / 256.0); - - cairo_move_to (cr, x + 0.5, 0); - cairo_line_to (cr, x + 0.5, allocation->height); + cairo_move_to (cr, allocation->x + x + 0.5, allocation->y); + cairo_line_to (cr, allocation->x + x + 0.5, allocation->y + allocation->height); } + cairo_stroke (cr); } static void gth_histogram_paint_selection (GthHistogramView *self, + GtkStyleContext *style_context, cairo_t *cr, GtkAllocation *allocation) { - GtkStyle *style; - double step; + GdkRGBA color; + double step; cairo_set_operator (cr, CAIRO_OPERATOR_OVER); cairo_set_line_width (cr, 0.5); - style = gtk_widget_get_style (GTK_WIDGET (self)); - gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_SELECTED]); + gtk_style_context_get_background_color (style_context, GTK_STATE_SELECTED | GTK_STATE_FOCUSED, &color); + gdk_cairo_set_source_rgba (cr, &color); step = (double) allocation->width / 256.0; cairo_rectangle (cr, - self->priv->selection_start * step, - 0, - (self->priv->selection_end - self->priv->selection_start) * step, + allocation->x + self->priv->selection_start * step, + allocation->y, + (self->priv->selection_end - self->priv->selection_start) * step, allocation->height); cairo_fill (cr); } static gboolean -histogram_view_expose_event_cb (GtkWidget *widget, - GdkEventExpose *event, - gpointer user_data) +histogram_view_draw_cb (GtkWidget *widget, + cairo_t *cr, + gpointer user_data) { GthHistogramView *self = user_data; GtkAllocation allocation; - GtkStyle *style; - cairo_t *cr; + GtkStyleContext *style_context; + + style_context = gtk_widget_get_style_context (widget); + gtk_style_context_save (style_context); + gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_VIEW); gtk_widget_get_allocation (widget, &allocation); - allocation.width--; - allocation.height--; + gtk_render_background (style_context, cr, 0, 0, allocation.width, allocation.height); - style = gtk_widget_get_style (widget); + if ((self->priv->histogram != NULL) + && ((int) self->priv->current_channel <= gth_histogram_get_nchannels (self->priv->histogram))) + { + GtkBorder padding; + GtkAllocation inner_allocation; - cr = gdk_cairo_create (gtk_widget_get_window (widget)); + cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); - gdk_cairo_set_source_color (cr, &style->base[gtk_widget_get_state (widget)]); - cairo_rectangle (cr, 0, 0, allocation.width, allocation.height); - cairo_fill (cr); + gtk_style_context_get_padding (style_context, gtk_widget_get_state (widget), &padding); - if ((self->priv->histogram == NULL) - || ((int) self->priv->current_channel > gth_histogram_get_nchannels (self->priv->histogram))) - { - gtk_widget_set_sensitive (self->priv->histogram_view, FALSE); - } - else { - gtk_widget_set_sensitive (self->priv->histogram_view, TRUE); + inner_allocation.x = padding.left; + inner_allocation.y = padding.top; + inner_allocation.width = allocation.width - (padding.right + padding.left); + inner_allocation.height = allocation.height - (padding.top + padding.bottom); if ((self->priv->selection_start > 0) || (self->priv->selection_end < 255)) - gth_histogram_paint_selection (self, cr, &allocation); + gth_histogram_paint_selection (self, style_context, cr, &inner_allocation); + + gth_histogram_paint_grid (self, style_context, cr, &inner_allocation); - cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); - gth_histogram_paint_grid (self, cr, &allocation); if (self->priv->display_mode == GTH_HISTOGRAM_MODE_ALL_CHANNELS) - gth_histogram_paint_rgb (self, cr, &allocation); + gth_histogram_paint_rgb (self, style_context, cr, &inner_allocation); else - gth_histogram_paint_channel (self, cr, self->priv->current_channel, &allocation); + gth_histogram_paint_channel (self, style_context, cr, self->priv->current_channel, &inner_allocation); } - cairo_destroy (cr); + gtk_style_context_restore (style_context); return TRUE; } @@ -583,7 +608,7 @@ gpointer user_data) { GthHistogramView *self = user_data; - int channel; + int channel = 0; if (self->priv->histogram == NULL) return FALSE; @@ -762,13 +787,13 @@ static void -gth_histogram_view_instance_init (GthHistogramView *self) +gth_histogram_view_init (GthHistogramView *self) { - GtkWidget *box; + GtkWidget *topbar_box; GtkWidget *sub_box; PangoAttrList *attr_list; GtkWidget *label; - GtkWidget *view_frame; + GtkWidget *view_container; GtkListStore *channel_model; GtkCellRenderer *renderer; GtkTreeIter iter; @@ -782,19 +807,20 @@ self->priv->selection_start = 0; self->priv->selection_end = 255; + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL); gtk_box_set_spacing (GTK_BOX (self), 6); + gtk_widget_set_vexpand (GTK_WIDGET (self), FALSE); /* topbar */ - box = gtk_hbox_new (FALSE, 6); - gtk_widget_show (box); - gtk_box_pack_start (GTK_BOX (self), box, FALSE, FALSE, 0); + topbar_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + gtk_widget_show (topbar_box); /* linear / logarithmic buttons */ - sub_box = gtk_hbox_new (FALSE, 0); + sub_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (sub_box); - gtk_box_pack_end (GTK_BOX (box), sub_box, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX (topbar_box), sub_box, FALSE, FALSE, 0); self->priv->linear_histogram_button = gtk_toggle_button_new (); gtk_widget_set_tooltip_text (self->priv->linear_histogram_button, _("Linear scale")); @@ -822,9 +848,9 @@ /* channel selector */ - sub_box = gtk_hbox_new (FALSE, 6); + sub_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (sub_box); - gtk_box_pack_start (GTK_BOX (box), sub_box, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (topbar_box), sub_box, FALSE, FALSE, 0); attr_list = pango_attr_list_new (); pango_attr_list_insert (attr_list, pango_attr_size_new (PANGO_SCALE * 8)); @@ -908,19 +934,19 @@ /* histogram view */ - view_frame = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (view_frame), GTK_SHADOW_IN); - gtk_widget_show (view_frame); - gtk_box_pack_start (GTK_BOX (self), view_frame, TRUE, TRUE, 0); + view_container = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (view_container), GTK_SHADOW_IN); + gtk_widget_set_vexpand (view_container, TRUE); + gtk_widget_show (view_container); self->priv->histogram_view = gtk_drawing_area_new (); gtk_widget_add_events (self->priv->histogram_view, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_STRUCTURE_MASK); gtk_widget_show (self->priv->histogram_view); - gtk_container_add (GTK_CONTAINER (view_frame), self->priv->histogram_view); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (view_container), self->priv->histogram_view); g_signal_connect (self->priv->histogram_view, - "expose-event", - G_CALLBACK (histogram_view_expose_event_cb), + "draw", + G_CALLBACK (histogram_view_draw_cb), self); g_signal_connect (self->priv->histogram_view, "scroll-event", @@ -941,9 +967,13 @@ /* histogram info */ - box = GET_WIDGET ("histogram_info"); - gtk_widget_hide (box); - gtk_box_pack_start (GTK_BOX (self), box, FALSE, FALSE, 0); + gtk_widget_set_vexpand (GET_WIDGET ("histogram_info"), FALSE); + + /* pack the widget */ + + gtk_box_pack_start (GTK_BOX (self), topbar_box, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (self), view_container, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (self), GET_WIDGET ("histogram_info"), FALSE, FALSE, 0); /* update widgets when a property changes */ @@ -967,28 +997,6 @@ } -GType -gth_histogram_view_get_type (void) { - static GType gth_histogram_view_type_id = 0; - if (gth_histogram_view_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthHistogramViewClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_histogram_view_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthHistogramView), - 0, - (GInstanceInitFunc) gth_histogram_view_instance_init, - NULL - }; - gth_histogram_view_type_id = g_type_register_static (GTK_TYPE_VBOX, "GthHistogramView", &g_define_type_info, 0); - } - return gth_histogram_view_type_id; -} - - GtkWidget * gth_histogram_view_new (GthHistogram *histogram) { @@ -997,13 +1005,25 @@ static void -update_channel_combo_box_sensitivity (GthHistogramView *self) +update_sensitivity (GthHistogramView *self) { gboolean has_alpha; GtkTreePath *path; GtkTreeIter iter; - has_alpha = gth_histogram_get_nchannels (self->priv->histogram) > 3; + /* view */ + + if ((self->priv->histogram == NULL) + || ((int) self->priv->current_channel > gth_histogram_get_nchannels (self->priv->histogram))) + { + gtk_widget_set_sensitive (self->priv->histogram_view, FALSE); + } + else + gtk_widget_set_sensitive (self->priv->histogram_view, TRUE); + + /* channel combobox */ + + has_alpha = (self->priv->histogram != NULL) && (gth_histogram_get_nchannels (self->priv->histogram) > 3); path = gtk_tree_path_new_from_indices (GTH_HISTOGRAM_CHANNEL_ALPHA, -1); if (gtk_tree_model_get_iter (GTK_TREE_MODEL (gtk_combo_box_get_model (GTK_COMBO_BOX (self->priv->channel_combo_box))), &iter, @@ -1025,7 +1045,7 @@ { GthHistogramView *self = user_data; - update_channel_combo_box_sensitivity (self); + update_sensitivity (self); gtk_widget_queue_draw (GTK_WIDGET (self)); if (gtk_widget_get_visible (GET_WIDGET ("histogram_info"))) @@ -1049,14 +1069,14 @@ self->priv->histogram = NULL; } - if (histogram == NULL) - return; - - self->priv->histogram = g_object_ref (histogram); - self->priv->histogram_changed_event = g_signal_connect (self->priv->histogram, "changed", G_CALLBACK (histogram_changed_cb), self); + if (histogram != NULL) { + self->priv->histogram = g_object_ref (histogram); + self->priv->histogram_changed_event = g_signal_connect (self->priv->histogram, "changed", G_CALLBACK (histogram_changed_cb), self); + } g_object_notify (G_OBJECT (self), "histogram"); + update_sensitivity (self); if (gtk_widget_get_visible (GET_WIDGET ("histogram_info"))) _gth_histogram_view_update_info (self); } diff -Nru gthumb-2.14.3/gthumb/gth-histogram-view.h gthumb-3.0.0/gthumb/gth-histogram-view.h --- gthumb-2.14.3/gthumb/gth-histogram-view.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-histogram-view.h 2012-02-19 15:01:32.000000000 +0000 @@ -50,12 +50,12 @@ } GthHistogramScale; struct _GthHistogramView { - GtkVBox parent_instance; + GtkBox parent_instance; GthHistogramViewPrivate *priv; }; struct _GthHistogramViewClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; }; GType gth_histogram_view_get_type (void); diff -Nru gthumb-2.14.3/gthumb/gth-icon-view.c gthumb-3.0.0/gthumb/gth-icon-view.c --- gthumb-2.14.3/gthumb/gth-icon-view.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-icon-view.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,959 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2008 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include "gth-icon-view.h" - - -#define IMAGE_TEXT_SPACING 0 -#define DEFAULT_ICON_SPACING 12 -#define SIZE_REQUEST 50 - - -struct _GthIconViewPrivate { - /* selection */ - - int selection_range_start; - gboolean selection_pending; - int selection_pending_pos; - - /* drag-and-drop */ - - gboolean drag_source_enabled; - GdkModifierType drag_start_button_mask; - GtkTargetList *drag_target_list; - GdkDragAction drag_actions; - - gboolean dragging : 1; /* Whether the user is dragging items. */ - int drag_button; - gboolean drag_started : 1; /* Whether the drag has started. */ - int drag_start_x; /* The position where the drag started. */ - int drag_start_y; -}; - - -static gpointer parent_class = NULL; -static GthFileViewIface *gth_icon_view_gth_file_view_parent_iface = NULL; -static GthFileSelectionIface *gth_icon_view_gth_file_selection_parent_iface = NULL; - - -void -gth_icon_view_real_set_model (GthFileView *self, - GtkTreeModel *model) -{ - gtk_icon_view_set_model (GTK_ICON_VIEW (self), model); -} - - -GtkTreeModel * -gth_icon_view_real_get_model (GthFileView *self) -{ - return gtk_icon_view_get_model (GTK_ICON_VIEW (self)); -} - - -static void -gth_icon_view_real_scroll_to (GthFileView *base, - int pos, - double yalign) -{ - GtkTreePath *path; - - path = gtk_tree_path_new_from_indices (pos, -1); - gtk_icon_view_scroll_to_path (GTK_ICON_VIEW (base), - path, - TRUE, - 0.5, - yalign); - - gtk_tree_path_free (path); -} - - -static GthVisibility -gth_icon_view_real_get_visibility (GthFileView *base, - int pos) -{ - GtkTreePath *start_path, *end_path; - int start_pos, end_pos; - - if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (base), &start_path, &end_path)) - return -1; - - start_pos = gtk_tree_path_get_indices (start_path)[0]; - end_pos = gtk_tree_path_get_indices (end_path)[0]; - - gtk_tree_path_free (start_path); - gtk_tree_path_free (end_path); - - return ((pos >= start_pos) && (pos <= end_pos)) ? GTH_VISIBILITY_FULL : GTH_VISIBILITY_NONE; -} - - -static int -gth_icon_view_real_get_at_position (GthFileView *base, - int x, - int y) -{ - GtkTreePath *path; - int pos; - - path = gtk_icon_view_get_path_at_pos (GTK_ICON_VIEW (base), x, y); - if (path == NULL) - return -1; - pos = gtk_tree_path_get_indices (path)[0]; - - gtk_tree_path_free (path); - - return pos; -} - - -static int -gth_icon_view_real_get_first_visible (GthFileView *base) -{ - GthIconView *self = GTH_ICON_VIEW (base); - GtkTreePath *start_path; - int pos; - - if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (self), &start_path, NULL)) - return -1; - - pos = gtk_tree_path_get_indices (start_path)[0]; - gtk_tree_path_free (start_path); - - return pos; -} - - -static int -gth_icon_view_real_get_last_visible (GthFileView *base) -{ - GthIconView *self = GTH_ICON_VIEW (base); - GtkTreePath *end_path; - int pos; - - if (! gtk_icon_view_get_visible_range (GTK_ICON_VIEW (self), NULL, &end_path)) - return -1; - - pos = gtk_tree_path_get_indices (end_path)[0]; - gtk_tree_path_free (end_path); - - return pos; -} - - -static void -gth_icon_view_real_activated (GthFileView *base, - int pos) -{ - GthIconView *self = GTH_ICON_VIEW (base); - GtkTreePath *path; - - g_return_if_fail (pos >= 0); - - path = gtk_tree_path_new_from_indices (pos, -1); - gtk_icon_view_item_activated (GTK_ICON_VIEW (self), path); - - gtk_tree_path_free (path); -} - - -static void -gth_icon_view_real_set_cursor (GthFileView *base, - int pos) -{ - GtkTreePath *path; - - g_return_if_fail (pos >= 0); - - path = gtk_tree_path_new_from_indices (pos, -1); - gtk_icon_view_set_cursor (GTK_ICON_VIEW (base), path, NULL, FALSE); - - gtk_tree_path_free (path); -} - - -static int -gth_icon_view_real_get_cursor (GthFileView *base) -{ - GtkTreePath *path; - int pos; - - if (! gtk_icon_view_get_cursor (GTK_ICON_VIEW (base), &path, NULL)) - return -1; - pos = gtk_tree_path_get_indices (path)[0]; - - gtk_tree_path_free (path); - - return pos; -} - - -void -gth_icon_view_real_set_spacing (GthFileView *self, - int spacing) -{ - gtk_icon_view_set_margin (GTK_ICON_VIEW (self), spacing); - gtk_icon_view_set_column_spacing (GTK_ICON_VIEW (self), spacing); - gtk_icon_view_set_row_spacing (GTK_ICON_VIEW (self), spacing); -} - - -static void -gth_icon_view_enable_drag_source (GthFileView *base, - GdkModifierType start_button_mask, - const GtkTargetEntry *targets, - int n_targets, - GdkDragAction actions) -{ - GthIconView *self = GTH_ICON_VIEW (base); - - if (self->priv->drag_target_list != NULL) - gtk_target_list_unref (self->priv->drag_target_list); - - self->priv->drag_source_enabled = TRUE; - self->priv->drag_start_button_mask = start_button_mask; - self->priv->drag_target_list = gtk_target_list_new (targets, n_targets); - self->priv->drag_actions = actions; -} - - -static void -gth_icon_view_unset_drag_source (GthFileView *base) -{ - GthIconView *self = GTH_ICON_VIEW (base); - - self->priv->drag_source_enabled = FALSE; -} - - -static void -gth_icon_view_enable_drag_dest (GthFileView *self, - const GtkTargetEntry *targets, - int n_targets, - GdkDragAction actions) -{ - gtk_icon_view_enable_model_drag_dest (GTK_ICON_VIEW (self), - targets, - n_targets, - actions); -} - - -static void -gth_icon_view_unset_drag_dest (GthFileView *self) -{ - gtk_icon_view_unset_model_drag_dest (GTK_ICON_VIEW (self)); -} - - -static void -gth_icon_view_set_drag_dest_pos (GthFileView *self, - GdkDragContext *context, - int x, - int y, - guint time, - int *pos) -{ - GtkTreePath *path = NULL; - GtkIconViewDropPosition drop_pos; - - if ((x >= 0) && (y >= 0) && gtk_icon_view_get_dest_item_at_pos (GTK_ICON_VIEW (self), x, y, &path, &drop_pos)) { - if (pos != NULL) { - int *indices; - - indices = gtk_tree_path_get_indices (path); - *pos = indices[0]; - if ((drop_pos == GTK_ICON_VIEW_DROP_INTO) - || (drop_pos == GTK_ICON_VIEW_DROP_ABOVE) - || (drop_pos == GTK_ICON_VIEW_DROP_BELOW)) - { - drop_pos = GTK_ICON_VIEW_DROP_LEFT; - } - if (drop_pos == GTK_ICON_VIEW_DROP_RIGHT) - *pos = *pos + 1; - } - gtk_icon_view_set_drag_dest_item (GTK_ICON_VIEW (self), path, drop_pos); - } - else { - if (pos != NULL) - *pos = -1; - gtk_icon_view_set_drag_dest_item (GTK_ICON_VIEW (self), NULL, GTK_ICON_VIEW_NO_DROP); - } - - if (path != NULL) - gtk_tree_path_free (path); -} - - -static GtkCellLayout * -gth_icon_view_add_renderer (GthFileView *self, - GthFileViewRendererType renderer_type, - GtkCellRenderer *renderer) -{ - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self), renderer, FALSE); - - return GTK_CELL_LAYOUT (self); -} - - -static void -gth_icon_view_update_attributes (GthFileView *self, - GtkCellRenderer *checkbox_renderer, - GtkCellRenderer *thumbnail_renderer, - GtkCellRenderer *text_renderer, - int thumb_size) -{ - g_object_set (thumbnail_renderer, - "size", thumb_size, - "yalign", 1.0, - NULL); - g_object_set (text_renderer, - "yalign", 0.0, - "alignment", PANGO_ALIGN_CENTER, - "width", thumb_size + THUMBNAIL_BORDER, - "wrap-mode", PANGO_WRAP_WORD_CHAR, - "wrap-width", thumb_size + THUMBNAIL_BORDER, - NULL); -} - - -static gboolean -gth_icon_view_truncate_metadata (GthFileView *base) -{ - return TRUE; -} - - -static void -gth_icon_view_real_set_selection_mode (GthFileSelection *base, - GtkSelectionMode mode) -{ - gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (base), mode); -} - - -static GList * -gth_icon_view_real_get_selected (GthFileSelection *base) -{ - return gtk_icon_view_get_selected_items (GTK_ICON_VIEW (base)); -} - - -static void -gth_icon_view_real_select (GthFileSelection *base, - int pos) -{ - GtkTreePath *path; - - path = gtk_tree_path_new_from_indices (pos, -1); - gtk_icon_view_select_path (GTK_ICON_VIEW (base), path); - - gtk_tree_path_free (path); -} - - -static void -gth_icon_view_real_unselect (GthFileSelection *base, - int pos) -{ - GtkTreePath *path; - - path = gtk_tree_path_new_from_indices (pos, -1); - gtk_icon_view_unselect_path (GTK_ICON_VIEW (base), path); - - gtk_tree_path_free (path); -} - - -static void -gth_icon_view_real_select_all (GthFileSelection *base) -{ - gtk_icon_view_select_all (GTK_ICON_VIEW (base)); -} - - -static void -gth_icon_view_real_unselect_all (GthFileSelection *base) -{ - gtk_icon_view_unselect_all (GTK_ICON_VIEW (base)); -} - - -static gboolean -gth_icon_view_real_is_selected (GthFileSelection *base, - int pos) -{ - GtkTreePath *path; - gboolean result; - - path = gtk_tree_path_new (); - gtk_tree_path_append_index (path, pos); - result = gtk_icon_view_path_is_selected (GTK_ICON_VIEW (base), path); - - gtk_tree_path_free (path); - - return result; -} - - -static GtkTreePath * -gth_icon_view_real_get_first_selected (GthFileSelection *base) -{ - GList *list; - GtkTreePath *path; - - list = gtk_icon_view_get_selected_items (GTK_ICON_VIEW (base)); - if (list != NULL) { - list = g_list_sort (list, (GCompareFunc) gtk_tree_path_compare); - path = gtk_tree_path_copy ((GtkTreePath *) g_list_first (list)->data); - } - else - path = NULL; - - g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL); - g_list_free (list); - - return path; -} - - -static GtkTreePath * -gth_icon_view_real_get_last_selected (GthFileSelection *base) -{ - GList *list; - GtkTreePath *path; - - list = gtk_icon_view_get_selected_items (GTK_ICON_VIEW (base)); - if (list != NULL) { - list = g_list_sort (list, (GCompareFunc) gtk_tree_path_compare); - path = gtk_tree_path_copy ((GtkTreePath *) g_list_last (list)->data); - } - else - path = NULL; - - g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL); - g_list_free (list); - - return path; -} - - -static guint -gth_icon_view_real_get_n_selected (GthFileSelection *base) -{ - GthIconView *self; - GList *selected; - guint n_selected; - - self = GTH_ICON_VIEW (base); - - selected = gtk_icon_view_get_selected_items (GTK_ICON_VIEW (self)); - n_selected = (guint) g_list_length (selected); - - g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL); - g_list_free (selected); - - return n_selected; -} - - -GtkWidget * -gth_icon_view_new (void) -{ - return g_object_new (GTH_TYPE_ICON_VIEW, NULL); -} - - -GtkWidget * -gth_icon_view_new_with_model (GtkTreeModel *model) -{ - return g_object_new (GTH_TYPE_ICON_VIEW, "model", model, NULL); -} - - -static void -gtk_icon_view_add_move_binding (GtkBindingSet *binding_set, - guint keyval, - guint modmask, - GtkMovementStep step, - gint count) -{ - gtk_binding_entry_add_signal (binding_set, keyval, modmask, - "move_cursor", 2, - G_TYPE_ENUM, step, - G_TYPE_INT, count); - gtk_binding_entry_add_signal (binding_set, keyval, GDK_SHIFT_MASK, - "move_cursor", 2, - G_TYPE_ENUM, step, - G_TYPE_INT, count); - - if ((modmask & GDK_CONTROL_MASK) == GDK_CONTROL_MASK) - return; - - gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK | GDK_SHIFT_MASK, - "move_cursor", 2, - G_TYPE_ENUM, step, - G_TYPE_INT, count); - gtk_binding_entry_add_signal (binding_set, keyval, GDK_CONTROL_MASK, - "move_cursor", 2, - G_TYPE_ENUM, step, - G_TYPE_INT, count); -} - - -static void -gth_icon_view_finalize (GObject *object) -{ - GthIconView *self = GTH_ICON_VIEW (object); - - if (self->priv->drag_target_list != NULL) { - gtk_target_list_unref (self->priv->drag_target_list); - self->priv->drag_target_list = NULL; - } - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - - -static void -gth_icon_view_class_init (GthIconViewClass *klass) -{ - GObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkBindingSet *binding_set; - - parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (GthIconViewPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = gth_icon_view_finalize; - - widget_class = (GtkWidgetClass*) klass; - widget_class->drag_begin = NULL; - - binding_set = gtk_binding_set_by_class (klass); - - gtk_icon_view_add_move_binding (binding_set, GDK_Right, 0, - GTK_MOVEMENT_LOGICAL_POSITIONS, 1); - gtk_icon_view_add_move_binding (binding_set, GDK_Left, 0, - GTK_MOVEMENT_LOGICAL_POSITIONS, -1); -} - - -static void -stop_dragging (GthIconView *icon_view) -{ - if (! icon_view->priv->dragging) - return; - icon_view->priv->dragging = FALSE; - icon_view->priv->drag_started = FALSE; -} - - -static gboolean -icon_view_button_press_event_cb (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) -{ - GthIconView *icon_view = user_data; - gboolean retval = FALSE; - - if ((event->button == 1) && (event->type == GDK_2BUTTON_PRESS)) { - GtkTreePath *path; - - path = gtk_icon_view_get_path_at_pos (GTK_ICON_VIEW (icon_view), event->x, event->y); - if (path != NULL) { - if (! (event->state & GDK_CONTROL_MASK) && ! (event->state & GDK_SHIFT_MASK)) { - stop_dragging (icon_view); - icon_view->priv->selection_pending = FALSE; - - gtk_icon_view_item_activated (GTK_ICON_VIEW (icon_view), path); - } - gtk_tree_path_free (path); - } - - return TRUE; - } - - if ((event->button == 2) && (event->type == GDK_BUTTON_PRESS)) { - /* This can be the start of a dragging action. */ - - if (! (event->state & GDK_CONTROL_MASK) - && ! (event->state & GDK_SHIFT_MASK) - && icon_view->priv->drag_source_enabled) - { - icon_view->priv->dragging = TRUE; - icon_view->priv->drag_button = 2; - icon_view->priv->drag_start_x = event->x; - icon_view->priv->drag_start_y = event->y; - } - } - - if ((event->button == 1) && (event->type == GDK_BUTTON_PRESS)) { - GtkTreePath *path; - int pos; - int new_selection_end; - - path = gtk_icon_view_get_path_at_pos (GTK_ICON_VIEW (icon_view), event->x, event->y); - if (path == NULL) { - if (event->state & GDK_SHIFT_MASK) - return TRUE; - else - return FALSE; - } - - /* This can be the start of a dragging action. */ - - if (! (event->state & GDK_CONTROL_MASK) - && ! (event->state & GDK_SHIFT_MASK) - && icon_view->priv->drag_source_enabled) - { - icon_view->priv->dragging = TRUE; - icon_view->priv->drag_button = 1; - icon_view->priv->drag_start_x = event->x; - icon_view->priv->drag_start_y = event->y; - } - - /* Selection */ - - pos = gtk_tree_path_get_indices (path)[0]; - - if (icon_view->priv->drag_source_enabled - && ! (event->state & GDK_CONTROL_MASK) - && ! (event->state & GDK_SHIFT_MASK) - && gth_file_selection_is_selected (GTH_FILE_SELECTION (icon_view), pos)) - { - icon_view->priv->selection_pending = TRUE; - icon_view->priv->selection_pending_pos = pos; - retval = TRUE; - } - - gtk_tree_path_free (path); - path = NULL; - - new_selection_end = pos; - if (event->state & GDK_SHIFT_MASK) { - int selection_start; - int selection_end; - GList *list; - GList *scan; - int i; - - selection_start = MIN (icon_view->priv->selection_range_start, new_selection_end); - selection_end = MAX (new_selection_end, icon_view->priv->selection_range_start); - - /* unselect items out of the new range */ - - list = gtk_icon_view_get_selected_items (GTK_ICON_VIEW (icon_view)); - for (scan = list; scan; scan = scan->next) { - GtkTreePath *path = scan->data; - int pos = gtk_tree_path_get_indices (path)[0]; - - if ((pos < selection_start) || (pos > selection_end)) { - path = gtk_tree_path_new_from_indices (pos, -1); - gtk_icon_view_unselect_path (GTK_ICON_VIEW (icon_view), path); - - gtk_tree_path_free (path); - } - } - - g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL); - g_list_free (list); - - /* select the images in the range */ - - for (i = selection_start; i <= selection_end; i++) { - path = gtk_tree_path_new_from_indices (i, -1); - gtk_icon_view_select_path (GTK_ICON_VIEW (icon_view), path); - - gtk_tree_path_free (path); - } - - retval = TRUE; - } - else - icon_view->priv->selection_range_start = new_selection_end; - - return retval; - } - - return FALSE; -} - - -static gboolean -icon_view_motion_notify_event_cb (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) -{ - GthIconView *icon_view = user_data; - - if (! icon_view->priv->drag_source_enabled) - return FALSE; - - if (icon_view->priv->dragging) { - if (! icon_view->priv->drag_started - && gtk_drag_check_threshold (widget, - icon_view->priv->drag_start_x, - icon_view->priv->drag_start_y, - event->x, - event->y)) - { - GtkTreePath *path = NULL; - GdkDragContext *context; - GdkPixmap *dnd_icon; - int n_selected; - - path = gtk_icon_view_get_path_at_pos (GTK_ICON_VIEW (icon_view), - event->x, - event->y); - if (path == NULL) - return FALSE; - - gtk_icon_view_set_cursor (GTK_ICON_VIEW (icon_view), path, NULL, FALSE); - icon_view->priv->drag_started = TRUE; - - /**/ - - context = gtk_drag_begin (widget, - icon_view->priv->drag_target_list, - icon_view->priv->drag_actions, - icon_view->priv->drag_button, - (GdkEvent *) event); - if (icon_view->priv->drag_button == 2) - gdk_drag_status (context, GDK_ACTION_ASK, event->time); - - dnd_icon = gtk_icon_view_create_drag_icon (GTK_ICON_VIEW (icon_view), path); - - n_selected = gth_file_selection_get_n_selected (GTH_FILE_SELECTION (icon_view)); - if (n_selected >= 1) { - const int offset = 3; - int n_visible; - int width; - int height; - int border; - GdkPixbuf *multi_dnd_icon; - int i; - - n_visible = MIN (n_selected, 4); - gdk_pixmap_get_size (dnd_icon, &width, &height); - border = n_visible * offset; - multi_dnd_icon = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width + border, height + border); - gdk_pixbuf_fill (multi_dnd_icon, 0x00000000); - for (i = n_visible - 1; i >= 0; i--) - gdk_pixbuf_get_from_drawable (multi_dnd_icon, - dnd_icon, - gdk_drawable_get_colormap (dnd_icon), - 0, 0, - i * offset, i * offset, - width, height); - gtk_drag_set_icon_pixbuf (context, - multi_dnd_icon, - width / 4, - height / 4); - - g_object_unref (multi_dnd_icon); - } - - g_object_unref (dnd_icon); - gtk_tree_path_free (path); - } - - return TRUE; - } - - return FALSE; -} - - -static gboolean -icon_view_button_release_event_cb (GtkWidget *widget, - GdkEventButton *event, - gpointer user_data) -{ - GthIconView *icon_view = user_data; - - if (icon_view->priv->dragging) { - icon_view->priv->selection_pending = icon_view->priv->selection_pending && ! icon_view->priv->drag_started; - stop_dragging (icon_view); - } - - if (icon_view->priv->selection_pending) { - gth_file_selection_unselect_all (GTH_FILE_SELECTION (icon_view)); - gth_file_selection_select (GTH_FILE_SELECTION (icon_view), icon_view->priv->selection_pending_pos); - icon_view->priv->selection_pending = FALSE; - } - - return FALSE; -} - - -static void -icon_view_selection_changed_cb (GtkIconView *widget, - gpointer user_data) -{ - GthIconView *icon_view = user_data; - GList *list; - - list = gtk_icon_view_get_selected_items (GTK_ICON_VIEW (icon_view)); - if ((list != NULL) && (list->next == NULL)) { - GtkTreePath *path = list->data; - icon_view->priv->selection_range_start = gtk_tree_path_get_indices (path)[0]; - } - - gth_file_selection_changed (GTH_FILE_SELECTION (icon_view)); - - g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL); - g_list_free (list); -} - - -static void -icon_view_item_activated_cb (GtkIconView *icon_view, - GtkTreePath *path, - gpointer user_data) -{ - gth_file_view_activate_file (GTH_FILE_VIEW (icon_view), path); -} - - -static void -gth_icon_view_init (GthIconView *icon_view) -{ - icon_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (icon_view, GTH_TYPE_ICON_VIEW, GthIconViewPrivate); - icon_view->priv->selection_range_start = 0; - icon_view->priv->drag_source_enabled = FALSE; - icon_view->priv->dragging = FALSE; - icon_view->priv->drag_started = FALSE; - icon_view->priv->drag_target_list = NULL; - - gtk_icon_view_set_spacing (GTK_ICON_VIEW (icon_view), IMAGE_TEXT_SPACING); - gth_icon_view_real_set_spacing (GTH_FILE_VIEW (icon_view), DEFAULT_ICON_SPACING); - gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_view), GTK_SELECTION_MULTIPLE); - gtk_widget_set_size_request (GTK_WIDGET (icon_view), SIZE_REQUEST, SIZE_REQUEST); - - g_signal_connect (icon_view, - "button-press-event", - G_CALLBACK (icon_view_button_press_event_cb), - icon_view); - g_signal_connect (icon_view, - "motion-notify-event", - G_CALLBACK (icon_view_motion_notify_event_cb), - icon_view); - g_signal_connect (icon_view, - "button-release-event", - G_CALLBACK (icon_view_button_release_event_cb), - icon_view); - g_signal_connect (icon_view, - "selection-changed", - G_CALLBACK (icon_view_selection_changed_cb), - icon_view); - g_signal_connect (icon_view, - "item-activated", - G_CALLBACK (icon_view_item_activated_cb), - icon_view); -} - - -static void -gth_icon_view_gth_file_view_interface_init (GthFileViewIface *iface) -{ - gth_icon_view_gth_file_view_parent_iface = g_type_interface_peek_parent (iface); - iface->set_model = gth_icon_view_real_set_model; - iface->get_model = gth_icon_view_real_get_model; - iface->scroll_to = gth_icon_view_real_scroll_to; - iface->get_visibility = gth_icon_view_real_get_visibility; - iface->get_at_position = gth_icon_view_real_get_at_position; - iface->get_first_visible = gth_icon_view_real_get_first_visible; - iface->get_last_visible = gth_icon_view_real_get_last_visible; - iface->activated = gth_icon_view_real_activated; - iface->set_cursor = gth_icon_view_real_set_cursor; - iface->get_cursor = gth_icon_view_real_get_cursor; - iface->set_spacing = gth_icon_view_real_set_spacing; - iface->enable_drag_source = gth_icon_view_enable_drag_source; - iface->unset_drag_source = gth_icon_view_unset_drag_source; - iface->enable_drag_dest = gth_icon_view_enable_drag_dest; - iface->unset_drag_dest = gth_icon_view_unset_drag_dest; - iface->set_drag_dest_pos = gth_icon_view_set_drag_dest_pos; - iface->add_renderer = gth_icon_view_add_renderer; - iface->update_attributes = gth_icon_view_update_attributes; - iface->truncate_metadata = gth_icon_view_truncate_metadata; -} - - -static void -gth_icon_view_gth_file_selection_interface_init (GthFileSelectionIface *iface) -{ - gth_icon_view_gth_file_selection_parent_iface = g_type_interface_peek_parent (iface); - iface->set_selection_mode = gth_icon_view_real_set_selection_mode; - iface->get_selected = gth_icon_view_real_get_selected; - iface->select = gth_icon_view_real_select; - iface->unselect = gth_icon_view_real_unselect; - iface->select_all = gth_icon_view_real_select_all; - iface->unselect_all = gth_icon_view_real_unselect_all; - iface->is_selected = gth_icon_view_real_is_selected; - iface->get_first_selected = gth_icon_view_real_get_first_selected; - iface->get_last_selected = gth_icon_view_real_get_last_selected; - iface->get_n_selected = gth_icon_view_real_get_n_selected; -} - - -GType -gth_icon_view_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthIconViewClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_icon_view_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthIconView), - 0, - (GInstanceInitFunc) gth_icon_view_init, - NULL - }; - static const GInterfaceInfo gth_file_view_info = { - (GInterfaceInitFunc) gth_icon_view_gth_file_view_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo gth_file_selection_info = { - (GInterfaceInitFunc) gth_icon_view_gth_file_selection_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - type = g_type_register_static (GTK_TYPE_ICON_VIEW, - "GthIconView", - &g_define_type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_FILE_VIEW, >h_file_view_info); - g_type_add_interface_static (type, GTH_TYPE_FILE_SELECTION, >h_file_selection_info); - } - - return type; -} diff -Nru gthumb-2.14.3/gthumb/gth-icon-view.h gthumb-3.0.0/gthumb/gth-icon-view.h --- gthumb-2.14.3/gthumb/gth-icon-view.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-icon-view.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2008 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_ICON_VIEW_H -#define GTH_ICON_VIEW_H - -#include -#include -#include -#include "gth-file-view.h" -#include "gth-file-selection.h" - -G_BEGIN_DECLS - -#define GTH_TYPE_ICON_VIEW (gth_icon_view_get_type ()) -#define GTH_ICON_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_ICON_VIEW, GthIconView)) -#define GTH_ICON_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_ICON_VIEW, GthIconViewClass)) -#define GTH_IS_ICON_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_ICON_VIEW)) -#define GTH_IS_ICON_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_ICON_VIEW)) -#define GTH_ICON_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_ICON_VIEW, GthIconViewClass)) - -typedef struct _GthIconView GthIconView; -typedef struct _GthIconViewClass GthIconViewClass; -typedef struct _GthIconViewPrivate GthIconViewPrivate; - -struct _GthIconView { - GtkIconView parent_instance; - GthIconViewPrivate *priv; -}; - -struct _GthIconViewClass { - GtkIconViewClass parent_class; -}; - -GType gth_icon_view_get_type (void); -GtkWidget * gth_icon_view_new (void); -GtkWidget * gth_icon_view_new_with_model (GtkTreeModel *model); - -G_END_DECLS - -#endif /* GTH_ICON_VIEW_H */ diff -Nru gthumb-2.14.3/gthumb/gth-image.c gthumb-3.0.0/gthumb/gth-image.c --- gthumb-2.14.3/gthumb/gth-image.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image.c 2012-03-24 11:49:22.000000000 +0000 @@ -39,7 +39,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthImage, gth_image, G_TYPE_OBJECT) static void @@ -76,25 +76,44 @@ _gth_image_free_data (GTH_IMAGE (object)); /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_image_parent_class)->finalize (object); +} + + +static gboolean +base_get_is_zoomable (GthImage *image) +{ + return FALSE; +} + + +static gboolean +base_set_zoom (GthImage *image, + double zoom, + int *original_width, + int *original_height) +{ + return FALSE; } static void -gth_image_class_init (GthImageClass *class) +gth_image_class_init (GthImageClass *klass) { GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (class); - g_type_class_add_private (class, sizeof (GthImagePrivate)); + g_type_class_add_private (klass, sizeof (GthImagePrivate)); - gobject_class = (GObjectClass*) class; + gobject_class = (GObjectClass*) klass; gobject_class->finalize = gth_image_finalize; + + klass->get_is_zoomable = base_get_is_zoomable; + klass->set_zoom = base_set_zoom; } static void -gth_image_instance_init (GthImage *self) +gth_image_init (GthImage *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE, GthImagePrivate); self->priv->format = GTH_IMAGE_FORMAT_CAIRO_SURFACE; @@ -102,34 +121,6 @@ } -GType -gth_image_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthImageClass), - NULL, - NULL, - (GClassInitFunc) gth_image_class_init, - NULL, - NULL, - sizeof (GthImage), - 0, - (GInstanceInitFunc) gth_image_instance_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthImage", - &type_info, - 0); - } - - return type; -} - - GthImage * gth_image_new (void) { @@ -193,6 +184,26 @@ } +gboolean +gth_image_get_is_zoomable (GthImage *self) +{ + if (self == NULL) + return FALSE; + else + return GTH_IMAGE_GET_CLASS (self)->get_is_zoomable (self); +} + + +gboolean +gth_image_set_zoom (GthImage *self, + double zoom, + int *original_width, + int *original_height) +{ + return GTH_IMAGE_GET_CLASS (self)->set_zoom (self, zoom, original_width, original_height); +} + + void gth_image_set_pixbuf (GthImage *image, GdkPixbuf *value) diff -Nru gthumb-2.14.3/gthumb/gth-image-dragger.c gthumb-3.0.0/gthumb/gth-image-dragger.c --- gthumb-2.14.3/gthumb/gth-image-dragger.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-dragger.c 2012-02-19 15:01:32.000000000 +0000 @@ -31,7 +31,14 @@ }; -static gpointer parent_class = NULL; +static void gth_image_dragger_gth_image_tool_interface_init (GthImageViewerToolInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthImageDragger, + gth_image_dragger, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTH_TYPE_IMAGE_VIEWER_TOOL, + gth_image_dragger_gth_image_tool_interface_init)) static void @@ -41,7 +48,7 @@ g_return_if_fail (GTH_IS_IMAGE_DRAGGER (object)); /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_image_dragger_parent_class)->finalize (object); } @@ -50,7 +57,6 @@ { GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthImageDraggerPrivate)); gobject_class = (GObjectClass*) class; @@ -59,7 +65,7 @@ static void -gth_image_dragger_instance_init (GthImageDragger *dragger) +gth_image_dragger_init (GthImageDragger *dragger) { dragger->priv = G_TYPE_INSTANCE_GET_PRIVATE (dragger, GTH_TYPE_IMAGE_DRAGGER, GthImageDraggerPrivate); } @@ -105,7 +111,7 @@ cursor = gdk_cursor_new (GDK_LEFT_PTR); gth_image_viewer_set_cursor (self->priv->viewer, cursor); - gdk_cursor_unref (cursor); + g_object_unref (cursor); } @@ -149,9 +155,8 @@ static void -gth_image_dragger_expose (GthImageViewerTool *self, - GdkEventExpose *event, - cairo_t *cr) +gth_image_dragger_draw (GthImageViewerTool *self, + cairo_t *cr) { GthImageDragger *dragger; GthImageViewer *viewer; @@ -170,10 +175,10 @@ viewer->x_offset - viewer->image_area.x, viewer->y_offset - viewer->image_area.y, &viewer->image_area, - event->region, + NULL, gth_image_viewer_get_zoom_quality_filter (viewer)); - gth_image_viewer_apply_painters (viewer, event, cr); + gth_image_viewer_apply_painters (viewer, cr); } @@ -193,23 +198,24 @@ return FALSE; if ((event->button == 1) && ! viewer->dragging) { - GdkCursor *cursor; - int retval; + GdkCursor *cursor; + GdkGrabStatus retval; cursor = gdk_cursor_new_from_name (gtk_widget_get_display (widget), "grabbing"); - retval = gdk_pointer_grab (gtk_widget_get_window (widget), - FALSE, - (GDK_POINTER_MOTION_MASK - | GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON_RELEASE_MASK), - NULL, - cursor, - event->time); + retval = gdk_device_grab (event->device, + gtk_widget_get_window (widget), + GDK_OWNERSHIP_WINDOW, + FALSE, + (GDK_POINTER_MOTION_MASK + | GDK_POINTER_MOTION_HINT_MASK + | GDK_BUTTON_RELEASE_MASK), + cursor, + event->time); if (cursor != NULL) - gdk_cursor_unref (cursor); + g_object_unref (cursor); - if (retval != 0) + if (retval != GDK_GRAB_SUCCESS) return FALSE; viewer->pressed = TRUE; @@ -236,7 +242,7 @@ viewer = dragger->priv->viewer; if (viewer->dragging) - gdk_pointer_ungrab (event->time); + gdk_device_ungrab (event->device, event->time); return TRUE; } @@ -261,8 +267,8 @@ return FALSE; gth_image_viewer_scroll_to (viewer, - viewer->x_offset + viewer->event_x_prev - event->x, - viewer->y_offset + viewer->event_y_prev - event->y); + viewer->drag_x_start - event->x, + viewer->drag_y_start - event->y); return TRUE; } @@ -283,7 +289,7 @@ static void -gth_image_dragger_gth_image_tool_interface_init (GthImageViewerToolIface *iface) +gth_image_dragger_gth_image_tool_interface_init (GthImageViewerToolInterface *iface) { iface->set_viewer = gth_image_dragger_set_viewer; iface->unset_viewer = gth_image_dragger_unset_viewer; @@ -292,7 +298,7 @@ iface->size_allocate = gth_image_dragger_size_allocate; iface->map = gth_image_dragger_map; iface->unmap = gth_image_dragger_unmap; - iface->expose = gth_image_dragger_expose; + iface->draw = gth_image_dragger_draw; iface->button_press = gth_image_dragger_button_press; iface->button_release = gth_image_dragger_button_release; iface->motion_notify = gth_image_dragger_motion_notify; @@ -301,40 +307,6 @@ } -GType -gth_image_dragger_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthImageDraggerClass), - NULL, - NULL, - (GClassInitFunc) gth_image_dragger_class_init, - NULL, - NULL, - sizeof (GthImageDragger), - 0, - (GInstanceInitFunc) gth_image_dragger_instance_init - }; - static const GInterfaceInfo gth_image_tool_info = { - (GInterfaceInitFunc) gth_image_dragger_gth_image_tool_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthImageDragger", - &type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_IMAGE_VIEWER_TOOL, >h_image_tool_info); - } - - return type; -} - - GthImageViewerTool * gth_image_dragger_new (void) { diff -Nru gthumb-2.14.3/gthumb/gth-image.h gthumb-3.0.0/gthumb/gth-image.h --- gthumb-2.14.3/gthumb/gth-image.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image.h 2012-02-19 15:01:32.000000000 +0000 @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * GThumb @@ -56,6 +56,12 @@ struct _GthImageClass { GObjectClass __parent_class; + + gboolean (*get_is_zoomable) (GthImage *image); + gboolean (*set_zoom) (GthImage *image, + double zoom, + int *original_width, + int *original_height); }; @@ -68,19 +74,24 @@ GError **error); -GType gth_image_get_type (void); -GthImage * gth_image_new (void); -GthImage * gth_image_new_for_pixbuf (GdkPixbuf *value); -void gth_image_set_cairo_surface (GthImage *image, - cairo_surface_t *value); -cairo_surface_t * gth_image_get_cairo_surface (GthImage *image); -void gth_image_set_pixbuf (GthImage *image, - GdkPixbuf *value); -GdkPixbuf * gth_image_get_pixbuf (GthImage *image); -void gth_image_set_pixbuf_animation (GthImage *image, - GdkPixbufAnimation *value); -GdkPixbufAnimation * gth_image_get_pixbuf_animation (GthImage *image); -gboolean gth_image_is_animation (GthImage *image); +GType gth_image_get_type (void); +GthImage * gth_image_new (void); +GthImage * gth_image_new_for_pixbuf (GdkPixbuf *value); +void gth_image_set_cairo_surface (GthImage *image, + cairo_surface_t *value); +cairo_surface_t * gth_image_get_cairo_surface (GthImage *image); +gboolean gth_image_get_is_zoomable (GthImage *image); +gboolean gth_image_set_zoom (GthImage *image, + double zoom, + int *original_width, + int *original_height); +void gth_image_set_pixbuf (GthImage *image, + GdkPixbuf *value); +GdkPixbuf * gth_image_get_pixbuf (GthImage *image); +void gth_image_set_pixbuf_animation (GthImage *image, + GdkPixbufAnimation *value); +GdkPixbufAnimation * gth_image_get_pixbuf_animation (GthImage *image); +gboolean gth_image_is_animation (GthImage *image); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/gth-image-history.c gthumb-3.0.0/gthumb/gth-image-history.c --- gthumb-2.14.3/gthumb/gth-image-history.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-history.c 2012-02-19 15:01:32.000000000 +0000 @@ -26,6 +26,9 @@ #define MAX_UNDO_HISTORY_LEN 5 +G_DEFINE_TYPE (GthImageHistory, gth_image_history, G_TYPE_OBJECT) + + /* GthImageData */ @@ -94,8 +97,7 @@ }; -static gpointer parent_class = NULL; -static guint gth_image_history_signals[LAST_SIGNAL] = { 0 }; +static guint gth_image_history_signals[LAST_SIGNAL] = { 0 }; static void @@ -112,7 +114,7 @@ history->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_image_history_parent_class)->finalize (object); } @@ -121,8 +123,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); - gth_image_history_signals[CHANGED] = g_signal_new ("changed", G_TYPE_FROM_CLASS (class), @@ -144,34 +144,6 @@ } -GType -gth_image_history_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthImageHistoryClass), - NULL, - NULL, - (GClassInitFunc) gth_image_history_class_init, - NULL, - NULL, - sizeof (GthImageHistory), - 0, - (GInstanceInitFunc) gth_image_history_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthImageHistory", - &type_info, - 0); - } - - return type; -} - - GthImageHistory * gth_image_history_new (void) { diff -Nru gthumb-2.14.3/gthumb/gth-image-loader.c gthumb-3.0.0/gthumb/gth-image-loader.c --- gthumb-2.14.3/gthumb/gth-image-loader.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-loader.c 2012-03-24 13:29:36.000000000 +0000 @@ -42,13 +42,13 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthImageLoader, gth_image_loader, G_TYPE_OBJECT) static void gth_image_loader_finalize (GObject *object) { - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_image_loader_parent_class)->finalize (object); } @@ -57,7 +57,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthImageLoaderPrivate)); object_class = G_OBJECT_CLASS (class); @@ -77,34 +76,6 @@ } -GType -gth_image_loader_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthImageLoaderClass), - NULL, - NULL, - (GClassInitFunc) gth_image_loader_class_init, - NULL, - NULL, - sizeof (GthImageLoader), - 0, - (GInstanceInitFunc) gth_image_loader_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthImageLoader", - &type_info, - 0); - } - - return type; -} - - GthImageLoader * gth_image_loader_new (GthImageLoaderFunc loader_func, gpointer loader_data) diff -Nru gthumb-2.14.3/gthumb/gth-image-navigator.c gthumb-3.0.0/gthumb/gth-image-navigator.c --- gthumb-2.14.3/gthumb/gth-image-navigator.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-navigator.c 2012-03-06 15:48:41.000000000 +0000 @@ -36,59 +36,291 @@ #define POPUP_MAX_HEIGHT 112 +/* Properties */ +enum { + PROP_0, + PROP_VIEWER +}; + + struct _GthImageNavigatorPrivate { - GthImageViewer *viewer; - GtkWidget *viewer_vscr; - GtkWidget *viewer_hscr; - GtkWidget *navigator_event_area; - gboolean scrollbars_visible; + GtkWidget *viewer; + GtkWidget *vscrollbar; + GtkWidget *hscrollbar; + GtkWidget *navigator_event_area; + gboolean automatic_scrollbars; + gboolean hscrollbar_visible; + gboolean vscrollbar_visible; }; -static GtkHBoxClass *parent_class = NULL; +static void +_gth_image_navigator_set_viewer (GthImageNavigator *self, + GtkWidget *viewer) +{ + if (self->priv->viewer == viewer) + return; + + if (self->priv->viewer != NULL) + gtk_container_remove (GTK_CONTAINER (self), self->priv->viewer); + + if (viewer == NULL) + return; + + gtk_container_add (GTK_CONTAINER (self), viewer); + gtk_range_set_adjustment (GTK_RANGE (self->priv->hscrollbar), gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (viewer))); + gtk_range_set_adjustment (GTK_RANGE (self->priv->vscrollbar), gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (viewer))); + + g_object_notify (G_OBJECT (self), "viewer"); +} + + +static void +gth_image_navigator_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + GthImageNavigator *self = GTH_IMAGE_NAVIGATOR (object); + + switch (property_id) { + case PROP_VIEWER: + _gth_image_navigator_set_viewer (self, g_value_get_object (value)); + break; + + default: + break; + } +} + + +static void +gth_image_navigator_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + GthImageNavigator *self = GTH_IMAGE_NAVIGATOR (object); + + switch (property_id) { + case PROP_VIEWER: + g_value_set_object (value, self->priv->viewer); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + static void -gth_image_navigator_class_init (GthImageNavigatorClass *class) +gth_image_navigator_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) { - parent_class = g_type_class_peek_parent (class); - g_type_class_add_private (class, sizeof (GthImageNavigatorPrivate)); + GthImageNavigator *self = (GthImageNavigator *) widget; + gboolean hscrollbar_visible; + gboolean vscrollbar_visible; + GtkAllocation viewer_allocation; + + gtk_widget_set_allocation (widget, allocation); + + if (self->priv->automatic_scrollbars) { + gth_image_viewer_needs_scrollbars (GTH_IMAGE_VIEWER (self->priv->viewer), + allocation, + self->priv->hscrollbar, + self->priv->vscrollbar, + &hscrollbar_visible, + &vscrollbar_visible); + + if (self->priv->vscrollbar_visible != vscrollbar_visible) + self->priv->vscrollbar_visible = vscrollbar_visible; + + if (self->priv->hscrollbar_visible != hscrollbar_visible) + self->priv->hscrollbar_visible = hscrollbar_visible; + } + else { + self->priv->vscrollbar_visible = FALSE; + self->priv->hscrollbar_visible = FALSE; + } + + gtk_widget_set_child_visible (self->priv->vscrollbar, self->priv->vscrollbar_visible); + gtk_widget_set_child_visible (self->priv->hscrollbar, self->priv->hscrollbar_visible); + gtk_widget_set_child_visible (self->priv->navigator_event_area, self->priv->hscrollbar_visible || self->priv->vscrollbar_visible); + + viewer_allocation = *allocation; + if (self->priv->hscrollbar_visible || self->priv->vscrollbar_visible) { + GtkRequisition vscrollbar_requisition; + GtkRequisition hscrollbar_requisition; + GtkAllocation child_allocation; + + gtk_widget_get_preferred_size (self->priv->vscrollbar, &vscrollbar_requisition, NULL); + gtk_widget_get_preferred_size (self->priv->hscrollbar, &hscrollbar_requisition, NULL); + + if (self->priv->vscrollbar_visible) { + viewer_allocation.width -= vscrollbar_requisition.width; + + /* vertical scrollbar */ + + child_allocation.x = allocation->x + allocation->width - vscrollbar_requisition.width; + child_allocation.y = allocation->y; + child_allocation.width = vscrollbar_requisition.width; + child_allocation.height = allocation->height - hscrollbar_requisition.height; + gtk_widget_size_allocate (self->priv->vscrollbar, &child_allocation); + } + + if (self->priv->hscrollbar_visible) { + viewer_allocation.height -= hscrollbar_requisition.height; + + /* horizontal scrollbar */ + + child_allocation.x = allocation->x; + child_allocation.y = allocation->y + allocation->height - hscrollbar_requisition.height; + child_allocation.width = allocation->width - vscrollbar_requisition.width; + child_allocation.height = hscrollbar_requisition.height; + gtk_widget_size_allocate (self->priv->hscrollbar, &child_allocation); + } + + /* event area */ + + child_allocation.x = allocation->x + allocation->width - vscrollbar_requisition.width; + child_allocation.y = allocation->y + allocation->height - hscrollbar_requisition.height; + child_allocation.width = vscrollbar_requisition.width; + child_allocation.height = hscrollbar_requisition.height; + gtk_widget_size_allocate (self->priv->navigator_event_area, &child_allocation); + } + + gtk_widget_size_allocate (self->priv->viewer, &viewer_allocation); } +typedef struct { + GtkWidget *container; + cairo_t *cr; +} DrawData; + + static void -gth_image_navigator_init (GthImageNavigator *self) +gth_image_navigator_draw_child (GtkWidget *child, + gpointer user_data) { - self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), GTH_TYPE_IMAGE_NAVIGATOR, GthImageNavigatorPrivate); - self->priv->scrollbars_visible = TRUE; + DrawData *data = user_data; + + if (gtk_widget_get_child_visible (child)) + gtk_container_propagate_draw (GTK_CONTAINER (data->container), + child, + data->cr); } -GType -gth_image_navigator_get_type (void) +static gboolean +gth_image_navigator_draw (GtkWidget *widget, + cairo_t *cr) { - static GType type = 0; + DrawData data; - if (! type) { - GTypeInfo type_info = { - sizeof (GthImageNavigatorClass), - NULL, - NULL, - (GClassInitFunc) gth_image_navigator_class_init, - NULL, - NULL, - sizeof (GthImageNavigator), - 0, - (GInstanceInitFunc) gth_image_navigator_init - }; - - type = g_type_register_static (GTK_TYPE_HBOX, - "GthImageNavigator", - &type_info, - 0); - } + data.container = widget; + data.cr = cr; + gtk_container_forall (GTK_CONTAINER (widget), + gth_image_navigator_draw_child, + &data); - return type; + return FALSE; +} + + +static void +gth_image_navigator_add (GtkContainer *container, + GtkWidget *widget) +{ + GthImageNavigator *self = GTH_IMAGE_NAVIGATOR (container); + + if (self->priv->viewer != NULL) { + g_warning ("Attempt to add a second widget to a GthImageNavigator"); + return; + } + + gtk_widget_set_parent (widget, GTK_WIDGET (container)); + self->priv->viewer = widget; +} + + +static void +gth_image_navigator_remove (GtkContainer *container, + GtkWidget *widget) +{ + GthImageNavigator *self = GTH_IMAGE_NAVIGATOR (container); + gboolean widget_was_visible; + + g_return_if_fail (self->priv->viewer == widget); + + widget_was_visible = gtk_widget_get_visible (widget); + gtk_widget_unparent (widget); + self->priv->viewer = NULL; + + if (widget_was_visible && gtk_widget_get_visible (GTK_WIDGET (container))) + gtk_widget_queue_resize (GTK_WIDGET (container)); +} + + +static void +gth_image_navigator_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, + gpointer callback_data) +{ + GthImageNavigator *self = GTH_IMAGE_NAVIGATOR (container); + + (* callback) (GTK_WIDGET (self->priv->viewer), callback_data); + if (include_internals) { + (* callback) (self->priv->hscrollbar, callback_data); + (* callback) (self->priv->vscrollbar, callback_data); + (* callback) (self->priv->navigator_event_area, callback_data); + } +} + + +static GType +gth_image_navigator_child_type (GtkContainer *container) +{ + return GTK_TYPE_WIDGET; +} + + +static void +gth_image_navigator_class_init (GthImageNavigatorClass *klass) +{ + GObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + + g_type_class_add_private (klass, sizeof (GthImageNavigatorPrivate)); + + object_class = (GObjectClass *) klass; + object_class->set_property = gth_image_navigator_set_property; + object_class->get_property = gth_image_navigator_get_property; + + widget_class = (GtkWidgetClass *) klass; + widget_class->size_allocate = gth_image_navigator_size_allocate; + widget_class->draw = gth_image_navigator_draw; + + container_class = (GtkContainerClass *) klass; + container_class->add = gth_image_navigator_add; + container_class->remove = gth_image_navigator_remove; + container_class->forall = gth_image_navigator_forall; + container_class->child_type = gth_image_navigator_child_type; + gtk_container_class_handle_border_width (container_class); + + /* properties */ + + g_object_class_install_property (object_class, + PROP_VIEWER, + g_param_spec_object ("viewer", + "Viewer", + "The image viewer to use", + GTH_TYPE_IMAGE_VIEWER, + G_PARAM_READWRITE)); } @@ -96,16 +328,16 @@ typedef struct { - GthImageViewer *viewer; - int x_root, y_root; - GtkWidget *popup_win; - GtkWidget *preview; - cairo_surface_t *image; - int image_width, image_height; - int window_max_width, window_max_height; - int popup_x, popup_y, popup_width, popup_height; - GdkRectangle visible_area; - double zoom_factor; + GthImageViewer *viewer; + int x_root, y_root; + GtkWidget *popup_win; + GtkWidget *preview; + cairo_surface_t *image; + int image_width, image_height; + int window_max_width, window_max_height; + int popup_x, popup_y, popup_width, popup_height; + cairo_rectangle_int_t visible_area; + double zoom_factor; } NavigatorPopup; @@ -205,8 +437,9 @@ switch (event->type) { case GDK_BUTTON_RELEASE: /* Release keyboard focus. */ - gdk_keyboard_ungrab (GDK_CURRENT_TIME); - gtk_grab_remove (nav_popup->popup_win); + /*gdk_keyboard_ungrab (GDK_CURRENT_TIME);*/ + /*gtk_grab_remove (nav_popup->popup_win);*/ + gdk_device_ungrab (gdk_event_get_device (event), ((GdkEventButton *)event)->time); gtk_widget_destroy (nav_popup->popup_win); cairo_surface_destroy (nav_popup->image); @@ -215,7 +448,11 @@ return TRUE; case GDK_MOTION_NOTIFY: - gdk_window_get_pointer (gtk_widget_get_window (widget), &mx, &my, &mask); + gdk_window_get_device_position (gtk_widget_get_window (widget), + gdk_event_get_device (event), + &mx, + &my, + &mask); get_visible_area_origin_as_double (nav_popup, mx, my, &x, &y); nav_popup->visible_area.x = (int) x; @@ -232,17 +469,17 @@ case GDK_KEY_PRESS: switch (event->key.keyval) { - case GDK_plus: - case GDK_minus: - case GDK_1: + case GDK_KEY_plus: + case GDK_KEY_minus: + case GDK_KEY_1: switch (event->key.keyval) { - case GDK_plus: + case GDK_KEY_plus: gth_image_viewer_zoom_in (viewer); break; - case GDK_minus: + case GDK_KEY_minus: gth_image_viewer_zoom_out (viewer); break; - case GDK_1: + case GDK_KEY_1: gth_image_viewer_set_zoom (viewer, 1.0); break; } @@ -269,47 +506,41 @@ static void -nav_window_grab_pointer (NavigatorPopup *nav_popup) +nav_window_grab_pointer (NavigatorPopup *nav_popup, + GdkDevice *device) { GdkCursor *cursor; gtk_grab_add (nav_popup->popup_win); - cursor = gdk_cursor_new (GDK_FLEUR); - gdk_pointer_grab (gtk_widget_get_window (nav_popup->popup_win), - TRUE, - (GDK_BUTTON_RELEASE_MASK - | GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON_MOTION_MASK - | GDK_EXTENSION_EVENTS_ALL), - gtk_widget_get_window (nav_popup->preview), - cursor, - 0); - gdk_cursor_unref (cursor); + cursor = gdk_cursor_new_for_display (gtk_widget_get_display (GTK_WIDGET (nav_popup->viewer)), GDK_FLEUR); + gdk_device_grab (device, + gtk_widget_get_window (nav_popup->popup_win), + GDK_OWNERSHIP_WINDOW, + TRUE, + (GDK_BUTTON_RELEASE_MASK + | GDK_POINTER_MOTION_HINT_MASK + | GDK_BUTTON_MOTION_MASK), + cursor, + 0); + g_object_unref (cursor); /* Capture keyboard events. */ - gdk_keyboard_grab (gtk_widget_get_window (nav_popup->popup_win), TRUE, GDK_CURRENT_TIME); + /*gdk_keyboard_grab (gtk_widget_get_window (nav_popup->popup_win), TRUE, GDK_CURRENT_TIME);*/ gtk_widget_grab_focus (nav_popup->popup_win); } static gboolean -navigator_popup_expose_event_cb (GtkWidget *widget, - GdkEventExpose *event, - NavigatorPopup *nav_popup) +navigator_popup_draw_cb (GtkWidget *widget, + cairo_t *cr, + NavigatorPopup *nav_popup) { - cairo_t *cr; - if (nav_popup->image == NULL) return FALSE; - cr = gdk_cairo_create (gtk_widget_get_window (widget)); - cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); - gdk_cairo_region (cr, event->region); - cairo_clip (cr); - cairo_save (cr); cairo_set_source_surface (cr, nav_popup->image, 0, 0); @@ -350,8 +581,6 @@ cairo_restore (cr); } - cairo_destroy (cr); - return TRUE; } @@ -359,17 +588,18 @@ static void navigator_event_area_button_press_event_cb (GtkWidget *widget, GdkEventButton *event, - GthImageViewer *viewer) + gpointer user_data) { - NavigatorPopup *nav_popup; - GtkWidget *out_frame; - GtkWidget *in_frame; + GthImageNavigator *self = user_data; + NavigatorPopup *nav_popup; + GtkWidget *out_frame; + GtkWidget *in_frame; - if (gth_image_viewer_is_void (viewer)) + if ((self->priv->viewer == NULL) || gth_image_viewer_is_void (GTH_IMAGE_VIEWER (self->priv->viewer))) return; nav_popup = g_new0 (NavigatorPopup, 1); - nav_popup->viewer = viewer; + nav_popup->viewer = GTH_IMAGE_VIEWER (self->priv->viewer); nav_popup->popup_win = gtk_window_new (GTK_WINDOW_POPUP); gtk_window_set_wmclass (GTK_WINDOW (nav_popup->popup_win), "", "gthumb_navigator"); @@ -384,14 +614,15 @@ nav_popup->preview = gtk_drawing_area_new (); gtk_container_add (GTK_CONTAINER (in_frame), nav_popup->preview); g_signal_connect (G_OBJECT (nav_popup->preview), - "expose_event", - G_CALLBACK (navigator_popup_expose_event_cb), + "draw", + G_CALLBACK (navigator_popup_draw_cb), nav_popup); nav_popup->x_root = event->x_root; nav_popup->y_root = event->y_root; - nav_popup->image_width = gth_image_viewer_get_image_width (viewer); - nav_popup->image_height = gth_image_viewer_get_image_height (viewer); + gth_image_viewer_get_original_size (GTH_IMAGE_VIEWER (self->priv->viewer), + &nav_popup->image_width, + &nav_popup->image_height); update_popup_geometry (nav_popup); g_signal_connect (G_OBJECT (nav_popup->popup_win), @@ -409,117 +640,64 @@ gtk_widget_show_all (nav_popup->popup_win); - nav_window_grab_pointer (nav_popup); + nav_window_grab_pointer (nav_popup, gdk_event_get_device ((GdkEvent *) event)); } -static gboolean -image_viewer_size_changed_cb (GtkWidget *widget, - GthImageNavigator *self) +static void +gth_image_navigator_init (GthImageNavigator *self) { - GtkAdjustment *vadj; - GtkAdjustment *hadj; - double h_page_size; - double v_page_size; - double h_upper; - double v_upper; - gboolean hide_vscr; - gboolean hide_hscr; - - gth_image_viewer_get_adjustments (self->priv->viewer, &hadj, &vadj); - - g_return_val_if_fail (hadj != NULL, FALSE); - g_return_val_if_fail (vadj != NULL, FALSE); - - h_page_size = gtk_adjustment_get_page_size (hadj); - v_page_size = gtk_adjustment_get_page_size (vadj); - h_upper = gtk_adjustment_get_upper (hadj); - v_upper = gtk_adjustment_get_upper (vadj); - hide_vscr = (v_page_size == 0) || (v_upper <= v_page_size); - hide_hscr = (h_page_size == 0) || (h_upper <= h_page_size); - - if (! self->priv->scrollbars_visible || (hide_vscr && hide_hscr)) { - gtk_widget_hide (self->priv->viewer_vscr); - gtk_widget_hide (self->priv->viewer_hscr); - gtk_widget_hide (self->priv->navigator_event_area); - } - else { - gtk_widget_show (self->priv->viewer_vscr); - gtk_widget_show (self->priv->viewer_hscr); - gtk_widget_show (self->priv->navigator_event_area); - } + self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), GTH_TYPE_IMAGE_NAVIGATOR, GthImageNavigatorPrivate); - return TRUE; -} + gtk_widget_set_has_window (GTK_WIDGET (self), FALSE); + gtk_container_set_reallocate_redraws (GTK_CONTAINER (self), TRUE); + self->priv->automatic_scrollbars = TRUE; + self->priv->hscrollbar_visible = FALSE; + self->priv->vscrollbar_visible = FALSE; -static void -gth_image_navigator_construct (GthImageNavigator *self, - GthImageViewer *viewer) -{ - GtkAdjustment *vadj = NULL; - GtkAdjustment *hadj = NULL; - GtkWidget *hbox; - GtkWidget *table; - - self->priv->viewer = viewer; - g_signal_connect (G_OBJECT (self->priv->viewer), - "size_changed", - G_CALLBACK (image_viewer_size_changed_cb), - self); + /* horizonal scrollbar */ - gth_image_viewer_get_adjustments (self->priv->viewer, &hadj, &vadj); - self->priv->viewer_hscr = gtk_hscrollbar_new (hadj); - self->priv->viewer_vscr = gtk_vscrollbar_new (vadj); + self->priv->hscrollbar = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL); + gtk_widget_set_parent (self->priv->hscrollbar, GTK_WIDGET (self)); - self->priv->navigator_event_area = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (self->priv->navigator_event_area), gtk_image_new_from_icon_name ("image-navigator", GTK_ICON_SIZE_MENU)); + /* vertical scrollbar */ + self->priv->vscrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, NULL); + gtk_widget_set_parent (self->priv->vscrollbar, GTK_WIDGET (self)); + + /* navigator event area */ + + self->priv->navigator_event_area = gtk_event_box_new (); + gtk_widget_set_parent (GTK_WIDGET (self->priv->navigator_event_area), GTK_WIDGET (self)); + gtk_container_add (GTK_CONTAINER (self->priv->navigator_event_area), + gtk_image_new_from_icon_name ("image-navigator", GTK_ICON_SIZE_MENU)); g_signal_connect (G_OBJECT (self->priv->navigator_event_area), "button_press_event", G_CALLBACK (navigator_event_area_button_press_event_cb), - self->priv->viewer); + self); - hbox = gtk_hbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (hbox), GTK_WIDGET (self->priv->viewer)); + gtk_widget_show (self->priv->hscrollbar); + gtk_widget_show (self->priv->vscrollbar); + gtk_widget_show_all (self->priv->navigator_event_area); +} - table = gtk_table_new (2, 2, FALSE); - gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); - gtk_table_attach (GTK_TABLE (table), self->priv->viewer_vscr, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); - gtk_table_attach (GTK_TABLE (table), self->priv->viewer_hscr, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_table_attach (GTK_TABLE (table), self->priv->navigator_event_area, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (GTK_FILL), 0, 0); - gtk_widget_show_all (table); - gtk_container_add (GTK_CONTAINER (self), table); -} +G_DEFINE_TYPE(GthImageNavigator, gth_image_navigator, GTK_TYPE_CONTAINER) GtkWidget * gth_image_navigator_new (GthImageViewer *viewer) { - GthImageNavigator *self; - g_return_val_if_fail (viewer != NULL, NULL); - - self = g_object_new (GTH_TYPE_IMAGE_NAVIGATOR, NULL); - gth_image_navigator_construct (self, viewer); - - return (GtkWidget*) self; + return (GtkWidget *) g_object_new (GTH_TYPE_IMAGE_NAVIGATOR, "viewer", viewer, NULL); } void -gth_image_navigator_set_scrollbars_visible (GthImageNavigator *self, - gboolean visible) +gth_image_navigator_set_automatic_scrollbars (GthImageNavigator *self, + gboolean automatic) { - self->priv->scrollbars_visible = visible; - image_viewer_size_changed_cb (NULL, self); + self->priv->automatic_scrollbars = automatic; + gtk_widget_queue_resize (self->priv->viewer); } diff -Nru gthumb-2.14.3/gthumb/gth-image-navigator.h gthumb-3.0.0/gthumb/gth-image-navigator.h --- gthumb-2.14.3/gthumb/gth-image-navigator.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-navigator.h 2012-02-19 15:01:32.000000000 +0000 @@ -39,18 +39,18 @@ typedef struct _GthImageNavigatorPrivate GthImageNavigatorPrivate; struct _GthImageNavigator { - GtkHBox __parent; + GtkContainer __parent; GthImageNavigatorPrivate *priv; }; struct _GthImageNavigatorClass { - GtkHBoxClass __parent; + GtkContainerClass __parent; }; -GType gth_image_navigator_get_type (void); -GtkWidget * gth_image_navigator_new (GthImageViewer *viewer); -void gth_image_navigator_set_scrollbars_visible (GthImageNavigator *window, - gboolean visible); +GType gth_image_navigator_get_type (void); +GtkWidget * gth_image_navigator_new (GthImageViewer *viewer); +void gth_image_navigator_set_automatic_scrollbars (GthImageNavigator *window, + gboolean automatic); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/gth-image-preloader.c gthumb-3.0.0/gthumb/gth-image-preloader.c --- gthumb-2.14.3/gthumb/gth-image-preloader.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-preloader.c 2012-02-19 15:01:32.000000000 +0000 @@ -43,11 +43,13 @@ typedef struct { + int ref; GthImagePreloader *self; GthFileData *file_data; int requested_size; gboolean loaded; gboolean error; + gboolean canceled; GthImageLoader *loader; GthImage *image; int original_width; @@ -81,10 +83,12 @@ }; -static gpointer parent_class = NULL; static guint gth_image_preloader_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (GthImagePreloader, gth_image_preloader, G_TYPE_OBJECT) + + /* -- Preloader -- */ @@ -94,10 +98,12 @@ Preloader *preloader; preloader = g_new0 (Preloader, 1); + preloader->ref = 1; preloader->self = self; preloader->file_data = NULL; preloader->loaded = FALSE; preloader->error = FALSE; + preloader->canceled = FALSE; preloader->loader = gth_image_loader_new (NULL, NULL); gth_image_loader_set_preferred_format (preloader->loader, GTH_IMAGE_FORMAT_CAIRO_SURFACE); preloader->image = NULL; @@ -108,11 +114,21 @@ } +static Preloader * +preloader_ref (Preloader *preloader) +{ + preloader->ref++; + return preloader; +} + + static void -preloader_free (Preloader *preloader) +preloader_unref (Preloader *preloader) { if (preloader == NULL) return; + if (--preloader->ref > 0) + return; _g_object_unref (preloader->image); _g_object_unref (preloader->loader); _g_object_unref (preloader->file_data); @@ -219,14 +235,15 @@ } for (i = 0; i < self->priv->n_preloaders; i++) { - preloader_free (self->priv->loader[i]); + self->priv->loader[i]->canceled = TRUE; + preloader_unref (self->priv->loader[i]); self->priv->loader[i] = NULL; } g_free (self->priv->loader); _g_object_unref (self->priv->requested_file); g_object_unref (self->priv->cancellable); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_image_preloader_parent_class)->finalize (object); } @@ -235,7 +252,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthImagePreloaderPrivate)); gth_image_preloader_signals[REQUESTED_READY] = @@ -286,34 +302,6 @@ } -GType -gth_image_preloader_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthImagePreloaderClass), - NULL, - NULL, - (GClassInitFunc) gth_image_preloader_class_init, - NULL, - NULL, - sizeof (GthImagePreloader), - 0, - (GInstanceInitFunc) gth_image_preloader_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthImagePreloader", - &type_info, - 0); - } - - return type; -} - - GthImagePreloader * gth_image_preloader_new (GthLoadPolicy load_policy, int n_preloaders) @@ -381,6 +369,7 @@ static void load_request_free (LoadRequest *load_request) { + preloader_unref (load_request->preloader); g_object_unref (load_request->file_data); g_free (load_request); } @@ -401,6 +390,11 @@ gboolean success; int interval; + if (preloader->canceled) { + load_request_free (load_request); + return; + } + self->priv->current = -1; success = gth_image_loader_load_finish (GTH_IMAGE_LOADER (source_object), @@ -528,7 +522,7 @@ preloader->image = NULL; load_request = g_new0 (LoadRequest, 1); - load_request->preloader = preloader; + load_request->preloader = preloader_ref (preloader); load_request->file_data = g_object_ref (preloader->file_data); load_request->requested_size = preloader->requested_size; diff -Nru gthumb-2.14.3/gthumb/gth-image-selector.c gthumb-3.0.0/gthumb/gth-image-selector.c --- gthumb-2.14.3/gthumb/gth-image-selector.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-selector.c 2012-02-19 15:01:32.000000000 +0000 @@ -36,10 +36,10 @@ typedef struct { - int ref_count; - int id; - GdkRectangle area; - GdkCursor *cursor; + int ref_count; + int id; + cairo_rectangle_int_t area; + GdkCursor *cursor; } EventArea; @@ -80,7 +80,7 @@ return; if (event_area->cursor != NULL) - gdk_cursor_unref (event_area->cursor); + g_object_unref (event_area->cursor); g_free (event_area); } @@ -186,46 +186,55 @@ static guint signals[LAST_SIGNAL] = { 0 }; -static gpointer parent_class = NULL; struct _GthImageSelectorPrivate { - GthImageViewer *viewer; - GthSelectorType type; + GthImageViewer *viewer; + GthSelectorType type; - cairo_surface_t *surface; - GdkRectangle surface_area; + cairo_surface_t *surface; + cairo_rectangle_int_t surface_area; - gboolean use_ratio; - double ratio; - gboolean mask_visible; - GthGridType grid_type; - gboolean active; - gboolean bind_dimensions; - int bind_factor; - - GdkRectangle drag_start_selection_area; - GdkRectangle selection_area; - GdkRectangle selection; - - GdkCursor *default_cursor; - GdkCursor *current_cursor; - GList *event_list; - EventArea *current_area; - - guint timer_id; /* Timeout ID for - * autoscrolling */ - double x_value_diff; /* Change the adjustment value - * by this - * amount when autoscrolling */ - double y_value_diff; + gboolean use_ratio; + double ratio; + gboolean mask_visible; + GthGridType grid_type; + gboolean active; + gboolean bind_dimensions; + int bind_factor; + + cairo_rectangle_int_t drag_start_selection_area; + cairo_rectangle_int_t selection_area; + cairo_rectangle_int_t selection; + + GdkCursor *default_cursor; + GdkCursor *current_cursor; + GList *event_list; + EventArea *current_area; + + guint timer_id; /* Timeout ID for + * autoscrolling */ + double x_value_diff; /* Change the adjustment value + * by this + * amount when autoscrolling */ + double y_value_diff; }; +static void gth_image_selector_gth_image_tool_interface_init (GthImageViewerToolInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthImageSelector, + gth_image_selector, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTH_TYPE_IMAGE_VIEWER_TOOL, + gth_image_selector_gth_image_tool_interface_init)) + + static gboolean -point_in_rectangle (int x, - int y, - GdkRectangle rect) +point_in_rectangle (int x, + int y, + cairo_rectangle_int_t rect) { return ((x >= rect.x) && (x <= rect.x + rect.width) @@ -235,8 +244,8 @@ static gboolean -rectangle_in_rectangle (GdkRectangle r1, - GdkRectangle r2) +rectangle_in_rectangle (cairo_rectangle_int_t r1, + cairo_rectangle_int_t r2) { return (point_in_rectangle (r1.x, r1.y, r2) && point_in_rectangle (r1.x + r1.width, @@ -246,8 +255,8 @@ static gboolean -rectangle_equal (GdkRectangle r1, - GdkRectangle r2) +rectangle_equal (cairo_rectangle_int_t r1, + cairo_rectangle_int_t r2) { return ((r1.x == r2.x) && (r1.y == r2.y) @@ -265,9 +274,9 @@ static void -convert_to_selection_area (GthImageSelector *self, - GdkRectangle real_area, - GdkRectangle *selection_area) +convert_to_selection_area (GthImageSelector *self, + cairo_rectangle_int_t real_area, + cairo_rectangle_int_t *selection_area) { selection_area->x = real_to_selector (self, real_area.x); selection_area->y = real_to_selector (self, real_area.y); @@ -307,8 +316,8 @@ GList *scan; for (scan = self->priv->event_list; scan; scan = scan->next) { - EventArea *event_area = scan->data; - GdkRectangle widget_area; + EventArea *event_area = scan->data; + cairo_rectangle_int_t widget_area; widget_area = event_area->area; widget_area.x += self->priv->viewer->image_area.x; @@ -424,8 +433,8 @@ static void -queue_draw (GthImageSelector *self, - GdkRectangle area) +queue_draw (GthImageSelector *self, + cairo_rectangle_int_t area) { if (! gtk_widget_get_realized (GTK_WIDGET (self->priv->viewer))) return; @@ -447,12 +456,12 @@ static void -set_selection_area (GthImageSelector *self, - GdkRectangle new_selection, - gboolean force_update) +set_selection_area (GthImageSelector *self, + cairo_rectangle_int_t new_selection, + gboolean force_update) { - GdkRectangle old_selection_area; - GdkRectangle dirty_region; + cairo_rectangle_int_t old_selection_area; + cairo_rectangle_int_t dirty_region; if (! force_update && rectangle_equal (self->priv->selection_area, new_selection)) return; @@ -467,11 +476,11 @@ static void -set_selection (GthImageSelector *self, - GdkRectangle new_selection, - gboolean force_update) +set_selection (GthImageSelector *self, + cairo_rectangle_int_t new_selection, + gboolean force_update) { - GdkRectangle new_area; + cairo_rectangle_int_t new_area; if (! force_update && rectangle_equal (self->priv->selection, new_selection)) return; @@ -485,7 +494,7 @@ static void init_selection (GthImageSelector *self) { - GdkRectangle area; + cairo_rectangle_int_t area; /* if (! self->priv->use_ratio) { @@ -564,7 +573,7 @@ GthImageSelector *self = GTH_IMAGE_SELECTOR (base); if (self->priv->default_cursor != NULL) { - gdk_cursor_unref (self->priv->default_cursor); + g_object_unref (self->priv->default_cursor); self->priv->default_cursor = NULL; } @@ -599,7 +608,6 @@ static void paint_background (GthImageSelector *self, - GdkEventExpose *event, cairo_t *cr) { gth_image_viewer_paint_region (self->priv->viewer, @@ -608,38 +616,24 @@ self->priv->viewer->x_offset - self->priv->viewer->image_area.x, self->priv->viewer->y_offset - self->priv->viewer->image_area.y, &self->priv->viewer->image_area, - event->region, + NULL, gth_image_viewer_get_zoom_quality_filter (self->priv->viewer)); /* make the background darker */ - { - GdkRectangle *rects; - int n_rects; - int i; - - gdk_cairo_rectangle (cr, &self->priv->viewer->image_area); - cairo_clip (cr); - cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5); - gdk_region_get_rectangles (event->region, &rects, &n_rects); - for (i = 0; i < n_rects; i++) { - GdkRectangle paint_area; - if (gdk_rectangle_intersect (&self->priv->viewer->image_area, &rects[i], &paint_area)) - cairo_rectangle (cr, paint_area.x, paint_area.y, paint_area.width, paint_area.height); - } - cairo_fill (cr); - - g_free (rects); - } + cairo_save (cr); + gdk_cairo_rectangle (cr, &self->priv->viewer->image_area); + cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.5); + cairo_fill (cr); + cairo_restore (cr); } static void paint_selection (GthImageSelector *self, - GdkEventExpose *event, cairo_t *cr) { - GdkRectangle selection_area; + cairo_rectangle_int_t selection_area; selection_area = self->priv->selection_area; selection_area.x += self->priv->viewer->image_area.x - self->priv->viewer->x_offset; @@ -652,7 +646,7 @@ self->priv->viewer->x_offset - self->priv->viewer->image_area.x, self->priv->viewer->y_offset - self->priv->viewer->image_area.y, &selection_area, - event->region, + NULL, gth_image_viewer_get_zoom_quality_filter (self->priv->viewer)); cairo_save (cr); @@ -685,7 +679,6 @@ static void paint_image (GthImageSelector *self, - GdkEventExpose *event, cairo_t *cr) { gth_image_viewer_paint_region (self->priv->viewer, @@ -694,15 +687,14 @@ self->priv->viewer->x_offset - self->priv->viewer->image_area.x, self->priv->viewer->y_offset - self->priv->viewer->image_area.y, &self->priv->viewer->image_area, - event->region, + NULL, gth_image_viewer_get_zoom_quality_filter (self->priv->viewer)); } static void -gth_image_selector_expose (GthImageViewerTool *base, - GdkEventExpose *event, - cairo_t *cr) +gth_image_selector_draw (GthImageViewerTool *base, + cairo_t *cr) { GthImageSelector *self = GTH_IMAGE_SELECTOR (base); @@ -713,13 +705,13 @@ if (self->priv->mask_visible) { if (self->priv->viewer->dragging) - paint_image (self, event, cr); + paint_image (self, cr); else - paint_background (self, event, cr); - paint_selection (self, event, cr); + paint_background (self, cr); + paint_selection (self, cr); } else - paint_image (self, event, cr); + paint_image (self, cr); } @@ -732,9 +724,9 @@ static void -convert_to_real_selection (GthImageSelector *self, - GdkRectangle selection_area, - GdkRectangle *real_area) +convert_to_real_selection (GthImageSelector *self, + cairo_rectangle_int_t selection_area, + cairo_rectangle_int_t *real_area) { real_area->x = selector_to_real (self, selection_area.x); real_area->y = selector_to_real (self, selection_area.y); @@ -794,10 +786,10 @@ static void -grow_upward (GdkRectangle *bound, - GdkRectangle *r, - int dy, - gboolean check) +grow_upward (cairo_rectangle_int_t *bound, + cairo_rectangle_int_t *r, + int dy, + gboolean check) { if (check && (r->y + dy < 0)) dy = -r->y; @@ -807,10 +799,10 @@ static void -grow_downward (GdkRectangle *bound, - GdkRectangle *r, - int dy, - gboolean check) +grow_downward (cairo_rectangle_int_t *bound, + cairo_rectangle_int_t *r, + int dy, + gboolean check) { if (check && (r->y + r->height + dy > bound->height)) dy = bound->height - (r->y + r->height); @@ -819,10 +811,10 @@ static void -grow_leftward (GdkRectangle *bound, - GdkRectangle *r, - int dx, - gboolean check) +grow_leftward (cairo_rectangle_int_t *bound, + cairo_rectangle_int_t *r, + int dx, + gboolean check) { if (check && (r->x + dx < 0)) dx = -r->x; @@ -832,10 +824,10 @@ static void -grow_rightward (GdkRectangle *bound, - GdkRectangle *r, - int dx, - gboolean check) +grow_rightward (cairo_rectangle_int_t *bound, + cairo_rectangle_int_t *r, + int dx, + gboolean check) { if (check && (r->x + r->width + dx > bound->width)) dx = bound->width - (r->x + r->width); @@ -879,8 +871,8 @@ static gboolean -check_and_set_new_selection (GthImageSelector *self, - GdkRectangle new_selection) +check_and_set_new_selection (GthImageSelector *self, + cairo_rectangle_int_t new_selection) { new_selection.width = MAX (0, new_selection.width); new_selection.height = MAX (0, new_selection.height); @@ -941,7 +933,7 @@ y = event->y + self->priv->viewer->y_offset; if (self->priv->current_area == NULL) { - GdkRectangle new_selection; + cairo_rectangle_int_t new_selection; new_selection.x = selector_to_real (self, x - self->priv->viewer->image_area.x); new_selection.y = selector_to_real (self, y - self->priv->viewer->image_area.y); @@ -977,12 +969,12 @@ static void update_mouse_selection (GthImageSelector *self) { - gboolean check = ! self->priv->use_ratio; - int dx, dy; - GdkRectangle new_selection, tmp; - int semiplane; - GthEventAreaType area_type = self->priv->current_area->id; - EventArea *event_area; + gboolean check = ! self->priv->use_ratio; + int dx, dy; + cairo_rectangle_int_t new_selection, tmp; + int semiplane; + GthEventAreaType area_type = self->priv->current_area->id; + EventArea *event_area; dx = selector_to_real (self, self->priv->viewer->drag_x - self->priv->viewer->drag_x_start); dy = selector_to_real (self, self->priv->viewer->drag_y - self->priv->viewer->drag_y_start); @@ -1396,17 +1388,18 @@ || (abs (self->priv->viewer->drag_y - self->priv->viewer->drag_y_prev) > DRAG_THRESHOLD)) && (self->priv->current_area != NULL)) { - int retval; + GdkGrabStatus retval; - retval = gdk_pointer_grab (gtk_widget_get_window (widget), - FALSE, - (GDK_POINTER_MOTION_MASK - | GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON_RELEASE_MASK), - NULL, - self->priv->current_area->cursor, - event->time); - if (retval == 0) + retval = gdk_device_grab (event->device, + gtk_widget_get_window (widget), + GDK_OWNERSHIP_WINDOW, + FALSE, + (GDK_POINTER_MOTION_MASK + | GDK_POINTER_MOTION_HINT_MASK + | GDK_BUTTON_RELEASE_MASK), + self->priv->current_area->cursor, + event->time); + if (retval == GDK_GRAB_SUCCESS) self->priv->viewer->dragging = TRUE; return FALSE; @@ -1491,8 +1484,8 @@ static void gth_image_selector_zoom_changed (GthImageViewerTool *base) { - GthImageSelector *self = GTH_IMAGE_SELECTOR (base); - GdkRectangle selection; + GthImageSelector *self = GTH_IMAGE_SELECTOR (base); + cairo_rectangle_int_t selection; gth_image_selector_get_selection (self, &selection); set_selection (self, selection, TRUE); @@ -1500,7 +1493,7 @@ static void -gth_image_selector_instance_init (GthImageSelector *self) +gth_image_selector_init (GthImageSelector *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_IMAGE_SELECTOR, GthImageSelectorPrivate); @@ -1525,7 +1518,7 @@ cairo_surface_destroy (self->priv->surface); /* Chain up */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_image_selector_parent_class)->finalize (object); } @@ -1534,7 +1527,6 @@ { GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthImageSelectorPrivate)); gobject_class = (GObjectClass*) class; @@ -1588,7 +1580,7 @@ static void -gth_image_selector_gth_image_tool_interface_init (GthImageViewerToolIface *iface) +gth_image_selector_gth_image_tool_interface_init (GthImageViewerToolInterface *iface) { iface->set_viewer = gth_image_selector_set_viewer; iface->unset_viewer = gth_image_selector_unset_viewer; @@ -1597,7 +1589,7 @@ iface->size_allocate = gth_image_selector_size_allocate; iface->map = gth_image_selector_map; iface->unmap = gth_image_selector_unmap; - iface->expose = gth_image_selector_expose; + iface->draw = gth_image_selector_draw; iface->button_press = gth_image_selector_button_press; iface->button_release = gth_image_selector_button_release; iface->motion_notify = gth_image_selector_motion_notify; @@ -1606,40 +1598,6 @@ } -GType -gth_image_selector_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthImageSelectorClass), - NULL, - NULL, - (GClassInitFunc) gth_image_selector_class_init, - NULL, - NULL, - sizeof (GthImageSelector), - 0, - (GInstanceInitFunc) gth_image_selector_instance_init - }; - static const GInterfaceInfo gth_image_tool_info = { - (GInterfaceInitFunc) gth_image_selector_gth_image_tool_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthImageSelector", - &type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_IMAGE_VIEWER_TOOL, >h_image_tool_info); - } - - return type; -} - - GthImageViewerTool * gth_image_selector_new (GthSelectorType type) { @@ -1656,7 +1614,7 @@ gth_image_selector_set_selection_x (GthImageSelector *self, int x) { - GdkRectangle new_selection; + cairo_rectangle_int_t new_selection; new_selection = self->priv->selection; new_selection.x = x; @@ -1668,7 +1626,7 @@ gth_image_selector_set_selection_y (GthImageSelector *self, int y) { - GdkRectangle new_selection; + cairo_rectangle_int_t new_selection; new_selection = self->priv->selection; new_selection.y = y; @@ -1681,7 +1639,7 @@ int x, int y) { - GdkRectangle new_selection; + cairo_rectangle_int_t new_selection; new_selection = self->priv->selection; new_selection.x = x; @@ -1694,7 +1652,7 @@ gth_image_selector_set_selection_width (GthImageSelector *self, int width) { - GdkRectangle new_selection; + cairo_rectangle_int_t new_selection; new_selection = self->priv->selection; new_selection.width = width; @@ -1708,7 +1666,7 @@ gth_image_selector_set_selection_height (GthImageSelector *self, int height) { - GdkRectangle new_selection; + cairo_rectangle_int_t new_selection; new_selection = self->priv->selection; new_selection.height = height; @@ -1719,16 +1677,16 @@ void -gth_image_selector_set_selection (GthImageSelector *self, - GdkRectangle selection) +gth_image_selector_set_selection (GthImageSelector *self, + cairo_rectangle_int_t selection) { set_selection (self, selection, FALSE); } void -gth_image_selector_get_selection (GthImageSelector *self, - GdkRectangle *selection) +gth_image_selector_get_selection (GthImageSelector *self, + cairo_rectangle_int_t *selection) { selection->x = MAX (self->priv->selection.x, 0); selection->y = MAX (self->priv->selection.y, 0); @@ -1846,7 +1804,7 @@ void gth_image_selector_center (GthImageSelector *self) { - GdkRectangle new_selection; + cairo_rectangle_int_t new_selection; new_selection = self->priv->selection; new_selection.x = (self->priv->surface_area.width - new_selection.width) / 2; diff -Nru gthumb-2.14.3/gthumb/gth-image-selector.h gthumb-3.0.0/gthumb/gth-image-selector.h --- gthumb-2.14.3/gthumb/gth-image-selector.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-selector.h 2012-02-19 15:01:32.000000000 +0000 @@ -68,38 +68,38 @@ }; GType gth_image_selector_get_type (void); -GthImageViewerTool * gth_image_selector_new (GthSelectorType type); -gboolean gth_image_selector_set_selection_x (GthImageSelector *selector, - int x); -gboolean gth_image_selector_set_selection_y (GthImageSelector *selector, - int y); -gboolean gth_image_selector_set_selection_pos (GthImageSelector *selector, - int x, - int y); -gboolean gth_image_selector_set_selection_width (GthImageSelector *selector, - int width); -gboolean gth_image_selector_set_selection_height (GthImageSelector *selector, - int height); -void gth_image_selector_set_selection (GthImageSelector *selector, - GdkRectangle selection); -void gth_image_selector_get_selection (GthImageSelector *selector, - GdkRectangle *selection); -void gth_image_selector_set_ratio (GthImageSelector *selector, - gboolean use_ratio, - double ratio, - gboolean swap_x_and_y_to_start); -double gth_image_selector_get_ratio (GthImageSelector *selector); -gboolean gth_image_selector_get_use_ratio (GthImageSelector *selector); -void gth_image_selector_set_mask_visible (GthImageSelector *selector, - gboolean visible); -gboolean gth_image_selector_get_mask_visible (GthImageSelector *selector); -void gth_image_selector_set_grid_type (GthImageSelector *selector, - GthGridType grid_type); -GthGridType gth_image_selector_get_grid_type (GthImageSelector *selector); -void gth_image_selector_bind_dimensions (GthImageSelector *selector, - gboolean bind, - int factor); -void gth_image_selector_center (GthImageSelector *selector); +GthImageViewerTool * gth_image_selector_new (GthSelectorType type); +gboolean gth_image_selector_set_selection_x (GthImageSelector *selector, + int x); +gboolean gth_image_selector_set_selection_y (GthImageSelector *selector, + int y); +gboolean gth_image_selector_set_selection_pos (GthImageSelector *selector, + int x, + int y); +gboolean gth_image_selector_set_selection_width (GthImageSelector *selector, + int width); +gboolean gth_image_selector_set_selection_height (GthImageSelector *selector, + int height); +void gth_image_selector_set_selection (GthImageSelector *selector, + cairo_rectangle_int_t selection); +void gth_image_selector_get_selection (GthImageSelector *selector, + cairo_rectangle_int_t *selection); +void gth_image_selector_set_ratio (GthImageSelector *selector, + gboolean use_ratio, + double ratio, + gboolean swap_x_and_y_to_start); +double gth_image_selector_get_ratio (GthImageSelector *selector); +gboolean gth_image_selector_get_use_ratio (GthImageSelector *selector); +void gth_image_selector_set_mask_visible (GthImageSelector *selector, + gboolean visible); +gboolean gth_image_selector_get_mask_visible (GthImageSelector *selector); +void gth_image_selector_set_grid_type (GthImageSelector *selector, + GthGridType grid_type); +GthGridType gth_image_selector_get_grid_type (GthImageSelector *selector); +void gth_image_selector_bind_dimensions (GthImageSelector *selector, + gboolean bind, + int factor); +void gth_image_selector_center (GthImageSelector *selector); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/gth-image-viewer.c gthumb-3.0.0/gthumb/gth-image-viewer.c --- gthumb-2.14.3/gthumb/gth-image-viewer.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-viewer.c 2012-04-23 14:44:52.000000000 +0000 @@ -30,16 +30,10 @@ #include "gth-image-dragger.h" #include "gth-image-viewer.h" #include "gth-marshal.h" +#include "gtk-utils.h" #include "glib-utils.h" #include "pixbuf-utils.h" -#define COLOR_GRAY_00 0x00000000 -#define COLOR_GRAY_33 0x00333333 -#define COLOR_GRAY_66 0x00666666 -#define COLOR_GRAY_99 0x00999999 -#define COLOR_GRAY_CC 0x00cccccc -#define COLOR_GRAY_FF 0x00ffffff - #define DRAG_THRESHOLD 1 /* When dragging the image ignores movements * smaller than this value. */ @@ -48,6 +42,21 @@ #define STEP_INCREMENT 20.0 /* Scroll increment. */ +G_DEFINE_TYPE_WITH_CODE (GthImageViewer, + gth_image_viewer, + GTK_TYPE_WIDGET, + G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL)) + + +enum { + PROP_0, + PROP_HADJUSTMENT, + PROP_VADJUSTMENT, + PROP_HSCROLL_POLICY, + PROP_VSCROLL_POLICY +}; + + enum { CLICKED, ZOOM_IN, @@ -55,13 +64,16 @@ SET_ZOOM, SET_FIT_MODE, ZOOM_CHANGED, - SIZE_CHANGED, SCROLL, LAST_SIGNAL }; struct _GthImageViewerPrivate { + GtkScrollablePolicy hscroll_policy; + GtkScrollablePolicy vscroll_policy; + + GthImage *image; cairo_surface_t *surface; GdkPixbufAnimation *animation; int original_width; @@ -83,8 +95,7 @@ GthTranspType transp_type; GthCheckType check_type; int check_size; - guint32 check_color1; - guint32 check_color2; + cairo_pattern_t *checked_pattern; GthImageViewerTool *tool; @@ -103,23 +114,16 @@ gboolean is_void; /* If TRUE do not show anything. * It is reset to FALSE we an * image is loaded. */ - gboolean double_click; gboolean just_focused; - gboolean black_bg; - gboolean skip_zoom_change; - gboolean skip_size_change; - gboolean reset_scrollbars; - guint update_adjustment_values; GList *painters; }; -static gpointer parent_class = NULL; static guint gth_image_viewer_signals[LAST_SIGNAL] = { 0 }; @@ -149,10 +153,10 @@ g_source_remove (self->priv->anim_id); if (self->priv->cursor != NULL) - gdk_cursor_unref (self->priv->cursor); + g_object_unref (self->priv->cursor); if (self->priv->cursor_void != NULL) - gdk_cursor_unref (self->priv->cursor_void); + g_object_unref (self->priv->cursor_void); if (self->hadj != NULL) { g_signal_handlers_disconnect_by_data (G_OBJECT (self->hadj), self); @@ -167,12 +171,13 @@ g_list_foreach (self->priv->painters, (GFunc) painter_data_free, NULL); _g_object_unref (self->priv->tool); + _g_clear_object (&self->priv->image); _g_clear_object (&self->priv->animation); _g_clear_object (&self->priv->iter); _cairo_clear_surface (&self->priv->iter_surface); _cairo_clear_surface (&self->priv->surface); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_image_viewer_parent_class)->finalize (object); } @@ -213,84 +218,131 @@ static void -_gth_image_viewer_get_zoomed_size (GthImageViewer *self, - int *width, - int *height) +_gth_image_viewer_get_zoomed_size_for_zoom (GthImageViewer *self, + int *width, + int *height, + double zoom_level) { if (gth_image_viewer_get_current_image (self) == NULL) { - *width = 0; - *height = 0; + if (width != NULL) *width = 0; + if (height != NULL) *height = 0; } else { - *width = (int) floor ((double) self->priv->original_width * self->priv->zoom_level); - *height = (int) floor ((double) self->priv->original_height * self->priv->zoom_level); + if (width != NULL) *width = (int) floor ((double) self->priv->original_width * zoom_level); + if (height != NULL) *height = (int) floor ((double) self->priv->original_height * zoom_level); } } static void -_gth_image_viewer_update_image_area (GthImageViewer *self) +_gth_image_viewer_get_zoomed_size (GthImageViewer *self, + int *width, + int *height) { - GtkWidget *widget; - int zoomed_width; - int zoomed_height; - GtkAllocation allocation; - int gdk_width; - int gdk_height; + _gth_image_viewer_get_zoomed_size_for_zoom (self, width, height, self->priv->zoom_level); +} - widget = GTK_WIDGET (self); - gtk_widget_get_allocation (widget, &allocation); - gdk_width = allocation.width - self->priv->frame_border2; - gdk_height = allocation.height - self->priv->frame_border2; +static void +_gth_image_viewer_get_visible_area_size_for_allocation (GthImageViewer *self, + int *width, + int *height, + GtkAllocation *allocation) +{ + GtkAllocation local_allocation; + + if (allocation != NULL) + local_allocation = *allocation; + else + gtk_widget_get_allocation (GTK_WIDGET (self), &local_allocation); + if (width != NULL) + *width = local_allocation.width - self->priv->frame_border2; + if (height != NULL) + *height = local_allocation.height - self->priv->frame_border2; +} + + +static void +_gth_image_viewer_get_visible_area_size (GthImageViewer *self, + int *width, + int *height) +{ + _gth_image_viewer_get_visible_area_size_for_allocation (self, width, height, NULL); +} + + +static void +_gth_image_viewer_update_image_area (GthImageViewer *self) +{ + int zoomed_width; + int zoomed_height; + int visible_width; + int visible_height; + + _gth_image_viewer_get_visible_area_size (self, &visible_width, &visible_height); _gth_image_viewer_get_zoomed_size (self, &zoomed_width, &zoomed_height); - self->image_area.x = MAX (self->priv->frame_border, (gdk_width - zoomed_width) / 2); - self->image_area.y = MAX (self->priv->frame_border, (gdk_height - zoomed_height) / 2); - self->image_area.width = MIN (zoomed_width, gdk_width); - self->image_area.height = MIN (zoomed_height, gdk_height); + self->image_area.x = MAX (self->priv->frame_border, (visible_width - zoomed_width) / 2); + self->image_area.y = MAX (self->priv->frame_border, (visible_height - zoomed_height) / 2); + self->image_area.width = MIN (zoomed_width, visible_width); + self->image_area.height = MIN (zoomed_height, visible_height); } +static void _set_surface (GthImageViewer *self, + cairo_surface_t *surface, + int original_width, + int original_height, + gboolean better_quality); + + static void set_zoom (GthImageViewer *self, gdouble zoom_level, int center_x, int center_y) { - GtkWidget *widget = (GtkWidget*) self; - GtkAllocation allocation; - gdouble zoom_ratio; - int gdk_width, gdk_height; + int visible_width; + int visible_height; + gdouble zoom_ratio; g_return_if_fail (self != NULL); - gtk_widget_get_allocation (widget, &allocation); - gdk_width = allocation.width - self->priv->frame_border2; - gdk_height = allocation.height - self->priv->frame_border2; + if (gth_image_get_is_zoomable (self->priv->image)) { + int original_width; + int original_height; + + if (gth_image_set_zoom (self->priv->image, + zoom_level, + &original_width, + &original_height)) + { + cairo_surface_t *surface; + + surface = gth_image_get_cairo_surface (self->priv->image); + if (surface != NULL) { + _set_surface (self, + surface, + original_width, + original_height, + TRUE); + cairo_surface_destroy (surface); + } + } + } /* try to keep the center of the view visible. */ - + _gth_image_viewer_get_visible_area_size (self, &visible_width, &visible_height); zoom_ratio = zoom_level / self->priv->zoom_level; - self->x_offset = ((self->x_offset + center_x) * zoom_ratio - gdk_width / 2); - self->y_offset = ((self->y_offset + center_y) * zoom_ratio - gdk_height / 2); - - /* reset zoom_fit unless we are performing a zoom to fit. */ - - if (! self->priv->doing_zoom_fit) - self->priv->fit = GTH_FIT_NONE; + self->x_offset = ((self->x_offset + center_x) * zoom_ratio - visible_width / 2); + self->y_offset = ((self->y_offset + center_y) * zoom_ratio - visible_height / 2); self->priv->zoom_level = zoom_level; _gth_image_viewer_update_image_area (self); gth_image_viewer_tool_zoom_changed (self->priv->tool); - if (! self->priv->doing_zoom_fit) { - gtk_widget_queue_resize (GTK_WIDGET (self)); - gtk_widget_queue_draw (GTK_WIDGET (self)); - } - if (! self->priv->skip_zoom_change) g_signal_emit (G_OBJECT (self), gth_image_viewer_signals[ZOOM_CHANGED], @@ -300,10 +352,31 @@ } -static int -to_255 (int v) +static void +set_zoom_centered_at (GthImageViewer *self, + double zoom_level, + gboolean zoom_to_fit, + int center_x, + int center_y) { - return v * 255 / 65535; + /* reset zoom_fit unless we are performing a zoom to fit. */ + if (! zoom_to_fit) + self->priv->fit = GTH_FIT_NONE; + set_zoom (self, zoom_level, center_x, center_y); +} + + +static void +set_zoom_centered (GthImageViewer *self, + gdouble zoom_level, + gboolean zoom_to_fit, + GtkAllocation *allocation) +{ + int visible_width; + int visible_height; + + _gth_image_viewer_get_visible_area_size_for_allocation (self, &visible_width, &visible_height, allocation); + set_zoom_centered_at (self, zoom_level, zoom_to_fit, visible_width / 2, visible_height / 2); } @@ -315,7 +388,6 @@ GdkWindowAttr attributes; int attributes_mask; GdkWindow *window; - GtkStyle *style; g_return_if_fail (GTH_IS_IMAGE_VIEWER (widget)); @@ -330,7 +402,6 @@ attributes.height = allocation.height; attributes.wclass = GDK_INPUT_OUTPUT; attributes.visual = gtk_widget_get_visual (widget); - attributes.colormap = gtk_widget_get_colormap (widget); attributes.event_mask = (gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK @@ -338,12 +409,12 @@ | GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_MOTION_MASK + | GDK_SCROLL_MASK | GDK_STRUCTURE_MASK); attributes_mask = (GDK_WA_X | GDK_WA_Y - | GDK_WA_VISUAL - | GDK_WA_COLORMAP); + | GDK_WA_VISUAL); window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, @@ -351,10 +422,7 @@ gtk_widget_set_window (widget, window); gdk_window_set_user_data (window, self); - style = gtk_widget_get_style (widget); - style = gtk_style_attach (style, window); - gtk_style_set_background (style, window, GTK_STATE_NORMAL); - gtk_widget_set_style (widget, style); + gtk_style_context_set_background (gtk_widget_get_style_context (widget), window); self->priv->cursor = gdk_cursor_new (GDK_LEFT_PTR); self->priv->cursor_void = gdk_cursor_new_for_display (gtk_widget_get_display (widget), GDK_BLANK_CURSOR); @@ -363,20 +431,6 @@ else gdk_window_set_cursor (window, self->priv->cursor_void); - if (self->priv->transp_type == GTH_TRANSP_TYPE_NONE) { - GdkColor color; - guint base_color; - - color = style->bg[GTK_STATE_NORMAL]; - base_color = (0xFF000000 - | (to_255 (color.red) << 16) - | (to_255 (color.green) << 8) - | (to_255 (color.blue) << 0)); - - self->priv->check_color1 = base_color; - self->priv->check_color2 = base_color; - } - gth_image_viewer_tool_realize (self->priv->tool); } @@ -391,22 +445,22 @@ self = GTH_IMAGE_VIEWER (widget); if (self->priv->cursor) { - gdk_cursor_unref (self->priv->cursor); + g_object_unref (self->priv->cursor); self->priv->cursor = NULL; } if (self->priv->cursor_void) { - gdk_cursor_unref (self->priv->cursor_void); + g_object_unref (self->priv->cursor_void); self->priv->cursor_void = NULL; } - if (self->priv->update_adjustment_values != 0) { - g_source_remove (self->priv->update_adjustment_values); - self->priv->update_adjustment_values = 0; + if (self->priv->checked_pattern != NULL) { + cairo_pattern_destroy (self->priv->checked_pattern); + self->priv->checked_pattern = NULL; } gth_image_viewer_tool_unrealize (self->priv->tool); - GTK_WIDGET_CLASS (parent_class)->unrealize (widget); + GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->unrealize (widget); } @@ -417,7 +471,7 @@ g_return_if_fail (GTH_IS_IMAGE_VIEWER (widget)); - GTK_WIDGET_CLASS (parent_class)->map (widget); + GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->map (widget); self = GTH_IMAGE_VIEWER (widget); gth_image_viewer_tool_map (self->priv->tool); @@ -434,201 +488,181 @@ self = GTH_IMAGE_VIEWER (widget); gth_image_viewer_tool_unmap (self->priv->tool); - GTK_WIDGET_CLASS (parent_class)->unmap (widget); + GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->unmap (widget); } static void -zoom_to_fit (GthImageViewer *self) +_gth_image_viewer_configure_hadjustment (GthImageViewer *self) { - GtkAllocation allocation; - int gdk_width; - int gdk_height; - int original_width; - int original_height; - double x_level; - double y_level; - double new_zoom_level; - - gtk_widget_get_allocation (GTK_WIDGET (self), &allocation); - gdk_width = allocation.width - self->priv->frame_border2; - gdk_height = allocation.height - self->priv->frame_border2; - - gth_image_viewer_get_original_size (self, &original_width, &original_height); + int zoomed_width; + int visible_width; - x_level = (double) gdk_width / original_width; - y_level = (double) gdk_height / original_height; + _gth_image_viewer_get_zoomed_size (self, &zoomed_width, NULL); + _gth_image_viewer_get_visible_area_size (self, &visible_width, NULL); - new_zoom_level = (x_level < y_level) ? x_level : y_level; - if (new_zoom_level > 0.0) { - self->priv->doing_zoom_fit = TRUE; - gth_image_viewer_set_zoom (self, new_zoom_level); - self->priv->doing_zoom_fit = FALSE; - } + gtk_adjustment_configure (self->hadj, + self->x_offset, + 0.0, + zoomed_width, + STEP_INCREMENT, + visible_width / 2, + visible_width); } static void -zoom_to_fit_width (GthImageViewer *self) +_gth_image_viewer_configure_vadjustment (GthImageViewer *self) { - GtkAllocation allocation; - int gdk_width; - int original_width; - double new_zoom_level; + int zoomed_height; + int visible_height; - gtk_widget_get_allocation (GTK_WIDGET (self), &allocation); - gdk_width = allocation.width - self->priv->frame_border2; + _gth_image_viewer_get_zoomed_size (self, NULL, &zoomed_height); + _gth_image_viewer_get_visible_area_size (self, NULL, &visible_height); - gth_image_viewer_get_original_size (self, &original_width, NULL); + gtk_adjustment_configure (self->vadj, + self->y_offset, + 0.0, + zoomed_height, + STEP_INCREMENT, + visible_height / 2, + visible_height); +} - new_zoom_level = (double) gdk_width / original_width; - if (new_zoom_level > 0.0) { - self->priv->doing_zoom_fit = TRUE; - gth_image_viewer_set_zoom (self, new_zoom_level); - self->priv->doing_zoom_fit = FALSE; - } +static GtkSizeRequestMode +gth_image_viewer_get_request_mode (GtkWidget *widget) +{ + return GTK_SIZE_REQUEST_CONSTANT_SIZE; } static void -gth_image_viewer_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) +gth_image_viewer_get_preferred_width (GtkWidget *widget, + int *minimum_width, + int *natural_width) { - GthImageViewer *self; - int gdk_width; - int gdk_height; - int original_width; - int original_height; - cairo_surface_t *current_image; + GthImageViewer *self = GTH_IMAGE_VIEWER (widget); + int zoomed_width; - self = GTH_IMAGE_VIEWER (widget); + _gth_image_viewer_get_zoomed_size (self, &zoomed_width, NULL); + *minimum_width = 0; + *natural_width = zoomed_width; +} - gtk_widget_set_allocation (widget, allocation); - gdk_width = allocation->width - self->priv->frame_border2; - gdk_height = allocation->height - self->priv->frame_border2; +static void +gth_image_viewer_get_preferred_height (GtkWidget *widget, + int *minimum_height, + int *natural_height) +{ + GthImageViewer *self = GTH_IMAGE_VIEWER (widget); + int zoomed_height; + + _gth_image_viewer_get_zoomed_size (self, NULL, &zoomed_height); + *minimum_height = 0; + *natural_height = zoomed_height; +} - if ((gdk_width < 0) || (gdk_height < 0)) - return; - current_image = gth_image_viewer_get_current_image (self); +static double +get_zoom_to_fit (GthImageViewer *self, + GtkAllocation *allocation) +{ + int visible_width; + int visible_height; + int original_width; + int original_height; + double x_level; + double y_level; + _gth_image_viewer_get_visible_area_size_for_allocation (self, &visible_width, &visible_height, allocation); gth_image_viewer_get_original_size (self, &original_width, &original_height); - /* If a fit type is active update the zoom level. */ + x_level = (double) visible_width / original_width; + y_level = (double) visible_height / original_height; - if (! self->priv->is_void && (current_image != NULL)) { - switch (self->priv->fit) { - case GTH_FIT_SIZE: - zoom_to_fit (self); - break; + return (x_level < y_level) ? x_level : y_level; +} - case GTH_FIT_SIZE_IF_LARGER: - if ((gdk_width < original_width) || (gdk_height < original_height)) { - zoom_to_fit (self); - } - else { - self->priv->doing_zoom_fit = TRUE; - gth_image_viewer_set_zoom (self, 1.0); - self->priv->doing_zoom_fit = FALSE; - } - break; - case GTH_FIT_WIDTH: - zoom_to_fit_width (self); - break; +static double +get_zoom_to_fit_width (GthImageViewer *self, + GtkAllocation *allocation) +{ + int visible_width; + int original_width; - case GTH_FIT_WIDTH_IF_LARGER: - if (gdk_width < original_width) { - zoom_to_fit_width (self); - } - else { - self->priv->doing_zoom_fit = TRUE; - gth_image_viewer_set_zoom (self, 1.0); - self->priv->doing_zoom_fit = FALSE; - } - break; + _gth_image_viewer_get_visible_area_size_for_allocation (self, &visible_width, NULL, allocation); + gth_image_viewer_get_original_size (self, &original_width, NULL); - default: - break; - } - } + return (double) visible_width / original_width; +} - /* Check whether the offset is still valid. */ - if (current_image != NULL) { - int width; - int height; - - _gth_image_viewer_get_zoomed_size (self, &width, &height); - - if (width > gdk_width) - self->x_offset = CLAMP (self->x_offset, - 0, - width - gdk_width); +static double +get_zoom_level_for_allocation (GthImageViewer *self, + GtkAllocation *allocation) +{ + double zoom_level; + cairo_surface_t *current_image; + int original_width; + int original_height; + int visible_width; + int visible_height; + + zoom_level = self->priv->zoom_level; + current_image = gth_image_viewer_get_current_image (self); + if (self->priv->is_void || (current_image == NULL)) + return zoom_level; + + gth_image_viewer_get_original_size (self, &original_width, &original_height); + _gth_image_viewer_get_visible_area_size_for_allocation (self, &visible_width, &visible_height, allocation); + + switch (self->priv->fit) { + case GTH_FIT_SIZE: + zoom_level = get_zoom_to_fit (self, allocation); + break; + + case GTH_FIT_SIZE_IF_LARGER: + if ((visible_width < original_width) || (visible_height < original_height)) + zoom_level = get_zoom_to_fit (self, allocation); else - self->x_offset = 0; + zoom_level = 1.0; + break; - if (height > gdk_height) - self->y_offset = CLAMP (self->y_offset, - 0, - height - gdk_height); + case GTH_FIT_WIDTH: + zoom_level = get_zoom_to_fit_width (self, allocation); + break; + + case GTH_FIT_WIDTH_IF_LARGER: + if (visible_width < original_width) + zoom_level = get_zoom_to_fit_width (self, allocation); else - self->y_offset = 0; + zoom_level = 1.0; + break; - if ((width != gtk_adjustment_get_upper (self->hadj)) || (height != gtk_adjustment_get_upper (self->vadj))) - g_signal_emit (G_OBJECT (self), - gth_image_viewer_signals[SIZE_CHANGED], - 0); - - /* Change adjustment values. */ - - gtk_adjustment_configure (self->hadj, - self->x_offset, - 0.0, - width, - STEP_INCREMENT, - gdk_width / 2, - gdk_width); - gtk_adjustment_configure (self->vadj, - self->y_offset, - 0.0, - height, - STEP_INCREMENT, - gdk_height / 2, - gdk_height); - } - else { - gtk_adjustment_configure (self->hadj, - 0.0, - 0.0, - 1.0, - 0.1, - 1.0, - 1.0); - gtk_adjustment_configure (self->vadj, - 0.0, - 0.0, - 1.0, - 0.1, - 1.0, - 1.0); + default: + break; } - _gth_image_viewer_update_image_area (self); + return zoom_level; +} - /* FIXME - g_signal_handlers_block_by_data (G_OBJECT (self->hadj), self); - g_signal_handlers_block_by_data (G_OBJECT (self->vadj), self); - gtk_adjustment_changed (self->hadj); - gtk_adjustment_changed (self->vadj); - g_signal_handlers_unblock_by_data (G_OBJECT (self->hadj), self); - g_signal_handlers_unblock_by_data (G_OBJECT (self->vadj), self); - */ - /**/ +static void +gth_image_viewer_size_allocate (GtkWidget *widget, + GtkAllocation *allocation) +{ + GthImageViewer *self = GTH_IMAGE_VIEWER (widget); + double zoom_level; + int visible_width; + int visible_height; + int zoomed_width; + int zoomed_height; + cairo_surface_t *current_image; + gtk_widget_set_allocation (widget, allocation); if (gtk_widget_get_realized (widget)) gdk_window_move_resize (gtk_widget_get_window (widget), allocation->x, @@ -636,14 +670,25 @@ allocation->width, allocation->height); - gth_image_viewer_tool_size_allocate (self->priv->tool, allocation); - if (! self->priv->skip_size_change) - g_signal_emit (G_OBJECT (self), - gth_image_viewer_signals[SIZE_CHANGED], - 0); - else - self->priv->skip_size_change = FALSE; + /* update the zoom level if the automatic fit mode is active */ + + zoom_level = get_zoom_level_for_allocation (self, allocation); + if (self->priv->fit != GTH_FIT_NONE) + set_zoom_centered (self, zoom_level, TRUE, allocation); + + /* Keep the scrollbars offset in a valid range */ + + _gth_image_viewer_get_visible_area_size_for_allocation (self, &visible_width, &visible_height, allocation); + _gth_image_viewer_get_zoomed_size (self, &zoomed_width, &zoomed_height); + current_image = gth_image_viewer_get_current_image (self); + self->x_offset = (current_image == NULL || zoomed_width <= visible_width) ? 0 : CLAMP (self->x_offset, 0, zoomed_width - visible_width); + self->y_offset = (current_image == NULL || zoomed_height <= visible_height) ? 0 : CLAMP (self->y_offset, 0, zoomed_height - visible_height); + + _gth_image_viewer_configure_hadjustment (self); + _gth_image_viewer_configure_vadjustment (self); + _gth_image_viewer_update_image_area (self); + gth_image_viewer_tool_size_allocate (self->priv->tool, allocation); } @@ -671,14 +716,14 @@ { gboolean handled; - handled = gtk_bindings_activate (GTK_OBJECT (widget), + handled = gtk_bindings_activate (G_OBJECT (widget), event->keyval, event->state); if (handled) return TRUE; - if (GTK_WIDGET_CLASS (parent_class)->key_press_event && - GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event)) + if (GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->key_press_event && + GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->key_press_event (widget, event)) return TRUE; return FALSE; @@ -707,8 +752,7 @@ _cairo_clear_surface (&self->priv->iter_surface); self->priv->skip_zoom_change = TRUE; - self->priv->skip_size_change = TRUE; - gth_image_viewer_update_view (self); + gtk_widget_queue_resize (GTK_WIDGET (self)); return FALSE; } @@ -730,32 +774,24 @@ } -static int -gth_image_viewer_expose (GtkWidget *widget, - GdkEventExpose *event) +static gboolean +gth_image_viewer_draw (GtkWidget *widget, + cairo_t *cr) { GthImageViewer *self = GTH_IMAGE_VIEWER (widget); - cairo_t *cr; - /* create the cairo context and set some default values */ + /* set the default values of the cairo context */ - cr = gdk_cairo_create (gtk_widget_get_window (widget)); cairo_set_line_width (cr, 0.5); cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); - /* clip to the exposed area */ - - gdk_cairo_region (cr, event->region); - cairo_clip (cr); - /* delegate the rest to the tool */ - gth_image_viewer_tool_expose (self->priv->tool, event, cr); - cairo_destroy (cr); + gth_image_viewer_tool_draw (self->priv->tool, cr); queue_animation_frame_change (self); - return FALSE; + return TRUE; } @@ -774,14 +810,7 @@ if (self->dragging) return FALSE; - if ((event->type == GDK_2BUTTON_PRESS) - || (event->type == GDK_3BUTTON_PRESS)) - { - self->priv->double_click = TRUE; - /*return FALSE;*/ - } - else - self->priv->double_click = FALSE; + self->priv->double_click = ((event->type == GDK_2BUTTON_PRESS) || (event->type == GDK_3BUTTON_PRESS)); retval = gth_image_viewer_tool_button_press (self->priv->tool, event); @@ -824,55 +853,54 @@ static void scroll_to (GthImageViewer *self, - int *x_offset, - int *y_offset) + int x_offset, + int y_offset) { - GdkDrawable *drawable; GtkAllocation allocation; - int width, height; + int zoomed_width, zoomed_height; int delta_x, delta_y; - int gdk_width, gdk_height; + int visible_width, visible_height; + GdkWindow *window; g_return_if_fail (self != NULL); if (gth_image_viewer_get_current_image (self) == NULL) return; - _gth_image_viewer_get_zoomed_size (self, &width, &height); - - drawable = gtk_widget_get_window (GTK_WIDGET (self)); + _gth_image_viewer_get_zoomed_size (self, &zoomed_width, &zoomed_height); gtk_widget_get_allocation (GTK_WIDGET (self), &allocation); - gdk_width = allocation.width - self->priv->frame_border2; - gdk_height = allocation.height - self->priv->frame_border2; + _gth_image_viewer_get_visible_area_size_for_allocation (self, &visible_width, &visible_height, &allocation); - if (width > gdk_width) - *x_offset = CLAMP (*x_offset, 0, width - gdk_width); + if (zoomed_width > visible_width) + x_offset = CLAMP (x_offset, 0, zoomed_width - visible_width); else - *x_offset = self->x_offset; + x_offset = self->x_offset; - if (height > gdk_height) - *y_offset = CLAMP (*y_offset, 0, height - gdk_height); + if (zoomed_height > visible_height) + y_offset = CLAMP (y_offset, 0, zoomed_height - visible_height); else - *y_offset = self->y_offset; + y_offset = self->y_offset; - if ((*x_offset == self->x_offset) && (*y_offset == self->y_offset)) + if ((x_offset == self->x_offset) && (y_offset == self->y_offset)) return; - delta_x = *x_offset - self->x_offset; - delta_y = *y_offset - self->y_offset; + delta_x = x_offset - self->x_offset; + delta_y = y_offset - self->y_offset; + + self->x_offset = x_offset; + self->y_offset = y_offset; - self->x_offset = *x_offset; - self->y_offset = *y_offset; + window = gtk_widget_get_window (GTK_WIDGET (self)); if (self->priv->painters != NULL) { - GdkRectangle area; + cairo_rectangle_int_t area; area.x = 0; area.y = 0; area.width = allocation.width; area.height = allocation.height; - gdk_window_invalidate_rect (drawable, &area, FALSE); - gdk_window_process_updates (drawable, FALSE); + gdk_window_invalidate_rect (window, &area, TRUE); + gdk_window_process_updates (window, TRUE); return; } @@ -880,45 +908,45 @@ /* move without invalidating the frame */ { - GdkRectangle area; - GdkRegion *region; + cairo_rectangle_int_t area; + cairo_region_t *region; area.x = (delta_x < 0) ? self->priv->frame_border : self->priv->frame_border + delta_x; area.y = (delta_y < 0) ? self->priv->frame_border : self->priv->frame_border + delta_y; - area.width = gdk_width - abs (delta_x); - area.height = gdk_height - abs (delta_y); - region = gdk_region_rectangle (&area); - gdk_window_move_region (drawable, region, -delta_x, -delta_y); + area.width = visible_width - abs (delta_x); + area.height = visible_height - abs (delta_y); + region = cairo_region_create_rectangle (&area); + gdk_window_move_region (window, region, -delta_x, -delta_y); - gdk_region_destroy (region); + cairo_region_destroy (region); } /* invalidate the exposed areas */ { - GdkRegion *region; - GdkRectangle area; + cairo_region_t *region; + cairo_rectangle_int_t area; - region = gdk_region_new (); + region = cairo_region_create (); area.x = self->priv->frame_border; - area.y = (delta_y < 0) ? self->priv->frame_border : self->priv->frame_border + gdk_height - delta_y; - area.width = gdk_width; + area.y = (delta_y < 0) ? self->priv->frame_border : self->priv->frame_border + visible_height - delta_y; + area.width = visible_width; area.height = abs (delta_y); - gdk_region_union_with_rect (region, &area); + cairo_region_union_rectangle (region, &area); - area.x = (delta_x < 0) ? self->priv->frame_border : self->priv->frame_border + gdk_width - delta_x; + area.x = (delta_x < 0) ? self->priv->frame_border : self->priv->frame_border + visible_width - delta_x; area.y = self->priv->frame_border; area.width = abs (delta_x); - area.height = gdk_height; - gdk_region_union_with_rect (region, &area); + area.height = visible_height; + cairo_region_union_rectangle (region, &area); - gdk_window_invalidate_region (drawable, region, FALSE); + gdk_window_invalidate_region (window, region, TRUE); - gdk_region_destroy (region); + cairo_region_destroy (region); } - gdk_window_process_updates (drawable, TRUE); + gdk_window_process_updates (window, TRUE); } @@ -951,66 +979,70 @@ GdkEventScroll *event) { GthImageViewer *self = GTH_IMAGE_VIEWER (widget); - GtkAdjustment *adj; gdouble new_value = 0.0; + gboolean retval = FALSE; g_return_val_if_fail (GTH_IS_IMAGE_VIEWER (widget), FALSE); g_return_val_if_fail (event != NULL, FALSE); + /* Control + Scroll-Up / Control + Scroll-Down ==> Zoom In / Zoom Out */ + if (event->state & GDK_CONTROL_MASK) { - if (event->direction == GDK_SCROLL_UP) { - set_zoom (self, - get_next_zoom (self->priv->zoom_level), - (int) event->x, - (int) event->y); - return TRUE; - } - if (event->direction == GDK_SCROLL_DOWN) { - set_zoom (self, - get_prev_zoom (self->priv->zoom_level), - (int) event->x, - (int) event->y); - return TRUE; + if (self->priv->zoom_enabled) { + double new_zoom_level; + + switch (event->direction) { + case GDK_SCROLL_UP: + case GDK_SCROLL_DOWN: + if (event->direction == GDK_SCROLL_UP) + new_zoom_level = get_next_zoom (self->priv->zoom_level); + else + new_zoom_level = get_prev_zoom (self->priv->zoom_level); + set_zoom_centered_at (self, new_zoom_level, FALSE, (int) event->x, (int) event->y); + gtk_widget_queue_resize (GTK_WIDGET (self)); + retval = TRUE; + break; + + default: + break; + } } + + return retval; } - if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_DOWN) - return FALSE; + /* Scroll Left / Scroll Right ==> Scroll the image horizontally */ - adj = self->hadj; - if (event->direction == GDK_SCROLL_LEFT) - new_value = gtk_adjustment_get_value (adj) - gtk_adjustment_get_page_increment (adj) / 2; - else if (event->direction == GDK_SCROLL_RIGHT) - new_value = gtk_adjustment_get_value (adj) + gtk_adjustment_get_page_increment (adj) / 2; - new_value = CLAMP (new_value, gtk_adjustment_get_lower (adj), gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj)); - gtk_adjustment_set_value (adj, new_value); + switch (event->direction) { + case GDK_SCROLL_LEFT: + case GDK_SCROLL_RIGHT: + if (event->direction == GDK_SCROLL_LEFT) + new_value = gtk_adjustment_get_value (self->hadj) - gtk_adjustment_get_page_increment (self->hadj) / 2; + else + new_value = gtk_adjustment_get_value (self->hadj) + gtk_adjustment_get_page_increment (self->hadj) / 2; + new_value = CLAMP (new_value, gtk_adjustment_get_lower (self->hadj), gtk_adjustment_get_upper (self->hadj) - gtk_adjustment_get_page_size (self->hadj)); + gtk_adjustment_set_value (self->hadj, new_value); + retval = TRUE; + break; - return TRUE; + default: + break; + } + + return retval; } static void -gth_image_viewer_style_set (GtkWidget *widget, - GtkStyle *previous_style) +gth_image_viewer_style_updated (GtkWidget *widget) { GthImageViewer *self = GTH_IMAGE_VIEWER (widget); - GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style); - - if (self->priv->transp_type == GTH_TRANSP_TYPE_NONE) { - GtkStyle *style; - GdkColor color; - guint base_color; - - style = gtk_widget_get_style (GTK_WIDGET (self)); - color = style->bg[GTK_STATE_NORMAL]; - base_color = (0xFF000000 - | (to_255 (color.red) << 16) - | (to_255 (color.green) << 8) - | (to_255 (color.blue) << 0)); + GTK_WIDGET_CLASS (gth_image_viewer_parent_class)->style_updated (widget); - self->priv->check_color1 = base_color; - self->priv->check_color2 = base_color; + if (self->priv->checked_pattern != NULL) { + cairo_pattern_destroy (self->priv->checked_pattern); + self->priv->checked_pattern = NULL; } } @@ -1078,12 +1110,7 @@ hadj_value_changed (GtkAdjustment *adj, GthImageViewer *self) { - int x_ofs, y_ofs; - - x_ofs = (int) gtk_adjustment_get_value (adj); - y_ofs = self->y_offset; - scroll_to (self, &x_ofs, &y_ofs); - + scroll_to (self, (int) gtk_adjustment_get_value (adj), self->y_offset); return FALSE; } @@ -1092,72 +1119,65 @@ vadj_value_changed (GtkAdjustment *adj, GthImageViewer *self) { - int x_ofs, y_ofs; - - x_ofs = self->x_offset; - y_ofs = (int) gtk_adjustment_get_value (adj); - scroll_to (self, &x_ofs, &y_ofs); - + scroll_to (self, self->x_offset, (int) gtk_adjustment_get_value (adj)); return FALSE; } static void -set_scroll_adjustments (GtkWidget *widget, - GtkAdjustment *hadj, - GtkAdjustment *vadj) +_gth_image_viewer_set_hadjustment (GthImageViewer *self, + GtkAdjustment *hadj) { - GthImageViewer *self; - - g_return_if_fail (widget != NULL); - g_return_if_fail (GTH_IS_IMAGE_VIEWER (widget)); - - self = GTH_IMAGE_VIEWER (widget); - if (hadj != NULL) g_return_if_fail (GTK_IS_ADJUSTMENT (hadj)); else - hadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, - 0.0, 0.0, 0.0)); - - if (vadj != NULL) - g_return_if_fail (GTK_IS_ADJUSTMENT (vadj)); - else - vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, - 0.0, 0.0, 0.0)); + hadj = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0); if ((self->hadj != NULL) && (self->hadj != hadj)) { - g_signal_handlers_disconnect_by_data (G_OBJECT (self->hadj), - self); + g_signal_handlers_disconnect_by_data (G_OBJECT (self->hadj), self); g_object_unref (self->hadj); - self->hadj = NULL; } - if ((self->vadj != NULL) && (self->vadj != vadj)) { - g_signal_handlers_disconnect_by_data (G_OBJECT (self->vadj), self); - g_object_unref (self->vadj); - self->vadj = NULL; - } - if (self->hadj != hadj) { self->hadj = hadj; g_object_ref (self->hadj); g_object_ref_sink (self->hadj); + _gth_image_viewer_configure_hadjustment (self); + g_signal_connect (G_OBJECT (self->hadj), - "value_changed", + "value-changed", G_CALLBACK (hadj_value_changed), self); } +} + + +static void +_gth_image_viewer_set_vadjustment (GthImageViewer *self, + GtkAdjustment *vadj) +{ + if (vadj != NULL) + g_return_if_fail (GTK_IS_ADJUSTMENT (vadj)); + else + vadj = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0); + + if ((self->vadj != NULL) && (self->vadj != vadj)) { + g_signal_handlers_disconnect_by_data (G_OBJECT (self->vadj), self); + g_object_unref (self->vadj); + self->vadj = NULL; + } if (self->vadj != vadj) { self->vadj = vadj; g_object_ref (self->vadj); g_object_ref_sink (self->vadj); + _gth_image_viewer_configure_vadjustment (self); + g_signal_connect (G_OBJECT (self->vadj), - "value_changed", + "value-changed", G_CALLBACK (vadj_value_changed), self); } @@ -1198,17 +1218,71 @@ static void +gth_image_viewer_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GthImageViewer *self = GTH_IMAGE_VIEWER (object); + + switch (prop_id) { + case PROP_HADJUSTMENT: + g_value_set_object (value, self->hadj); + break; + case PROP_VADJUSTMENT: + g_value_set_object (value, self->vadj); + break; + case PROP_HSCROLL_POLICY: + g_value_set_enum (value, self->priv->hscroll_policy); + break; + case PROP_VSCROLL_POLICY: + g_value_set_enum (value, self->priv->vscroll_policy); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + + +static void +gth_image_viewer_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GthImageViewer *self = GTH_IMAGE_VIEWER (object); + + switch (prop_id) { + case PROP_HADJUSTMENT: + _gth_image_viewer_set_hadjustment (self, (GtkAdjustment *) g_value_get_object (value)); + break; + case PROP_VADJUSTMENT: + _gth_image_viewer_set_vadjustment (self, (GtkAdjustment *) g_value_get_object (value)); + break; + case PROP_HSCROLL_POLICY: + self->priv->hscroll_policy = g_value_get_enum (value); + break; + case PROP_VSCROLL_POLICY: + self->priv->vscroll_policy = g_value_get_enum (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + + +static void gth_image_viewer_class_init (GthImageViewerClass *class) { GObjectClass *gobject_class; GtkWidgetClass *widget_class; GtkBindingSet *binding_set; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthImageViewerPrivate)); - widget_class = (GtkWidgetClass*) class; - gobject_class = (GObjectClass*) class; + /* signals */ gth_image_viewer_signals[CLICKED] = g_signal_new ("clicked", @@ -1266,27 +1340,6 @@ g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - gth_image_viewer_signals[SIZE_CHANGED] = - g_signal_new ("size_changed", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GthImageViewerClass, size_changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); - class->set_scroll_adjustments = set_scroll_adjustments; - widget_class->set_scroll_adjustments_signal = - g_signal_new ("set_scroll_adjustments", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GthImageViewerClass, set_scroll_adjustments), - NULL, NULL, - gth_marshal_VOID__POINTER_POINTER, - G_TYPE_NONE, - 2, - GTK_TYPE_ADJUSTMENT, - GTK_TYPE_ADJUSTMENT); gth_image_viewer_signals[SCROLL] = g_signal_new ("scroll", G_TYPE_FROM_CLASS (class), @@ -1299,24 +1352,31 @@ GTK_TYPE_SCROLL_TYPE, GTK_TYPE_SCROLL_TYPE); + /**/ + + gobject_class = (GObjectClass*) class; gobject_class->finalize = gth_image_viewer_finalize; + gobject_class->set_property = gth_image_viewer_set_property; + gobject_class->get_property = gth_image_viewer_get_property; - widget_class->realize = gth_image_viewer_realize; - widget_class->unrealize = gth_image_viewer_unrealize; - widget_class->map = gth_image_viewer_map; - widget_class->unmap = gth_image_viewer_unmap; - widget_class->size_allocate = gth_image_viewer_size_allocate; - widget_class->focus_in_event = gth_image_viewer_focus_in; + widget_class = (GtkWidgetClass*) class; + widget_class->realize = gth_image_viewer_realize; + widget_class->unrealize = gth_image_viewer_unrealize; + widget_class->map = gth_image_viewer_map; + widget_class->unmap = gth_image_viewer_unmap; + widget_class->get_request_mode = gth_image_viewer_get_request_mode; + widget_class->get_preferred_width = gth_image_viewer_get_preferred_width; + widget_class->get_preferred_height = gth_image_viewer_get_preferred_height; + widget_class->size_allocate = gth_image_viewer_size_allocate; + widget_class->focus_in_event = gth_image_viewer_focus_in; widget_class->focus_out_event = gth_image_viewer_focus_out; widget_class->key_press_event = gth_image_viewer_key_press; - - widget_class->expose_event = gth_image_viewer_expose; - widget_class->button_press_event = gth_image_viewer_button_press; + widget_class->draw = gth_image_viewer_draw; + widget_class->button_press_event = gth_image_viewer_button_press; widget_class->button_release_event = gth_image_viewer_button_release; - widget_class->motion_notify_event = gth_image_viewer_motion_notify; - + widget_class->motion_notify_event = gth_image_viewer_motion_notify; widget_class->scroll_event = gth_image_viewer_scroll_event; - widget_class->style_set = gth_image_viewer_style_set; + widget_class->style_updated = gth_image_viewer_style_updated; class->clicked = NULL; class->zoom_changed = NULL; @@ -1326,51 +1386,58 @@ class->set_zoom = gth_image_viewer_set_zoom__key_binding; class->set_fit_mode = gth_image_viewer_set_fit_mode__key_binding; + /* GtkScrollable interface */ + + g_object_class_override_property (gobject_class, PROP_HADJUSTMENT, "hadjustment"); + g_object_class_override_property (gobject_class, PROP_VADJUSTMENT, "vadjustment"); + g_object_class_override_property (gobject_class, PROP_HSCROLL_POLICY, "hscroll-policy"); + g_object_class_override_property (gobject_class, PROP_VSCROLL_POLICY, "vscroll-policy"); + /* Add key bindings */ binding_set = gtk_binding_set_by_class (class); /* For scrolling */ - gtk_binding_entry_add_signal (binding_set, GDK_Right, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, 0, "scroll", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_RIGHT, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_NONE); - gtk_binding_entry_add_signal (binding_set, GDK_Left, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, 0, "scroll", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_LEFT, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_NONE); - gtk_binding_entry_add_signal (binding_set, GDK_Down, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0, "scroll", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_NONE, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_DOWN); - gtk_binding_entry_add_signal (binding_set, GDK_Up, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0, "scroll", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_NONE, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_UP); - gtk_binding_entry_add_signal (binding_set, GDK_Right, GDK_SHIFT_MASK, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Right, GDK_SHIFT_MASK, "scroll", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_RIGHT, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_NONE); - gtk_binding_entry_add_signal (binding_set, GDK_Left, GDK_SHIFT_MASK, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Left, GDK_SHIFT_MASK, "scroll", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_LEFT, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_NONE); - gtk_binding_entry_add_signal (binding_set, GDK_Down, GDK_SHIFT_MASK, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, GDK_SHIFT_MASK, "scroll", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_NONE, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_DOWN); - gtk_binding_entry_add_signal (binding_set, GDK_Up, GDK_SHIFT_MASK, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, GDK_SHIFT_MASK, "scroll", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_NONE, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_UP); - gtk_binding_entry_add_signal (binding_set, GDK_Page_Down, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0, "scroll", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_NONE, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_DOWN); - gtk_binding_entry_add_signal (binding_set, GDK_Page_Up, 0, + gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0, "scroll", 2, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_NONE, GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_UP); @@ -1442,7 +1509,7 @@ static void -gth_image_viewer_instance_init (GthImageViewer *self) +gth_image_viewer_init (GthImageViewer *self) { gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE); gtk_widget_set_double_buffered (GTK_WIDGET (self), TRUE); @@ -1453,8 +1520,7 @@ self->priv->check_type = GTH_CHECK_TYPE_MIDTONE; self->priv->check_size = GTH_CHECK_SIZE_LARGE; - self->priv->check_color1 = COLOR_GRAY_66; - self->priv->check_color2 = COLOR_GRAY_99; + self->priv->checked_pattern = NULL; self->priv->is_animation = FALSE; self->priv->play_animation = TRUE; @@ -1477,7 +1543,6 @@ self->priv->doing_zoom_fit = FALSE; self->priv->skip_zoom_change = FALSE; - self->priv->skip_size_change = FALSE; self->priv->is_void = TRUE; self->x_offset = 0; @@ -1492,7 +1557,6 @@ self->priv->cursor_void = NULL; self->priv->reset_scrollbars = TRUE; - self->priv->update_adjustment_values = 0; gth_image_viewer_set_tool (self, NULL); @@ -1517,35 +1581,7 @@ } -GType -gth_image_viewer_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthImageViewerClass), - NULL, - NULL, - (GClassInitFunc) gth_image_viewer_class_init, - NULL, - NULL, - sizeof (GthImageViewer), - 0, - (GInstanceInitFunc) gth_image_viewer_instance_init - }; - - type = g_type_register_static (GTK_TYPE_WIDGET, - "GthImageViewer", - &type_info, - 0); - } - - return type; -} - - -GtkWidget* +GtkWidget * gth_image_viewer_new (void) { return GTK_WIDGET (g_object_new (GTH_TYPE_IMAGE_VIEWER, NULL)); @@ -1596,7 +1632,7 @@ break; case GTH_ZOOM_CHANGE_KEEP_PREV: - gth_image_viewer_update_view (self); + gtk_widget_queue_resize (GTK_WIDGET (self)); break; case GTH_ZOOM_CHANGE_FIT_SIZE: @@ -1635,6 +1671,7 @@ _cairo_clear_surface (&self->priv->iter_surface); _g_clear_object (&self->priv->animation); _g_clear_object (&self->priv->iter); + _g_clear_object (&self->priv->image); self->priv->animation = _g_object_ref (animation); self->priv->is_void = (self->priv->animation == NULL); @@ -1729,29 +1766,40 @@ int original_width, int original_height) { + _g_clear_object (&self->priv->image); _set_surface (self, surface, original_width, original_height, FALSE); } void -gth_image_viewer_set_image (GthImageViewer *viewer, +gth_image_viewer_set_image (GthImageViewer *self, GthImage *image, int original_width, int original_height) { + if (self->priv->image != image) + _g_clear_object (&self->priv->image); + if (gth_image_is_animation (image)) { GdkPixbufAnimation *animation; animation = gth_image_get_pixbuf_animation (image); - gth_image_viewer_set_animation (viewer, animation, original_width, original_height); + gth_image_viewer_set_animation (self, animation, original_width, original_height); g_object_unref (animation); } else { cairo_surface_t *surface; + if (gth_image_get_is_zoomable (image)) { + self->priv->image = g_object_ref (image); + gth_image_set_zoom (self->priv->image, + self->priv->zoom_level, + &original_width, + &original_height); + } surface = gth_image_get_cairo_surface (image); - gth_image_viewer_set_surface (viewer, surface, original_width, original_height); + _set_surface (self, surface, original_width, original_height, FALSE); cairo_surface_destroy (surface); } @@ -1767,6 +1815,7 @@ _cairo_clear_surface (&self->priv->iter_surface); _g_clear_object (&self->priv->animation); _g_clear_object (&self->priv->iter); + _g_clear_object (&self->priv->image); self->priv->is_void = TRUE; self->priv->is_animation = FALSE; @@ -1783,18 +1832,6 @@ void -gth_image_viewer_update_view (GthImageViewer *self) -{ - g_return_if_fail (self != NULL); - - if (self->priv->fit == GTH_FIT_NONE) - gth_image_viewer_set_zoom (self, self->priv->zoom_level); - else - gth_image_viewer_set_fit_mode (self, self->priv->fit); -} - - -void gth_image_viewer_add_painter (GthImageViewer *self, GthImageViewerPaintFunc func, gpointer user_data) @@ -1946,7 +1983,7 @@ g_return_if_fail (self != NULL); self->priv->play_animation = TRUE; - gth_image_viewer_update_view (self); + gtk_widget_queue_resize (GTK_WIDGET (self)); } @@ -1996,16 +2033,11 @@ gth_image_viewer_set_zoom (GthImageViewer *self, gdouble zoom_level) { - GtkAllocation allocation; - - if (! self->priv->zoom_enabled && ! self->priv->doing_zoom_fit) + if (! self->priv->zoom_enabled) return; - gtk_widget_get_allocation (GTK_WIDGET (self), &allocation); - set_zoom (self, - zoom_level, - (allocation.width - self->priv->frame_border2) / 2, - (allocation.height - self->priv->frame_border2) / 2); + set_zoom_centered (self, zoom_level, FALSE, NULL); + gtk_widget_queue_resize (GTK_WIDGET (self)); } @@ -2066,18 +2098,16 @@ void gth_image_viewer_zoom_in (GthImageViewer *self) { - if (gth_image_viewer_get_current_image (self) == NULL) - return; - gth_image_viewer_set_zoom (self, get_next_zoom (self->priv->zoom_level)); + if (! self->priv->is_void) + gth_image_viewer_set_zoom (self, get_next_zoom (self->priv->zoom_level)); } void gth_image_viewer_zoom_out (GthImageViewer *self) { - if (gth_image_viewer_get_current_image (self) == NULL) - return; - gth_image_viewer_set_zoom (self, get_prev_zoom (self->priv->zoom_level)); + if (! self->priv->is_void) + gth_image_viewer_set_zoom (self, get_prev_zoom (self->priv->zoom_level)); } @@ -2089,9 +2119,8 @@ return; self->priv->fit = fit_mode; - if (self->priv->is_void) - return; - gtk_widget_queue_resize (GTK_WIDGET (self)); + if (! self->priv->is_void) + gtk_widget_queue_resize (GTK_WIDGET (self)); } @@ -2106,6 +2135,8 @@ gth_image_viewer_set_zoom_enabled (GthImageViewer *self, gboolean value) { + g_return_if_fail (GTH_IS_IMAGE_VIEWER (self)); + self->priv->zoom_enabled = value; } @@ -2121,6 +2152,8 @@ gth_image_viewer_enable_zoom_with_keys (GthImageViewer *self, gboolean value) { + g_return_if_fail (GTH_IS_IMAGE_VIEWER (self)); + self->priv->enable_zoom_with_keys = value; } @@ -2129,55 +2162,13 @@ gth_image_viewer_set_transp_type (GthImageViewer *self, GthTranspType transp_type) { - GtkStyle *style; - GdkColor color; - guint base_color; - - g_return_if_fail (self != NULL); + g_return_if_fail (GTH_IS_IMAGE_VIEWER (self)); self->priv->transp_type = transp_type; - style = gtk_widget_get_style (GTK_WIDGET (self)); - color = style->bg[GTK_STATE_NORMAL]; - base_color = (0xFF000000 - | (to_255 (color.red) << 16) - | (to_255 (color.green) << 8) - | (to_255 (color.blue) << 0)); - - switch (transp_type) { - case GTH_TRANSP_TYPE_BLACK: - self->priv->check_color1 = COLOR_GRAY_00; - self->priv->check_color2 = COLOR_GRAY_00; - break; - - case GTH_TRANSP_TYPE_NONE: - self->priv->check_color1 = base_color; - self->priv->check_color2 = base_color; - break; - - case GTH_TRANSP_TYPE_WHITE: - self->priv->check_color1 = COLOR_GRAY_FF; - self->priv->check_color2 = COLOR_GRAY_FF; - break; - - case GTH_TRANSP_TYPE_CHECKED: - switch (self->priv->check_type) { - case GTH_CHECK_TYPE_DARK: - self->priv->check_color1 = COLOR_GRAY_00; - self->priv->check_color2 = COLOR_GRAY_33; - break; - - case GTH_CHECK_TYPE_MIDTONE: - self->priv->check_color1 = COLOR_GRAY_66; - self->priv->check_color2 = COLOR_GRAY_99; - break; - - case GTH_CHECK_TYPE_LIGHT: - self->priv->check_color1 = COLOR_GRAY_CC; - self->priv->check_color2 = COLOR_GRAY_FF; - break; - } - break; + if (self->priv->checked_pattern != NULL) { + cairo_pattern_destroy (self->priv->checked_pattern); + self->priv->checked_pattern = NULL; } } @@ -2193,7 +2184,13 @@ gth_image_viewer_set_check_type (GthImageViewer *self, GthCheckType check_type) { + g_return_if_fail (GTH_IS_IMAGE_VIEWER (self)); + self->priv->check_type = check_type; + if (self->priv->checked_pattern != NULL) { + cairo_pattern_destroy (self->priv->checked_pattern); + self->priv->checked_pattern = NULL; + } } @@ -2209,6 +2206,11 @@ GthCheckSize check_size) { self->priv->check_size = check_size; + + if (self->priv->checked_pattern != NULL) { + cairo_pattern_destroy (self->priv->checked_pattern); + self->priv->checked_pattern = NULL; + } } @@ -2227,21 +2229,6 @@ void -gth_image_viewer_set_size_request (GthImageViewer *self, - int width, - int height) -{ - GtkRequisition requisition; - - requisition.width = width; - requisition.height = height; - gtk_widget_size_request (GTK_WIDGET (self), &requisition); - - gtk_widget_queue_resize (GTK_WIDGET (self)); -} - - -void gth_image_viewer_set_black_background (GthImageViewer *self, gboolean set_black) { @@ -2262,18 +2249,6 @@ void -gth_image_viewer_get_adjustments (GthImageViewer *self, - GtkAdjustment **hadj, - GtkAdjustment **vadj) -{ - if (hadj != NULL) - *hadj = self->hadj; - if (vadj != NULL) - *vadj = self->vadj; -} - - -void gth_image_viewer_set_tool (GthImageViewer *self, GthImageViewerTool *tool) { @@ -2290,26 +2265,6 @@ gth_image_viewer_tool_realize (self->priv->tool); gth_image_viewer_tool_image_changed (self->priv->tool); gtk_widget_queue_resize (GTK_WIDGET (self)); - gtk_widget_queue_draw (GTK_WIDGET (self)); -} - - -static gboolean -update_adjustment_values_cb (gpointer user_data) -{ - GthImageViewer *self = user_data; - - g_source_remove (self->priv->update_adjustment_values); - self->priv->update_adjustment_values = 0; - - g_signal_handlers_block_by_data (G_OBJECT (self->hadj), self); - g_signal_handlers_block_by_data (G_OBJECT (self->vadj), self); - gtk_adjustment_set_value (self->hadj, self->x_offset); - gtk_adjustment_set_value (self->vadj, self->y_offset); - g_signal_handlers_unblock_by_data (G_OBJECT (self->hadj), self); - g_signal_handlers_unblock_by_data (G_OBJECT (self->vadj), self); - - return FALSE; } @@ -2323,11 +2278,16 @@ if (gth_image_viewer_get_current_image (self) == NULL) return; - scroll_to (self, &x_offset, &y_offset); + scroll_to (self, x_offset, y_offset); - if (self->priv->update_adjustment_values != 0) - g_source_remove (self->priv->update_adjustment_values); - self->priv->update_adjustment_values = g_timeout_add (10, update_adjustment_values_cb, self); + /* update the adjustments value */ + + g_signal_handlers_block_by_data (G_OBJECT (self->hadj), self); + g_signal_handlers_block_by_data (G_OBJECT (self->vadj), self); + gtk_adjustment_set_value (self->hadj, self->x_offset); + gtk_adjustment_set_value (self->vadj, self->y_offset); + g_signal_handlers_unblock_by_data (G_OBJECT (self->hadj), self); + g_signal_handlers_unblock_by_data (G_OBJECT (self->vadj), self); } @@ -2397,6 +2357,68 @@ void +gth_image_viewer_needs_scrollbars (GthImageViewer *self, + GtkAllocation *allocation, + GtkWidget *hscrollbar, + GtkWidget *vscrollbar, + gboolean *hscrollbar_visible_p, + gboolean *vscrollbar_visible_p) +{ + double zoom_level; + int zoomed_width; + int zoomed_height; + int visible_width; + int visible_height; + gboolean hscrollbar_visible; + gboolean vscrollbar_visible; + + zoom_level = get_zoom_level_for_allocation (self, allocation); + _gth_image_viewer_get_zoomed_size_for_zoom (self, &zoomed_width, &zoomed_height, zoom_level); + _gth_image_viewer_get_visible_area_size_for_allocation (self, &visible_width, &visible_height, allocation); + + hscrollbar_visible = (zoomed_width > visible_width); + vscrollbar_visible = (zoomed_height > visible_height); + + switch (self->priv->fit) { + case GTH_FIT_SIZE: + case GTH_FIT_SIZE_IF_LARGER: + hscrollbar_visible = FALSE; + vscrollbar_visible = FALSE; + break; + + case GTH_FIT_WIDTH: + case GTH_FIT_WIDTH_IF_LARGER: + hscrollbar_visible = FALSE; + break; + + case GTH_FIT_NONE: + if (hscrollbar_visible != vscrollbar_visible) { + if (vscrollbar_visible) { + GtkRequisition vscrollbar_requisition; + + gtk_widget_get_preferred_size (vscrollbar, &vscrollbar_requisition, NULL); + visible_width -= vscrollbar_requisition.width; + hscrollbar_visible = (zoomed_width > visible_width); + } + else if (hscrollbar_visible) { + GtkRequisition hscrollbar_requisition; + + gtk_widget_get_preferred_size (hscrollbar, &hscrollbar_requisition, NULL); + visible_height -= hscrollbar_requisition.height; + vscrollbar_visible = (zoomed_height > visible_height); + } + } + break; + } + + if (hscrollbar_visible_p != NULL) + *hscrollbar_visible_p = hscrollbar_visible; + if (vscrollbar_visible_p != NULL) + *vscrollbar_visible_p = vscrollbar_visible; +} + + +void gth_image_viewer_show_cursor (GthImageViewer *self) { if (self->priv->cursor_visible) @@ -2425,16 +2447,16 @@ GdkCursor *cursor) { if (cursor != NULL) - gdk_cursor_ref (cursor); + g_object_ref (cursor); if (self->priv->cursor != NULL) { - gdk_cursor_unref (self->priv->cursor); + g_object_unref (self->priv->cursor); self->priv->cursor = NULL; } if (cursor != NULL) self->priv->cursor = cursor; else - self->priv->cursor = gdk_cursor_ref (self->priv->cursor_void); + self->priv->cursor = g_object_ref (self->priv->cursor_void); if (! gtk_widget_get_realized (GTK_WIDGET (self))) return; @@ -2525,44 +2547,32 @@ void -gth_image_viewer_paint_region (GthImageViewer *self, - cairo_t *cr, - cairo_surface_t *surface, - int src_x, - int src_y, - GdkRectangle *pixbuf_area, - GdkRegion *region, - cairo_filter_t filter) -{ - GdkRectangle *rects; - int n_rects; - int i; - +gth_image_viewer_paint_region (GthImageViewer *self, + cairo_t *cr, + cairo_surface_t *surface, + int src_x, + int src_y, + cairo_rectangle_int_t *pixbuf_area, + cairo_region_t *region, + cairo_filter_t filter) +{ cairo_save (cr); gdk_cairo_rectangle (cr, pixbuf_area); cairo_clip (cr); - gdk_region_get_rectangles (region, &rects, &n_rects); - for (i = 0; i < n_rects; i++) { - GdkRectangle paint_area; - - if (gdk_rectangle_intersect (pixbuf_area, &rects[i], &paint_area)) - gth_image_viewer_paint (self, - cr, - surface, - src_x + paint_area.x, - src_y + paint_area.y, - paint_area.x, - paint_area.y, - paint_area.width, - paint_area.height, - filter); - } + gth_image_viewer_paint (self, + cr, + surface, + src_x + pixbuf_area->x, + src_y + pixbuf_area->y, + pixbuf_area->x, + pixbuf_area->y, + pixbuf_area->width, + pixbuf_area->height, + filter); cairo_restore (cr); - - g_free (rects); } @@ -2570,28 +2580,33 @@ gth_image_viewer_paint_background (GthImageViewer *self, cairo_t *cr) { - GtkAllocation allocation; - int gdk_width; - int gdk_height; - GtkStyle *style; + GtkAllocation allocation; + int visible_width; + int visible_height; + GtkStyleContext *style_context; gtk_widget_get_allocation (GTK_WIDGET (self), &allocation); - gdk_width = allocation.width - self->priv->frame_border2; - gdk_height = allocation.height - self->priv->frame_border2; - - style = gtk_widget_get_style (GTK_WIDGET (self)); + _gth_image_viewer_get_visible_area_size_for_allocation (self, &visible_width, &visible_height, &allocation); + style_context = gtk_widget_get_style_context (GTK_WIDGET (self)); if ((self->image_area.x > self->priv->frame_border) || (self->image_area.y > self->priv->frame_border) - || (self->image_area.width < gdk_width) - || (self->image_area.height < gdk_height)) + || (self->image_area.width < visible_width) + || (self->image_area.height < visible_height)) { int rx, ry, rw, rh; - if (self->priv->black_bg) + if (self->priv->black_bg) { cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); - else - gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]); + } + else { + GdkRGBA color; + + gtk_style_context_get_background_color (style_context, + gtk_widget_get_state (GTK_WIDGET (self)), + &color); + gdk_cairo_set_source_rgba (cr, &color); + } if (gth_image_viewer_get_current_image (self) == NULL) { cairo_rectangle (cr, @@ -2649,13 +2664,22 @@ if ((self->priv->frame_border > 0) && (gth_image_viewer_get_current_image (self) != NULL)) { + GdkRGBA background_color; + GdkRGBA darker_color; + GdkRGBA lighter_color; + + gtk_style_context_get_background_color (style_context, + gtk_widget_get_state (GTK_WIDGET (self)), + &background_color); + _gdk_rgba_darker (&background_color, &darker_color); + _gdk_rgba_lighter (&background_color, &lighter_color); /* bottom and right side */ if (self->priv->black_bg) cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); else - gdk_cairo_set_source_color (cr, &style->light[GTK_STATE_NORMAL]); + gdk_cairo_set_source_rgba (cr, &lighter_color); cairo_move_to (cr, self->image_area.x + self->image_area.width + 0.5, @@ -2671,7 +2695,7 @@ /* top and left side */ if (! self->priv->black_bg) - gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]); + gdk_cairo_set_source_rgba (cr, &darker_color); cairo_move_to (cr, self->image_area.x - 1 + 0.5, @@ -2689,8 +2713,9 @@ /* Draw the background for the transparency */ - switch (self->priv->transp_type) { - case GTH_TRANSP_TYPE_BLACK: + if ((self->priv->transp_type == GTH_TRANSP_TYPE_BLACK) + || ((self->priv->transp_type == GTH_TRANSP_TYPE_NONE) && self->priv->black_bg)) + { cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); cairo_rectangle (cr, self->image_area.x + 0.5, @@ -2698,9 +2723,8 @@ self->image_area.width, self->image_area.height); cairo_fill (cr); - break; - - case GTH_TRANSP_TYPE_WHITE: + } + else if (self->priv->transp_type == GTH_TRANSP_TYPE_WHITE) { cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); cairo_rectangle (cr, self->image_area.x + 0.5, @@ -2708,10 +2732,59 @@ self->image_area.width, self->image_area.height); cairo_fill (cr); - break; + } + else if (self->priv->transp_type == GTH_TRANSP_TYPE_CHECKED) { + if (self->priv->checked_pattern == NULL) { + cairo_surface_t *surface; + cairo_t *cr_surface; + double color1; + double color2; + + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, self->priv->check_size * 2, self->priv->check_size * 2); + cr_surface = cairo_create (surface); + + switch (self->priv->check_type) { + case GTH_CHECK_TYPE_DARK: + color1 = 0.0; + color2 = 0.2; + break; + + case GTH_CHECK_TYPE_MIDTONE: + color1 = 0.4; + color2 = 0.6; + break; + + case GTH_CHECK_TYPE_LIGHT: + color1 = 0.8; + color2 = 1.0; + break; + } + + cairo_set_source_rgb (cr_surface, color1, color1, color1); + cairo_rectangle (cr_surface, 0, 0, self->priv->check_size, self->priv->check_size); + cairo_rectangle (cr_surface, self->priv->check_size, self->priv->check_size, self->priv->check_size, self->priv->check_size); + cairo_fill (cr_surface); + + cairo_set_source_rgb (cr_surface, color2, color2, color2); + cairo_rectangle (cr_surface, self->priv->check_size, 0, self->priv->check_size, self->priv->check_size); + cairo_rectangle (cr_surface, 0, self->priv->check_size, self->priv->check_size, self->priv->check_size); + cairo_fill (cr_surface); - default: - break; + cairo_surface_flush (surface); + + self->priv->checked_pattern = cairo_pattern_create_for_surface (surface); + cairo_pattern_set_extend (self->priv->checked_pattern, CAIRO_EXTEND_REPEAT); + + cairo_destroy (cr_surface); + } + + cairo_set_source (cr, self->priv->checked_pattern); + cairo_rectangle (cr, + self->image_area.x + 0.5, + self->image_area.y + 0.5, + self->image_area.width, + self->image_area.height); + cairo_fill (cr); } } } @@ -2719,7 +2792,6 @@ void gth_image_viewer_apply_painters (GthImageViewer *self, - GdkEventExpose *event, cairo_t *cr) { GList *scan; @@ -2728,20 +2800,20 @@ PainterData *painter_data = scan->data; cairo_save (cr); - painter_data->func (self, event, cr, painter_data->user_data); + painter_data->func (self, cr, painter_data->user_data); cairo_restore (cr); } } void -gth_image_viewer_crop_area (GthImageViewer *self, - GdkRectangle *area) +gth_image_viewer_crop_area (GthImageViewer *self, + cairo_rectangle_int_t *area) { - GtkWidget *widget = GTK_WIDGET (self); - GtkAllocation allocation; + int visible_width; + int visible_height; - gtk_widget_get_allocation (widget, &allocation); - area->width = MIN (area->width, allocation.width - self->priv->frame_border2); - area->width = MIN (area->height, allocation.height - self->priv->frame_border2); + _gth_image_viewer_get_visible_area_size (self, &visible_width, &visible_height); + area->width = MIN (area->width, visible_width); + area->width = MIN (area->height, visible_height); } diff -Nru gthumb-2.14.3/gthumb/gth-image-viewer.h gthumb-3.0.0/gthumb/gth-image-viewer.h --- gthumb-2.14.3/gthumb/gth-image-viewer.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-viewer.h 2012-02-19 15:01:32.000000000 +0000 @@ -47,7 +47,6 @@ #define GTH_IMAGE_VIEWER_FRAME_BORDER2 (GTH_IMAGE_VIEWER_FRAME_BORDER * 2) typedef void (*GthImageViewerPaintFunc) (GthImageViewer *image_viewer, - GdkEventExpose *event, cairo_t *cr, gpointer user_data); @@ -105,23 +104,23 @@ /*< protected, used by the tools >*/ - GdkRectangle image_area; - int x_offset; /* Scroll offsets. */ - int y_offset; - gboolean pressed; - int event_x_start; - int event_y_start; - int event_x_prev; - int event_y_prev; - gboolean dragging; - int drag_x_start; - int drag_y_start; - int drag_x_prev; - int drag_y_prev; - int drag_x; - int drag_y; - GtkAdjustment *vadj; - GtkAdjustment *hadj; + cairo_rectangle_int_t image_area; + int x_offset; /* Scroll offsets. */ + int y_offset; + gboolean pressed; + int event_x_start; + int event_y_start; + int event_x_prev; + int event_y_prev; + gboolean dragging; + int drag_x_start; + int drag_y_start; + int drag_x_prev; + int drag_y_prev; + int drag_x; + int drag_y; + GtkAdjustment *vadj; + GtkAdjustment *hadj; }; @@ -133,10 +132,6 @@ void (* clicked) (GthImageViewer *viewer); void (* zoom_changed) (GthImageViewer *viewer); - void (* size_changed) (GthImageViewer *viewer); - void (* set_scroll_adjustments) (GtkWidget *widget, - GtkAdjustment *hadj, - GtkAdjustment *vadj); /* -- Key binding signals -- */ @@ -157,169 +152,167 @@ /* viewer content. */ -void gth_image_viewer_set_animation (GthImageViewer *viewer, - GdkPixbufAnimation *animation, - int original_width, - int original_height); -void gth_image_viewer_set_pixbuf (GthImageViewer *viewer, - GdkPixbuf *pixbuf, - int original_width, - int original_height); -void gth_image_viewer_set_surface (GthImageViewer *viewer, - cairo_surface_t *surface, - int original_width, - int original_height); -void gth_image_viewer_set_image (GthImageViewer *viewer, - GthImage *image, - int original_width, - int original_height); -void gth_image_viewer_set_better_quality (GthImageViewer *viewer, - GthImage *image, - int original_width, - int original_height); -void gth_image_viewer_set_void (GthImageViewer *viewer); -gboolean gth_image_viewer_is_void (GthImageViewer *viewer); -void gth_image_viewer_update_view (GthImageViewer *viewer); -void gth_image_viewer_add_painter (GthImageViewer *viewer, +void gth_image_viewer_set_animation (GthImageViewer *viewer, + GdkPixbufAnimation *animation, + int original_width, + int original_height); +void gth_image_viewer_set_pixbuf (GthImageViewer *viewer, + GdkPixbuf *pixbuf, + int original_width, + int original_height); +void gth_image_viewer_set_surface (GthImageViewer *viewer, + cairo_surface_t *surface, + int original_width, + int original_height); +void gth_image_viewer_set_image (GthImageViewer *viewer, + GthImage *image, + int original_width, + int original_height); +void gth_image_viewer_set_better_quality (GthImageViewer *viewer, + GthImage *image, + int original_width, + int original_height); +void gth_image_viewer_set_void (GthImageViewer *viewer); +gboolean gth_image_viewer_is_void (GthImageViewer *viewer); +void gth_image_viewer_add_painter (GthImageViewer *viewer, GthImageViewerPaintFunc - func, - gpointer user_data); -void gth_image_viewer_remove_painter (GthImageViewer *viewer, + func, + gpointer user_data); +void gth_image_viewer_remove_painter (GthImageViewer *viewer, GthImageViewerPaintFunc - func, - gpointer user_data); + func, + gpointer user_data); /* image info. */ -int gth_image_viewer_get_image_width (GthImageViewer *viewer); -int gth_image_viewer_get_image_height (GthImageViewer *viewer); -gboolean gth_image_viewer_get_has_alpha (GthImageViewer *viewer); -GdkPixbuf * gth_image_viewer_get_current_pixbuf (GthImageViewer *viewer); +int gth_image_viewer_get_image_width (GthImageViewer *viewer); +int gth_image_viewer_get_image_height (GthImageViewer *viewer); +gboolean gth_image_viewer_get_has_alpha (GthImageViewer *viewer); +GdkPixbuf * gth_image_viewer_get_current_pixbuf (GthImageViewer *viewer); cairo_surface_t * - gth_image_viewer_get_current_image (GthImageViewer *viewer); -void gth_image_viewer_get_original_size (GthImageViewer *viewer, - int *width, - int *height); + gth_image_viewer_get_current_image (GthImageViewer *viewer); +void gth_image_viewer_get_original_size (GthImageViewer *viewer, + int *width, + int *height); /* animation. */ -void gth_image_viewer_start_animation (GthImageViewer *viewer); -void gth_image_viewer_stop_animation (GthImageViewer *viewer); -void gth_image_viewer_step_animation (GthImageViewer *viewer); -gboolean gth_image_viewer_is_animation (GthImageViewer *viewer); -gboolean gth_image_viewer_is_playing_animation (GthImageViewer *viewer); +void gth_image_viewer_start_animation (GthImageViewer *viewer); +void gth_image_viewer_stop_animation (GthImageViewer *viewer); +void gth_image_viewer_step_animation (GthImageViewer *viewer); +gboolean gth_image_viewer_is_animation (GthImageViewer *viewer); +gboolean gth_image_viewer_is_playing_animation (GthImageViewer *viewer); /* zoom. */ -void gth_image_viewer_set_zoom (GthImageViewer *viewer, - gdouble zoom); -gdouble gth_image_viewer_get_zoom (GthImageViewer *viewer); -void gth_image_viewer_set_zoom_quality (GthImageViewer *viewer, - GthZoomQuality quality); -GthZoomQuality gth_image_viewer_get_zoom_quality (GthImageViewer *viewer); -cairo_filter_t gth_image_viewer_get_zoom_quality_filter (GthImageViewer *viewer); -void gth_image_viewer_set_zoom_change (GthImageViewer *viewer, - GthZoomChange zoom_change); -GthZoomChange gth_image_viewer_get_zoom_change (GthImageViewer *viewer); -void gth_image_viewer_zoom_in (GthImageViewer *viewer); -void gth_image_viewer_zoom_out (GthImageViewer *viewer); -void gth_image_viewer_set_fit_mode (GthImageViewer *viewer, - GthFit fit_mode); -GthFit gth_image_viewer_get_fit_mode (GthImageViewer *viewer); -void gth_image_viewer_set_zoom_enabled (GthImageViewer *viewer, - gboolean value); -gboolean gth_image_viewer_get_zoom_enabled (GthImageViewer *viewer); -void gth_image_viewer_enable_zoom_with_keys (GthImageViewer *viewer, - gboolean value); +void gth_image_viewer_set_zoom (GthImageViewer *viewer, + gdouble zoom); +gdouble gth_image_viewer_get_zoom (GthImageViewer *viewer); +void gth_image_viewer_set_zoom_quality (GthImageViewer *viewer, + GthZoomQuality quality); +GthZoomQuality gth_image_viewer_get_zoom_quality (GthImageViewer *viewer); +cairo_filter_t gth_image_viewer_get_zoom_quality_filter (GthImageViewer *viewer); +void gth_image_viewer_set_zoom_change (GthImageViewer *viewer, + GthZoomChange zoom_change); +GthZoomChange gth_image_viewer_get_zoom_change (GthImageViewer *viewer); +void gth_image_viewer_zoom_in (GthImageViewer *viewer); +void gth_image_viewer_zoom_out (GthImageViewer *viewer); +void gth_image_viewer_set_fit_mode (GthImageViewer *viewer, + GthFit fit_mode); +GthFit gth_image_viewer_get_fit_mode (GthImageViewer *viewer); +void gth_image_viewer_set_zoom_enabled (GthImageViewer *viewer, + gboolean value); +gboolean gth_image_viewer_get_zoom_enabled (GthImageViewer *viewer); +void gth_image_viewer_enable_zoom_with_keys (GthImageViewer *viewer, + gboolean value); /* visualization options. */ -void gth_image_viewer_set_transp_type (GthImageViewer *viewer, - GthTranspType transp_type); -GthTranspType gth_image_viewer_get_transp_type (GthImageViewer *viewer); -void gth_image_viewer_set_check_type (GthImageViewer *viewer, - GthCheckType check_type); -GthCheckType gth_image_viewer_get_check_type (GthImageViewer *viewer); -void gth_image_viewer_set_check_size (GthImageViewer *view, - GthCheckSize check_size); -GthCheckSize gth_image_viewer_get_check_size (GthImageViewer *viewer); +void gth_image_viewer_set_transp_type (GthImageViewer *viewer, + GthTranspType transp_type); +GthTranspType gth_image_viewer_get_transp_type (GthImageViewer *viewer); +void gth_image_viewer_set_check_type (GthImageViewer *viewer, + GthCheckType check_type); +GthCheckType gth_image_viewer_get_check_type (GthImageViewer *viewer); +void gth_image_viewer_set_check_size (GthImageViewer *view, + GthCheckSize check_size); +GthCheckSize gth_image_viewer_get_check_size (GthImageViewer *viewer); /* misc. */ -void gth_image_viewer_clicked (GthImageViewer *viewer); -void gth_image_viewer_set_size_request (GthImageViewer *viewer, - int width, - int height); -void gth_image_viewer_set_black_background (GthImageViewer *viewer, - gboolean set_black); -gboolean gth_image_viewer_is_black_background (GthImageViewer *viewer); -void gth_image_viewer_get_adjustments (GthImageViewer *self, - GtkAdjustment **hadj, - GtkAdjustment **vadj); -void gth_image_viewer_set_tool (GthImageViewer *viewer, - GthImageViewerTool *tool); +void gth_image_viewer_clicked (GthImageViewer *viewer); +void gth_image_viewer_set_black_background (GthImageViewer *viewer, + gboolean set_black); +gboolean gth_image_viewer_is_black_background (GthImageViewer *viewer); +void gth_image_viewer_set_tool (GthImageViewer *viewer, + GthImageViewerTool *tool); /* Scrolling. */ -void gth_image_viewer_scroll_to (GthImageViewer *viewer, - int x_offset, - int y_offset); -void gth_image_viewer_scroll_step_x (GthImageViewer *viewer, - gboolean increment); -void gth_image_viewer_scroll_step_y (GthImageViewer *viewer, - gboolean increment); -void gth_image_viewer_scroll_page_x (GthImageViewer *viewer, - gboolean increment); -void gth_image_viewer_scroll_page_y (GthImageViewer *viewer, - gboolean increment); -void gth_image_viewer_get_scroll_offset (GthImageViewer *viewer, - int *x, - int *y); -void gth_image_viewer_set_reset_scrollbars (GthImageViewer *viewer, - gboolean reset); -gboolean gth_image_viewer_get_reset_scrollbars (GthImageViewer *viewer); +void gth_image_viewer_scroll_to (GthImageViewer *viewer, + int x_offset, + int y_offset); +void gth_image_viewer_scroll_step_x (GthImageViewer *viewer, + gboolean increment); +void gth_image_viewer_scroll_step_y (GthImageViewer *viewer, + gboolean increment); +void gth_image_viewer_scroll_page_x (GthImageViewer *viewer, + gboolean increment); +void gth_image_viewer_scroll_page_y (GthImageViewer *viewer, + gboolean increment); +void gth_image_viewer_get_scroll_offset (GthImageViewer *viewer, + int *x, + int *y); +void gth_image_viewer_set_reset_scrollbars (GthImageViewer *viewer, + gboolean reset); +gboolean gth_image_viewer_get_reset_scrollbars (GthImageViewer *viewer); +void gth_image_viewer_needs_scrollbars (GthImageViewer *self, + GtkAllocation *allocation, + GtkWidget *hscrollbar, + GtkWidget *vscrollbar, + gboolean *hscrollbar_visible, + gboolean *vscrollbar_visible); /* Cursor. */ -void gth_image_viewer_show_cursor (GthImageViewer *viewer); -void gth_image_viewer_hide_cursor (GthImageViewer *viewer); -void gth_image_viewer_set_cursor (GthImageViewer *viewer, - GdkCursor *cursor); -gboolean gth_image_viewer_is_cursor_visible (GthImageViewer *viewer); +void gth_image_viewer_show_cursor (GthImageViewer *viewer); +void gth_image_viewer_hide_cursor (GthImageViewer *viewer); +void gth_image_viewer_set_cursor (GthImageViewer *viewer, + GdkCursor *cursor); +gboolean gth_image_viewer_is_cursor_visible (GthImageViewer *viewer); /* Frame. */ -void gth_image_viewer_show_frame (GthImageViewer *viewer); -void gth_image_viewer_hide_frame (GthImageViewer *viewer); -gboolean gth_image_viewer_is_frame_visible (GthImageViewer *viewer); +void gth_image_viewer_show_frame (GthImageViewer *viewer); +void gth_image_viewer_hide_frame (GthImageViewer *viewer); +gboolean gth_image_viewer_is_frame_visible (GthImageViewer *viewer); /*< protected, used by the tools >*/ -void gth_image_viewer_paint (GthImageViewer *viewer, - cairo_t *cr, - cairo_surface_t *surface, - int src_x, - int src_y, - int dest_x, - int dest_y, - int width, - int height, - cairo_filter_t filter); -void gth_image_viewer_paint_region (GthImageViewer *viewer, - cairo_t *cr, - cairo_surface_t *surface, - int src_x, - int src_y, - GdkRectangle *pixbuf_area, - GdkRegion *region, - cairo_filter_t filter); -void gth_image_viewer_paint_background (GthImageViewer *self, - cairo_t *cr); -void gth_image_viewer_apply_painters (GthImageViewer *image_viewer, - GdkEventExpose *event, - cairo_t *cr); -void gth_image_viewer_crop_area (GthImageViewer *viewer, - GdkRectangle *area); +void gth_image_viewer_paint (GthImageViewer *viewer, + cairo_t *cr, + cairo_surface_t *surface, + int src_x, + int src_y, + int dest_x, + int dest_y, + int width, + int height, + cairo_filter_t filter); +void gth_image_viewer_paint_region (GthImageViewer *viewer, + cairo_t *cr, + cairo_surface_t *surface, + int src_x, + int src_y, + cairo_rectangle_int_t *pixbuf_area, + cairo_region_t *region, + cairo_filter_t filter); +void gth_image_viewer_paint_background (GthImageViewer *self, + cairo_t *cr); +void gth_image_viewer_apply_painters (GthImageViewer *image_viewer, + cairo_t *cr); +void gth_image_viewer_crop_area (GthImageViewer *viewer, + cairo_rectangle_int_t *area); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/gth-image-viewer-tool.c gthumb-3.0.0/gthumb/gth-image-viewer-tool.c --- gthumb-2.14.3/gthumb/gth-image-viewer-tool.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-viewer-tool.c 2012-02-19 15:01:32.000000000 +0000 @@ -23,29 +23,13 @@ #include "gth-image-viewer.h" -GType -gth_image_viewer_tool_get_type (void) +G_DEFINE_INTERFACE (GthImageViewerTool, gth_image_viewer_tool, 0) + + +static void +gth_image_viewer_tool_default_init (GthImageViewerToolInterface *iface) { - static GType type_id = 0; - if (type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthImageViewerToolIface), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) NULL, - (GClassFinalizeFunc) NULL, - NULL, - 0, - 0, - (GInstanceInitFunc) NULL, - NULL - }; - type_id = g_type_register_static (G_TYPE_INTERFACE, - "GthImageViewerTool", - &g_define_type_info, - 0); - } - return type_id; + /* void */ } @@ -102,11 +86,10 @@ void -gth_image_viewer_tool_expose (GthImageViewerTool *self, - GdkEventExpose *event, - cairo_t *cr) +gth_image_viewer_tool_draw (GthImageViewerTool *self, + cairo_t *cr) { - GTH_IMAGE_VIEWER_TOOL_GET_INTERFACE (self)->expose (self, event, cr); + GTH_IMAGE_VIEWER_TOOL_GET_INTERFACE (self)->draw (self, cr); } diff -Nru gthumb-2.14.3/gthumb/gth-image-viewer-tool.h gthumb-3.0.0/gthumb/gth-image-viewer-tool.h --- gthumb-2.14.3/gthumb/gth-image-viewer-tool.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-image-viewer-tool.h 2012-02-19 15:01:32.000000000 +0000 @@ -29,12 +29,12 @@ #define GTH_TYPE_IMAGE_VIEWER_TOOL (gth_image_viewer_tool_get_type ()) #define GTH_IMAGE_VIEWER_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_IMAGE_VIEWER_TOOL, GthImageViewerTool)) #define GTH_IS_IMAGE_VIEWER_TOOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_IMAGE_VIEWER_TOOL)) -#define GTH_IMAGE_VIEWER_TOOL_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_IMAGE_VIEWER_TOOL, GthImageViewerToolIface)) +#define GTH_IMAGE_VIEWER_TOOL_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_IMAGE_VIEWER_TOOL, GthImageViewerToolInterface)) typedef struct _GthImageViewerTool GthImageViewerTool; -typedef struct _GthImageViewerToolIface GthImageViewerToolIface; +typedef struct _GthImageViewerToolInterface GthImageViewerToolInterface; -struct _GthImageViewerToolIface { +struct _GthImageViewerToolInterface { GTypeInterface parent_iface; void (*set_viewer) (GthImageViewerTool *self, @@ -47,8 +47,7 @@ void (*unrealize) (GthImageViewerTool *self); void (*size_allocate) (GthImageViewerTool *self, GtkAllocation *allocation); - void (*expose) (GthImageViewerTool *self, - GdkEventExpose *event, + void (*draw) (GthImageViewerTool *self, cairo_t *cr); gboolean (*button_press) (GthImageViewerTool *self, GdkEventButton *event); @@ -71,8 +70,7 @@ void gth_image_viewer_tool_unrealize (GthImageViewerTool *self); void gth_image_viewer_tool_size_allocate (GthImageViewerTool *self, GtkAllocation *allocation); -void gth_image_viewer_tool_expose (GthImageViewerTool *self, - GdkEventExpose *event, +void gth_image_viewer_tool_draw (GthImageViewerTool *self, cairo_t *cr); gboolean gth_image_viewer_tool_button_press (GthImageViewerTool *self, GdkEventButton *event); diff -Nru gthumb-2.14.3/gthumb/gth-info-bar.c gthumb-3.0.0/gthumb/gth-info-bar.c --- gthumb-2.14.3/gthumb/gth-info-bar.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-info-bar.c 2012-02-19 15:01:32.000000000 +0000 @@ -24,9 +24,6 @@ #include "gth-info-bar.h" -static gpointer parent_class = NULL; - - struct _GthInfoBarPrivate { GtkWidget *icon_image; GtkWidget *primary_text_label; @@ -34,10 +31,12 @@ }; +G_DEFINE_TYPE (GthInfoBar, gth_info_bar, GTK_TYPE_INFO_BAR) + + static void gth_info_bar_class_init (GthInfoBarClass *klass) { - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthInfoBarPrivate)); } @@ -49,34 +48,6 @@ } -GType -gth_info_bar_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthInfoBarClass), - NULL, - NULL, - (GClassInitFunc) gth_info_bar_class_init, - NULL, - NULL, - sizeof (GthInfoBar), - 0, - (GInstanceInitFunc) gth_info_bar_init - }; - - type = g_type_register_static (GTK_TYPE_INFO_BAR, - "GthEmbeddedEditorDialog", - &type_info, - 0); - } - - return type; -} - - static void gth_info_bar_construct (GthInfoBar *self) { @@ -87,14 +58,14 @@ GtkWidget *secondary_label; GtkWidget *area; - hbox_content = gtk_hbox_new (FALSE, 8); + hbox_content = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); gtk_widget_show (hbox_content); self->priv->icon_image = image = gtk_image_new (); gtk_box_pack_start (GTK_BOX (hbox_content), image, FALSE, FALSE, 0); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.5); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (hbox_content), vbox, TRUE, TRUE, 0); diff -Nru gthumb-2.14.3/gthumb/gth-list-view.c gthumb-3.0.0/gthumb/gth-list-view.c --- gthumb-2.14.3/gthumb/gth-list-view.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-list-view.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,650 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2011 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include "gth-list-view.h" - - -#define IMAGE_TEXT_SPACING 0 -#define DEFAULT_ICON_SPACING 12 -#define SIZE_REQUEST 50 - - -struct _GthListViewPrivate { - GtkTreeViewColumn *column; -}; - - -static gpointer parent_class = NULL; -static GthFileViewIface *gth_list_view_gth_file_view_parent_iface = NULL; -static GthFileSelectionIface *gth_list_view_gth_file_selection_parent_iface = NULL; - - -void -gth_list_view_real_set_model (GthFileView *self, - GtkTreeModel *model) -{ - gtk_tree_view_set_model (GTK_TREE_VIEW (self), model); -} - - -GtkTreeModel * -gth_list_view_real_get_model (GthFileView *self) -{ - return gtk_tree_view_get_model (GTK_TREE_VIEW (self)); -} - - -static void -gth_list_view_real_scroll_to (GthFileView *base, - int pos, - double yalign) -{ - GtkTreePath *path; - - path = gtk_tree_path_new_from_indices (pos, -1); - gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (base), - path, - NULL, - TRUE, - yalign, - 0.0); - - gtk_tree_path_free (path); -} - - -static GthVisibility -gth_list_view_real_get_visibility (GthFileView *base, - int pos) -{ - GtkTreePath *start_path, *end_path; - int start_pos, end_pos; - - if (! gtk_tree_view_get_visible_range (GTK_TREE_VIEW (base), &start_path, &end_path)) - return -1; - - start_pos = gtk_tree_path_get_indices (start_path)[0]; - end_pos = gtk_tree_path_get_indices (end_path)[0]; - - gtk_tree_path_free (start_path); - gtk_tree_path_free (end_path); - - return ((pos >= start_pos) && (pos <= end_pos)) ? GTH_VISIBILITY_FULL : GTH_VISIBILITY_NONE; -} - - -static int -gth_list_view_real_get_at_position (GthFileView *base, - int x, - int y) -{ - GtkTreePath *path; - int pos; - - if (! gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (base), - x, - y, - &path, - NULL, - NULL, - NULL)) - { - return -1; - } - pos = gtk_tree_path_get_indices (path)[0]; - - gtk_tree_path_free (path); - - return pos; -} - - -static int -gth_list_view_real_get_first_visible (GthFileView *base) -{ - GthListView *self = GTH_LIST_VIEW (base); - GtkTreePath *start_path; - int pos; - - if (! gtk_tree_view_get_visible_range (GTK_TREE_VIEW (self), &start_path, NULL)) - return -1; - - pos = gtk_tree_path_get_indices (start_path)[0]; - gtk_tree_path_free (start_path); - - return pos; -} - - -static int -gth_list_view_real_get_last_visible (GthFileView *base) -{ - GthListView *self = GTH_LIST_VIEW (base); - GtkTreePath *end_path; - int pos; - - if (! gtk_tree_view_get_visible_range (GTK_TREE_VIEW (self), NULL, &end_path)) - return -1; - - pos = gtk_tree_path_get_indices (end_path)[0]; - gtk_tree_path_free (end_path); - - return pos; -} - - -static void -gth_list_view_real_activated (GthFileView *base, - int pos) -{ - GthListView *self = GTH_LIST_VIEW (base); - GtkTreePath *path; - - g_return_if_fail (pos >= 0); - - path = gtk_tree_path_new_from_indices (pos, -1); - gtk_tree_view_row_activated (GTK_TREE_VIEW (self), path, NULL); - - gtk_tree_path_free (path); -} - - -static void -gth_list_view_real_set_cursor (GthFileView *base, - int pos) -{ - GtkTreePath *path; - - g_return_if_fail (pos >= 0); - - path = gtk_tree_path_new_from_indices (pos, -1); - gtk_tree_view_set_cursor (GTK_TREE_VIEW (base), path, NULL, FALSE); - - gtk_tree_path_free (path); -} - - -static int -gth_list_view_real_get_cursor (GthFileView *base) -{ - GtkTreePath *path; - int pos; - - gtk_tree_view_get_cursor (GTK_TREE_VIEW (base), &path, NULL); - if (path == NULL) - return -1; - pos = gtk_tree_path_get_indices (path)[0]; - - gtk_tree_path_free (path); - - return pos; -} - - -void -gth_list_view_real_set_spacing (GthFileView *self, - int spacing) -{ - /* FIXME - gtk_tree_view_set_margin (GTK_TREE_VIEW (self), spacing); - gtk_tree_view_set_column_spacing (GTK_TREE_VIEW (self), spacing); - gtk_tree_view_set_row_spacing (GTK_TREE_VIEW (self), spacing); - */ -} - - -static void -gth_list_view_enable_drag_source (GthFileView *base, - GdkModifierType start_button_mask, - const GtkTargetEntry *targets, - int n_targets, - GdkDragAction actions) -{ - GthListView *self = GTH_LIST_VIEW (base); - - gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (self), - start_button_mask, - targets, - n_targets, - actions); -} - - -static void -gth_list_view_unset_drag_source (GthFileView *base) -{ - GthListView *self = GTH_LIST_VIEW (base); - - gtk_tree_view_unset_rows_drag_source (GTK_TREE_VIEW (self)); -} - - -static void -gth_list_view_enable_drag_dest (GthFileView *self, - const GtkTargetEntry *targets, - int n_targets, - GdkDragAction actions) -{ - gtk_tree_view_enable_model_drag_dest (GTK_TREE_VIEW (self), - targets, - n_targets, - actions); -} - - -static void -gth_list_view_unset_drag_dest (GthFileView *self) -{ - gtk_tree_view_unset_rows_drag_dest (GTK_TREE_VIEW (self)); -} - - -static void -gth_list_view_set_drag_dest_pos (GthFileView *self, - GdkDragContext *context, - int x, - int y, - guint time, - int *pos) -{ - GtkTreePath *path = NULL; - GtkTreeViewDropPosition drop_pos; - - if ((x >= 0) - && (y >= 0) - && gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (self), - x, - y, - &path, - &drop_pos)) - { - if (pos != NULL) { - int *indices; - - indices = gtk_tree_path_get_indices (path); - *pos = indices[0]; - if (drop_pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER) - drop_pos = GTK_TREE_VIEW_DROP_AFTER; - if (drop_pos == GTK_TREE_VIEW_DROP_AFTER) - *pos = *pos + 1; - } - gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (self), path, drop_pos); - } - else { - if (pos != NULL) - *pos = -1; - gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (self), NULL, 0); - } - - if (path != NULL) - gtk_tree_path_free (path); -} - - -static GtkCellLayout * -gth_list_view_add_renderer (GthFileView *base, - GthFileViewRendererType renderer_type, - GtkCellRenderer *renderer) -{ - GthListView *self = GTH_LIST_VIEW (base); - - switch (renderer_type) { - case GTH_FILE_VIEW_RENDERER_CHECKBOX: - gtk_tree_view_column_pack_start (self->priv->column, renderer, FALSE); - break; - case GTH_FILE_VIEW_RENDERER_THUMBNAIL: - gtk_tree_view_column_pack_start (self->priv->column, renderer, FALSE); - break; - case GTH_FILE_VIEW_RENDERER_TEXT: - gtk_tree_view_column_pack_start (self->priv->column, renderer, TRUE); - break; - } - - return GTK_CELL_LAYOUT (self->priv->column); -} - - -static void -gth_list_view_update_attributes (GthFileView *base, - GtkCellRenderer *checkbox_renderer, - GtkCellRenderer *thumbnail_renderer, - GtkCellRenderer *text_renderer, - int thumb_size) -{ - GthListView *self = GTH_LIST_VIEW (base); - - g_object_set (thumbnail_renderer, - "size", thumb_size, - "yalign", 0.5, - NULL); - g_object_set (text_renderer, - "ellipsize", PANGO_ELLIPSIZE_END, - "yalign", 0.0, - "alignment", PANGO_ALIGN_LEFT, - NULL); - - gtk_tree_view_column_queue_resize (self->priv->column); -} - - -static gboolean -gth_list_view_truncate_metadata (GthFileView *base) -{ - return FALSE; -} - - -static void -gth_list_view_real_set_selection_mode (GthFileSelection *base, - GtkSelectionMode mode) -{ - gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (base)), mode); -} - - -static GList * -gth_list_view_real_get_selected (GthFileSelection *base) -{ - return gtk_tree_selection_get_selected_rows (gtk_tree_view_get_selection (GTK_TREE_VIEW (base)), NULL); -} - - -static void -gth_list_view_real_select (GthFileSelection *base, - int pos) -{ - GtkTreePath *path; - - path = gtk_tree_path_new_from_indices (pos, -1); - gtk_tree_selection_select_path (gtk_tree_view_get_selection (GTK_TREE_VIEW (base)), path); - - gtk_tree_path_free (path); -} - - -static void -gth_list_view_real_unselect (GthFileSelection *base, - int pos) -{ - GtkTreePath *path; - - path = gtk_tree_path_new_from_indices (pos, -1); - gtk_tree_selection_unselect_path (gtk_tree_view_get_selection (GTK_TREE_VIEW (base)), path); - - gtk_tree_path_free (path); -} - - -static void -gth_list_view_real_select_all (GthFileSelection *base) -{ - gtk_tree_selection_select_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (base))); -} - - -static void -gth_list_view_real_unselect_all (GthFileSelection *base) -{ - gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (base))); -} - - -static gboolean -gth_list_view_real_is_selected (GthFileSelection *base, - int pos) -{ - GtkTreePath *path; - gboolean result; - - path = gtk_tree_path_new (); - gtk_tree_path_append_index (path, pos); - result = gtk_tree_selection_path_is_selected (gtk_tree_view_get_selection (GTK_TREE_VIEW (base)), path); - - gtk_tree_path_free (path); - - return result; -} - - -static GtkTreePath * -gth_list_view_real_get_first_selected (GthFileSelection *base) -{ - GList *list; - GtkTreePath *path; - - list = gtk_tree_selection_get_selected_rows (gtk_tree_view_get_selection (GTK_TREE_VIEW (base)), NULL); - if (list != NULL) { - list = g_list_sort (list, (GCompareFunc) gtk_tree_path_compare); - path = gtk_tree_path_copy ((GtkTreePath *) g_list_first (list)->data); - } - else - path = NULL; - - g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL); - g_list_free (list); - - return path; -} - - -static GtkTreePath * -gth_list_view_real_get_last_selected (GthFileSelection *base) -{ - GList *list; - GtkTreePath *path; - - list = gtk_tree_selection_get_selected_rows (gtk_tree_view_get_selection (GTK_TREE_VIEW (base)), NULL); - if (list != NULL) { - list = g_list_sort (list, (GCompareFunc) gtk_tree_path_compare); - path = gtk_tree_path_copy ((GtkTreePath *) g_list_last (list)->data); - } - else - path = NULL; - - g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL); - g_list_free (list); - - return path; -} - - -static guint -gth_list_view_real_get_n_selected (GthFileSelection *base) -{ - GList *selected; - guint n_selected; - - selected = gtk_tree_selection_get_selected_rows (gtk_tree_view_get_selection (GTK_TREE_VIEW (base)), NULL); - n_selected = (guint) g_list_length (selected); - - g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL); - g_list_free (selected); - - return n_selected; -} - - -GtkWidget * -gth_list_view_new (void) -{ - return g_object_new (GTH_TYPE_LIST_VIEW, NULL); -} - - -GtkWidget * -gth_list_view_new_with_model (GtkTreeModel *model) -{ - return g_object_new (GTH_TYPE_LIST_VIEW, "model", model, NULL); -} - - -static void -gth_list_view_finalize (GObject *object) -{ - /*GthListView *self = GTH_LIST_VIEW (object);*/ - - /* FIXME */ - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - - -static void -gth_list_view_class_init (GthListViewClass *klass) -{ - GObjectClass *object_class; - - parent_class = g_type_class_peek_parent (klass); - g_type_class_add_private (klass, sizeof (GthListViewPrivate)); - - object_class = (GObjectClass*) klass; - object_class->finalize = gth_list_view_finalize; -} - - -static void -list_view_selection_changed_cb (GtkTreeSelection *treeselection, - gpointer user_data) -{ - gth_file_selection_changed (GTH_FILE_SELECTION (user_data)); -} - - -static void -list_view_row_activated_cb (GtkTreeView *tree_view, - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data) -{ - gth_file_view_activate_file (GTH_FILE_VIEW (tree_view), path); -} - - -static void -gth_list_view_init (GthListView *list_view) -{ - list_view->priv = G_TYPE_INSTANCE_GET_PRIVATE (list_view, GTH_TYPE_LIST_VIEW, GthListViewPrivate); - - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (list_view), FALSE); - - list_view->priv->column = gtk_tree_view_column_new (); - gtk_tree_view_column_set_expand (list_view->priv->column, TRUE); - gtk_tree_view_append_column (GTK_TREE_VIEW (list_view), list_view->priv->column); - - gtk_widget_set_size_request (GTK_WIDGET (list_view), - SIZE_REQUEST, - SIZE_REQUEST); - gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (list_view)), - GTK_SELECTION_MULTIPLE); - g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (list_view)), - "changed", - G_CALLBACK (list_view_selection_changed_cb), - list_view); - g_signal_connect (GTK_TREE_VIEW (list_view), - "row-activated", - G_CALLBACK (list_view_row_activated_cb), - list_view); -} - - -static void -gth_list_view_gth_file_view_interface_init (GthFileViewIface *iface) -{ - gth_list_view_gth_file_view_parent_iface = g_type_interface_peek_parent (iface); - iface->set_model = gth_list_view_real_set_model; - iface->get_model = gth_list_view_real_get_model; - iface->scroll_to = gth_list_view_real_scroll_to; - iface->get_visibility = gth_list_view_real_get_visibility; - iface->get_at_position = gth_list_view_real_get_at_position; - iface->get_first_visible = gth_list_view_real_get_first_visible; - iface->get_last_visible = gth_list_view_real_get_last_visible; - iface->activated = gth_list_view_real_activated; - iface->set_cursor = gth_list_view_real_set_cursor; - iface->get_cursor = gth_list_view_real_get_cursor; - iface->set_spacing = gth_list_view_real_set_spacing; - iface->enable_drag_source = gth_list_view_enable_drag_source; - iface->unset_drag_source = gth_list_view_unset_drag_source; - iface->enable_drag_dest = gth_list_view_enable_drag_dest; - iface->unset_drag_dest = gth_list_view_unset_drag_dest; - iface->set_drag_dest_pos = gth_list_view_set_drag_dest_pos; - iface->add_renderer = gth_list_view_add_renderer; - iface->update_attributes = gth_list_view_update_attributes; - iface->truncate_metadata = gth_list_view_truncate_metadata; -} - - -static void -gth_list_view_gth_file_selection_interface_init (GthFileSelectionIface *iface) -{ - gth_list_view_gth_file_selection_parent_iface = g_type_interface_peek_parent (iface); - iface->set_selection_mode = gth_list_view_real_set_selection_mode; - iface->get_selected = gth_list_view_real_get_selected; - iface->select = gth_list_view_real_select; - iface->unselect = gth_list_view_real_unselect; - iface->select_all = gth_list_view_real_select_all; - iface->unselect_all = gth_list_view_real_unselect_all; - iface->is_selected = gth_list_view_real_is_selected; - iface->get_first_selected = gth_list_view_real_get_first_selected; - iface->get_last_selected = gth_list_view_real_get_last_selected; - iface->get_n_selected = gth_list_view_real_get_n_selected; -} - - -GType -gth_list_view_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthListViewClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_list_view_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthListView), - 0, - (GInstanceInitFunc) gth_list_view_init, - NULL - }; - static const GInterfaceInfo gth_file_view_info = { - (GInterfaceInitFunc) gth_list_view_gth_file_view_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo gth_file_selection_info = { - (GInterfaceInitFunc) gth_list_view_gth_file_selection_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - type = g_type_register_static (GTK_TYPE_TREE_VIEW, - "GthListView", - &g_define_type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_FILE_VIEW, >h_file_view_info); - g_type_add_interface_static (type, GTH_TYPE_FILE_SELECTION, >h_file_selection_info); - } - - return type; -} diff -Nru gthumb-2.14.3/gthumb/gth-list-view.h gthumb-3.0.0/gthumb/gth-list-view.h --- gthumb-2.14.3/gthumb/gth-list-view.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-list-view.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ - -/* - * GThumb - * - * Copyright (C) 2011 Free Software Foundation, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef GTH_LIST_VIEW_H -#define GTH_LIST_VIEW_H - -#include -#include -#include -#include "gth-file-view.h" -#include "gth-file-selection.h" - -G_BEGIN_DECLS - -#define GTH_TYPE_LIST_VIEW (gth_list_view_get_type ()) -#define GTH_LIST_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_LIST_VIEW, GthListView)) -#define GTH_LIST_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_LIST_VIEW, GthListViewClass)) -#define GTH_IS_LIST_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_LIST_VIEW)) -#define GTH_IS_LIST_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTH_TYPE_LIST_VIEW)) -#define GTH_LIST_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTH_TYPE_LIST_VIEW, GthListViewClass)) - -typedef struct _GthListView GthListView; -typedef struct _GthListViewClass GthListViewClass; -typedef struct _GthListViewPrivate GthListViewPrivate; - -struct _GthListView { - GtkTreeView parent_instance; - GthListViewPrivate *priv; -}; - -struct _GthListViewClass { - GtkTreeViewClass parent_class; -}; - -GType gth_list_view_get_type (void); -GtkWidget * gth_list_view_new (void); -GtkWidget * gth_list_view_new_with_model (GtkTreeModel *model); - -G_END_DECLS - -#endif /* GTH_LIST_VIEW_H */ diff -Nru gthumb-2.14.3/gthumb/gth-load-file-data-task.c gthumb-3.0.0/gthumb/gth-load-file-data-task.c --- gthumb-2.14.3/gthumb/gth-load-file-data-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-load-file-data-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -36,7 +36,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthLoadFileDataTask, gth_load_file_data_task, GTH_TYPE_TASK) static void @@ -50,7 +50,7 @@ _g_object_list_unref (self->priv->file_data_list); g_free (self->priv->attributes); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_load_file_data_task_parent_class)->finalize (object); } @@ -142,7 +142,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthLoadFileDataTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -161,34 +160,6 @@ } -GType -gth_load_file_data_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthLoadFileDataTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_load_file_data_task_class_init, - NULL, - NULL, - sizeof (GthLoadFileDataTask), - 0, - (GInstanceInitFunc) gth_load_file_data_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthLoadFileDataTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_load_file_data_task_new (GList *file_list, const char *attributes) diff -Nru gthumb-2.14.3/gthumb/gth-location-chooser.c gthumb-3.0.0/gthumb/gth-location-chooser.c --- gthumb-2.14.3/gthumb/gth-location-chooser.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-location-chooser.c 2012-03-31 09:42:32.000000000 +0000 @@ -37,6 +37,9 @@ #define MIN_WIDTH 200 +G_DEFINE_TYPE (GthLocationChooser, gth_location_chooser, GTK_TYPE_BOX) + + enum { ITEM_TYPE_NONE, ITEM_TYPE_SEPARATOR, @@ -53,6 +56,13 @@ N_COLUMNS }; + +enum { + PROP_0, + PROP_SHOW_ENTRY_POINTS, + PROP_RELIEF +}; + enum { CHANGED, LAST_SIGNAL @@ -60,130 +70,105 @@ struct _GthLocationChooserPrivate { - GtkWidget *combo; - GtkTreeStore *model; - GFile *location; - GthIconCache *icon_cache; - GthFileSource *file_source; - gulong entry_points_changed_id; + GtkWidget *combo; + GtkWidget *arrow; + GtkTreeStore *model; + GFile *location; + GthIconCache *icon_cache; + GthFileSource *file_source; + gulong entry_points_changed_id; + guint update_entry_list_id; + guint update_location_list_id; + gboolean show_entry_points; + GtkReliefStyle relief; }; -static GtkHBoxClass *parent_class = NULL; static guint gth_location_chooser_signals[LAST_SIGNAL] = { 0 }; -static void -gth_location_chooser_finalize (GObject *object) -{ - GthLocationChooser *chooser; - - chooser = GTH_LOCATION_CHOOSER (object); - - if (chooser->priv != NULL) { - g_signal_handler_disconnect (gth_main_get_default_monitor (), - chooser->priv->entry_points_changed_id); - if (chooser->priv->file_source != NULL) - g_object_unref (chooser->priv->file_source); - gth_icon_cache_free (chooser->priv->icon_cache); - if (chooser->priv->location != NULL) - g_object_unref (chooser->priv->location); - g_free (chooser->priv); - } - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - -static void -gth_location_chooser_grab_focus (GtkWidget *widget) -{ - GthLocationChooser *chooser = GTH_LOCATION_CHOOSER (widget); - - gtk_widget_grab_focus (chooser->priv->combo); -} - static void -gth_location_chooser_class_init (GthLocationChooserClass *class) -{ - GObjectClass *object_class; - GtkWidgetClass *widget_class; - - parent_class = g_type_class_peek_parent (class); - - object_class = (GObjectClass*) class; - object_class->finalize = gth_location_chooser_finalize; - - widget_class = (GtkWidgetClass *) class; - widget_class->grab_focus = gth_location_chooser_grab_focus; - - gth_location_chooser_signals[CHANGED] = - g_signal_new ("changed", - G_TYPE_FROM_CLASS (class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GthLocationChooserClass, changed), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, - 0); +gth_location_chooser_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + GthLocationChooser *self; + + self = GTH_LOCATION_CHOOSER (object); + + switch (property_id) { + case PROP_SHOW_ENTRY_POINTS: + gth_location_chooser_set_show_entry_points (self, g_value_get_boolean (value)); + break; + case PROP_RELIEF: + gth_location_chooser_set_relief (self, g_value_get_enum (value)); + break; + default: + break; + } } static void -gth_location_chooser_init (GthLocationChooser *chooser) -{ - gtk_widget_set_can_focus (GTK_WIDGET (chooser), TRUE); - chooser->priv = g_new0 (GthLocationChooserPrivate, 1); +gth_location_chooser_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + GthLocationChooser *self; + + self = GTH_LOCATION_CHOOSER (object); + + switch (property_id) { + case PROP_SHOW_ENTRY_POINTS: + g_value_set_boolean (value, self->priv->show_entry_points); + break; + case PROP_RELIEF: + g_value_set_enum (value, self->priv->relief); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } } static void -combo_changed_cb (GtkComboBox *widget, - gpointer user_data) +gth_location_chooser_finalize (GObject *object) { - GthLocationChooser *chooser = user_data; - GtkTreeIter iter; - char *uri = NULL; - int item_type = ITEM_TYPE_NONE; - - if (! gtk_combo_box_get_active_iter (GTK_COMBO_BOX (chooser->priv->combo), &iter)) - return; - - gtk_tree_model_get (GTK_TREE_MODEL (chooser->priv->model), - &iter, - TYPE_COLUMN, &item_type, - URI_COLUMN, &uri, - -1); + GthLocationChooser *self; - if (uri != NULL) { - GFile *file; + self = GTH_LOCATION_CHOOSER (object); - file = g_file_new_for_uri (uri); - gth_location_chooser_set_current (chooser, file); + if (self->priv->update_location_list_id != 0) + g_source_remove (self->priv->update_location_list_id); + if (self->priv->update_entry_list_id != 0) + g_source_remove (self->priv->update_entry_list_id); + if (self->priv->entry_points_changed_id != 0) + g_signal_handler_disconnect (gth_main_get_default_monitor (), + self->priv->entry_points_changed_id); + if (self->priv->file_source != NULL) + g_object_unref (self->priv->file_source); + if (self->priv->location != NULL) + g_object_unref (self->priv->location); - g_object_unref (file); - } + G_OBJECT_CLASS (gth_location_chooser_parent_class)->finalize (object); } -static gboolean -row_separator_func (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) +static void +gth_location_chooser_grab_focus (GtkWidget *widget) { - int item_type = ITEM_TYPE_NONE; + GthLocationChooser *self = GTH_LOCATION_CHOOSER (widget); - gtk_tree_model_get (model, - iter, - TYPE_COLUMN, &item_type, - -1); - - return (item_type == ITEM_TYPE_SEPARATOR); + gtk_widget_grab_focus (self->priv->combo); } static gboolean -get_nth_separator_pos (GthLocationChooser *chooser, +get_nth_separator_pos (GthLocationChooser *self, int pos, int *idx) { @@ -193,13 +178,13 @@ if (idx != NULL) *idx = 0; - if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser->priv->model), &iter)) + if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->priv->model), &iter)) return FALSE; do { int item_type = ITEM_TYPE_NONE; - gtk_tree_model_get (GTK_TREE_MODEL (chooser->priv->model), + gtk_tree_model_get (GTK_TREE_MODEL (self->priv->model), &iter, TYPE_COLUMN, &item_type, -1); @@ -212,14 +197,43 @@ if (idx != NULL) *idx = *idx + 1; } - while (gtk_tree_model_iter_next (GTK_TREE_MODEL (chooser->priv->model), &iter)); + while (gtk_tree_model_iter_next (GTK_TREE_MODEL (self->priv->model), &iter)); return n_found == pos; } static void -add_file_source_entries (GthLocationChooser *chooser, +combo_changed_cb (GtkComboBox *widget, + gpointer user_data) +{ + GthLocationChooser *self = user_data; + GtkTreeIter iter; + char *uri = NULL; + int item_type = ITEM_TYPE_NONE; + + if (! gtk_combo_box_get_active_iter (GTK_COMBO_BOX (self->priv->combo), &iter)) + return; + + gtk_tree_model_get (GTK_TREE_MODEL (self->priv->model), + &iter, + TYPE_COLUMN, &item_type, + URI_COLUMN, &uri, + -1); + + if (uri != NULL) { + GFile *file; + + file = g_file_new_for_uri (uri); + gth_location_chooser_set_current (self, file); + + g_object_unref (file); + } +} + + +static void +add_file_source_entries (GthLocationChooser *self, GFile *file, const char *name, GIcon *icon, @@ -231,11 +245,11 @@ GdkPixbuf *pixbuf; char *uri; - pixbuf = gth_icon_cache_get_pixbuf (chooser->priv->icon_cache, icon); + pixbuf = gth_icon_cache_get_pixbuf (self->priv->icon_cache, icon); uri = g_file_get_uri (file); - gtk_tree_store_insert (chooser->priv->model, &iter, NULL, position); - gtk_tree_store_set (chooser->priv->model, &iter, + gtk_tree_store_insert (self->priv->model, &iter, NULL, position); + gtk_tree_store_set (self->priv->model, &iter, TYPE_COLUMN, iter_type, ICON_COLUMN, pixbuf, NAME_COLUMN, name, @@ -246,24 +260,21 @@ g_free (uri); g_object_unref (pixbuf); - if (update_active_iter && g_file_equal (chooser->priv->location, file)) { - g_signal_handlers_block_by_func (chooser->priv->combo, combo_changed_cb, chooser); - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (chooser->priv->combo), &iter); - g_signal_handlers_unblock_by_func (chooser->priv->combo, combo_changed_cb, chooser); + if (update_active_iter && g_file_equal (self->priv->location, file)) { + g_signal_handlers_block_by_func (self->priv->combo, combo_changed_cb, self); + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self->priv->combo), &iter); + g_signal_handlers_unblock_by_func (self->priv->combo, combo_changed_cb, self); } } static void -update_entry_point_list (GthLocationChooser *chooser) +clear_entry_point_list (GthLocationChooser *self) { - int first_position; - int i; - int position; - GList *entry_points; - GList *scan; + int first_position; + int i; - if (! get_nth_separator_pos (chooser, 1, &first_position)) + if (! get_nth_separator_pos (self, 1, &first_position)) return; for (i = first_position + 1; TRUE; i++) { @@ -271,20 +282,51 @@ GtkTreeIter iter; path = gtk_tree_path_new_from_indices (first_position + 1, -1); - if (gtk_tree_model_get_iter (GTK_TREE_MODEL (chooser->priv->model), &iter, path)) - gtk_tree_store_remove (chooser->priv->model, &iter); + if (gtk_tree_model_get_iter (GTK_TREE_MODEL (self->priv->model), &iter, path)) + gtk_tree_store_remove (self->priv->model, &iter); else break; gtk_tree_path_free (path); } +} + + +static void +update_entry_point_list (GthLocationChooser *self) +{ + int first_position; + int position; + GList *entry_points; + GList *scan; + + self->priv->update_entry_list_id = 0; + + clear_entry_point_list (self); + + if (! get_nth_separator_pos (self, 1, &first_position)) { + GtkTreeIter iter; + GtkTreePath *path; + + gtk_tree_store_append (self->priv->model, &iter, NULL); + gtk_tree_store_set (self->priv->model, &iter, + TYPE_COLUMN, ITEM_TYPE_SEPARATOR, + -1); + + path = gtk_tree_model_get_path (GTK_TREE_MODEL (self->priv->model), &iter); + if (path == NULL) + return; + first_position = gtk_tree_path_get_indices(path)[0]; + + gtk_tree_path_free (path); + } position = first_position + 1; entry_points = gth_main_get_all_entry_points (); for (scan = entry_points; scan; scan = scan->next) { GthFileData *file_data = scan->data; - add_file_source_entries (chooser, + add_file_source_entries (self, file_data->file, g_file_info_get_display_name (file_data->info), g_file_info_get_icon (file_data->info), @@ -297,170 +339,68 @@ } -static void -entry_points_changed_cb (GthMonitor *monitor, - GthLocationChooser *chooser) -{ - call_when_idle ((DataFunc) update_entry_point_list, chooser); -} - - -static void -gth_location_chooser_construct (GthLocationChooser *chooser) +static gboolean +row_separator_func (GtkTreeModel *model, + GtkTreeIter *iter, + gpointer data) { - GtkCellRenderer *renderer; - GtkTreeIter iter; - - chooser->priv->icon_cache = gth_icon_cache_new (gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (chooser))), - _gtk_icon_get_pixel_size (GTK_WIDGET (chooser), GTK_ICON_SIZE_MENU)); - - chooser->priv->model = gtk_tree_store_new (N_COLUMNS, - GDK_TYPE_PIXBUF, - G_TYPE_STRING, - G_TYPE_STRING, - G_TYPE_INT, - PANGO_TYPE_ELLIPSIZE_MODE); - chooser->priv->combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (chooser->priv->model)); - g_object_unref (chooser->priv->model); - g_signal_connect (chooser->priv->combo, - "changed", - G_CALLBACK (combo_changed_cb), - chooser); - gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (chooser->priv->combo), - row_separator_func, - chooser, - NULL); - gtk_widget_set_size_request (chooser->priv->combo, MIN_WIDTH, -1); - - /* icon column */ - - renderer = gtk_cell_renderer_pixbuf_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser->priv->combo), - renderer, - FALSE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (chooser->priv->combo), - renderer, - "pixbuf", ICON_COLUMN, - NULL); - - /* path column */ - - renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser->priv->combo), - renderer, - TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (chooser->priv->combo), - renderer, - "text", NAME_COLUMN, - "ellipsize", ELLIPSIZE_COLUMN, - NULL); - - /**/ - - gtk_widget_show (chooser->priv->combo); - gtk_container_add (GTK_CONTAINER (chooser), chooser->priv->combo); - - /* Add standard items. */ - - /* separator #1 */ + int item_type = ITEM_TYPE_NONE; - gtk_tree_store_append (chooser->priv->model, &iter, NULL); - gtk_tree_store_set (chooser->priv->model, &iter, - TYPE_COLUMN, ITEM_TYPE_SEPARATOR, + gtk_tree_model_get (model, + iter, + TYPE_COLUMN, &item_type, -1); - /**/ - - performance (DEBUG_INFO, "update_entry_point_list"); - - update_entry_point_list (chooser); - - performance (DEBUG_INFO, "location constructed"); - - /**/ - - chooser->priv->entry_points_changed_id = - g_signal_connect (gth_main_get_default_monitor (), - "entry-points-changed", - G_CALLBACK (entry_points_changed_cb), - chooser); -} - - -GType -gth_location_chooser_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthLocationChooserClass), - NULL, - NULL, - (GClassInitFunc) gth_location_chooser_class_init, - NULL, - NULL, - sizeof (GthLocationChooser), - 0, - (GInstanceInitFunc) gth_location_chooser_init - }; - - type = g_type_register_static (GTK_TYPE_HBOX, - "GthLocationChooser", - &type_info, - 0); - } - - return type; + return (item_type == ITEM_TYPE_SEPARATOR); } -GtkWidget* -gth_location_chooser_new (void) +static void +entry_points_changed_cb (GthMonitor *monitor, + GthLocationChooser *self) { - GtkWidget *widget; - - widget = GTK_WIDGET (g_object_new (GTH_TYPE_LOCATION_CHOOSER, NULL)); - gth_location_chooser_construct (GTH_LOCATION_CHOOSER (widget)); - - return widget; + if (! self->priv->show_entry_points) + return; + if (self->priv->update_entry_list_id != 0) + return; + self->priv->update_entry_list_id = call_when_idle ((DataFunc) update_entry_point_list, self); } static gboolean -delete_current_file_entries (GthLocationChooser *chooser) +delete_current_file_entries (GthLocationChooser *self) { gboolean found = FALSE; GtkTreeIter iter; - if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser->priv->model), &iter)) + if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->priv->model), &iter)) return FALSE; do { int item_type = ITEM_TYPE_NONE; - gtk_tree_model_get (GTK_TREE_MODEL (chooser->priv->model), + gtk_tree_model_get (GTK_TREE_MODEL (self->priv->model), &iter, TYPE_COLUMN, &item_type, -1); if (item_type == ITEM_TYPE_SEPARATOR) break; } - while (gtk_tree_store_remove (chooser->priv->model, &iter)); + while (gtk_tree_store_remove (self->priv->model, &iter)); return found; } static gboolean -get_iter_from_current_file_entries (GthLocationChooser *chooser, +get_iter_from_current_file_entries (GthLocationChooser *self, GFile *file, GtkTreeIter *iter) { gboolean found = FALSE; char *uri; - if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser->priv->model), iter)) + if (! gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->priv->model), iter)) return FALSE; uri = g_file_get_uri (file); @@ -468,7 +408,7 @@ int item_type = ITEM_TYPE_NONE; char *list_uri; - gtk_tree_model_get (GTK_TREE_MODEL (chooser->priv->model), + gtk_tree_model_get (GTK_TREE_MODEL (self->priv->model), iter, TYPE_COLUMN, &item_type, URI_COLUMN, &list_uri, @@ -482,7 +422,7 @@ } g_free (list_uri); } - while (gtk_tree_model_iter_next (GTK_TREE_MODEL (chooser->priv->model), iter)); + while (gtk_tree_model_iter_next (GTK_TREE_MODEL (self->priv->model), iter)); g_free (uri); @@ -490,47 +430,38 @@ } -void -gth_location_chooser_set_current (GthLocationChooser *chooser, - GFile *file) +static void +update_location_list (gpointer user_data) { - GtkTreeIter iter; - - if (chooser->priv->file_source != NULL) - g_object_unref (chooser->priv->file_source); - chooser->priv->file_source = gth_main_get_file_source (file); + GthLocationChooser *self = user_data; + GtkTreeIter iter; - if (chooser->priv->file_source == NULL) - return; + self->priv->update_location_list_id = 0; - if ((chooser->priv->location != NULL) && g_file_equal (file, chooser->priv->location)) + if (self->priv->location == NULL) return; - if (chooser->priv->location != NULL) - g_object_unref (chooser->priv->location); - chooser->priv->location = g_file_dup (file); - - if (get_iter_from_current_file_entries (chooser, chooser->priv->location, &iter)) { - g_signal_handlers_block_by_func (chooser->priv->combo, combo_changed_cb, chooser); - gtk_combo_box_set_active_iter (GTK_COMBO_BOX (chooser->priv->combo), &iter); - g_signal_handlers_unblock_by_func (chooser->priv->combo, combo_changed_cb, chooser); + if (get_iter_from_current_file_entries (self, self->priv->location, &iter)) { + g_signal_handlers_block_by_func (self->priv->combo, combo_changed_cb, self); + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (self->priv->combo), &iter); + g_signal_handlers_unblock_by_func (self->priv->combo, combo_changed_cb, self); } else { GList *list; GList *scan; int position = 0; - delete_current_file_entries (chooser); + delete_current_file_entries (self); - list = gth_file_source_get_current_list (chooser->priv->file_source, chooser->priv->location); + list = gth_file_source_get_current_list (self->priv->file_source, self->priv->location); for (scan = list; scan; scan = scan->next) { GFile *file = scan->data; GFileInfo *info; - info = gth_file_source_get_file_info (chooser->priv->file_source, file, GFILE_DISPLAY_ATTRIBUTES); + info = gth_file_source_get_file_info (self->priv->file_source, file, GFILE_DISPLAY_ATTRIBUTES); if (info == NULL) continue; - add_file_source_entries (chooser, + add_file_source_entries (self, file, g_file_info_get_display_name (info), g_file_info_get_icon (info), @@ -543,13 +474,313 @@ _g_object_list_unref (list); } +} + + +static void +current_location_changed (GthLocationChooser *self) +{ + if (self->priv->update_location_list_id != 0) + return; + self->priv->update_location_list_id = call_when_idle ((DataFunc) update_location_list, self); +} + + +static void +gth_location_chooser_realize (GtkWidget *widget) +{ + GthLocationChooser *self = GTH_LOCATION_CHOOSER (widget); + + GTK_WIDGET_CLASS (gth_location_chooser_parent_class)->realize (widget); + self->priv->icon_cache = gth_icon_cache_new (gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (self))), + _gtk_icon_get_pixel_size (GTK_WIDGET (self), GTK_ICON_SIZE_MENU)); + entry_points_changed_cb (NULL, self); + current_location_changed (self); +} + + +static void +gth_location_chooser_unrealize (GtkWidget *widget) +{ + GthLocationChooser *self = GTH_LOCATION_CHOOSER (widget); + + gth_icon_cache_free (self->priv->icon_cache); + self->priv->icon_cache = NULL; + + GTK_WIDGET_CLASS (gth_location_chooser_parent_class)->unrealize (widget); +} + + +static void +gth_location_chooser_class_init (GthLocationChooserClass *klass) +{ + GObjectClass *object_class; + GtkWidgetClass *widget_class; + + g_type_class_add_private (klass, sizeof (GthLocationChooserPrivate)); + + object_class = (GObjectClass*) klass; + object_class->set_property = gth_location_chooser_set_property; + object_class->get_property = gth_location_chooser_get_property; + object_class->finalize = gth_location_chooser_finalize; + + widget_class = (GtkWidgetClass *) klass; + widget_class->grab_focus = gth_location_chooser_grab_focus; + widget_class->realize = gth_location_chooser_realize; + widget_class->unrealize = gth_location_chooser_unrealize; + + /* properties */ + + g_object_class_install_property (object_class, + PROP_SHOW_ENTRY_POINTS, + g_param_spec_boolean ("show-entry-points", + "Show entry points", + "Whether to show the entry points in the list", + TRUE, + G_PARAM_READWRITE)); + + g_object_class_install_property (object_class, + PROP_RELIEF, + g_param_spec_enum ("relief", + "Border relief", + "The border relief style", + GTK_TYPE_RELIEF_STYLE, + GTK_RELIEF_NORMAL, + G_PARAM_READWRITE)); + + /* signals */ + + gth_location_chooser_signals[CHANGED] = + g_signal_new ("changed", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GthLocationChooserClass, changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, + 0); +} + + +static void +get_combo_box_button (GtkWidget *widget, + gpointer data) +{ + GtkWidget **p_child = data; + + if (GTK_IS_BUTTON (widget)) + *p_child = widget; +} + +static void +gth_location_chooser_init (GthLocationChooser *self) +{ + GtkCellRenderer *renderer; + + gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE); + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_HORIZONTAL); + + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_LOCATION_CHOOSER, GthLocationChooserPrivate); + self->priv->icon_cache = NULL; + self->priv->entry_points_changed_id = 0; + self->priv->arrow = NULL; + self->priv->show_entry_points = TRUE; + self->priv->relief = GTK_RELIEF_NORMAL; + + self->priv->model = gtk_tree_store_new (N_COLUMNS, + GDK_TYPE_PIXBUF, + G_TYPE_STRING, + G_TYPE_STRING, + G_TYPE_INT, + PANGO_TYPE_ELLIPSIZE_MODE); + self->priv->combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (self->priv->model)); + g_object_unref (self->priv->model); + g_signal_connect (self->priv->combo, + "changed", + G_CALLBACK (combo_changed_cb), + self); + gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (self->priv->combo), + row_separator_func, + self, + NULL); + gtk_widget_set_size_request (self->priv->combo, MIN_WIDTH, -1); + + /* icon column */ + + renderer = gtk_cell_renderer_pixbuf_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self->priv->combo), + renderer, + FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (self->priv->combo), + renderer, + "pixbuf", ICON_COLUMN, + NULL); + + /* path column */ + + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (self->priv->combo), + renderer, + TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (self->priv->combo), + renderer, + "text", NAME_COLUMN, + "ellipsize", ELLIPSIZE_COLUMN, + NULL); + + /**/ + + gtk_widget_show (self->priv->combo); + gtk_box_pack_start (GTK_BOX (self), self->priv->combo, TRUE, TRUE, 0); +} + + +GtkWidget * +gth_location_chooser_new (void) +{ + return GTK_WIDGET (g_object_new (GTH_TYPE_LOCATION_CHOOSER, NULL)); +} + + +/* -- gth_location_chooser_set_relief -- */ + + +static void +get_combo_box_arrow (GtkWidget *widget, + gpointer data) +{ + GtkWidget **p_child = data; + + if (GTK_IS_ARROW (widget)) + *p_child = widget; +} + + +static gboolean +show_combo_box_arrow (GthLocationChooser *self) +{ + if (self->priv->relief == GTK_RELIEF_NONE) + gtk_widget_show (self->priv->arrow); + + return FALSE; +} + + +static gboolean +hide_combo_box_arrow (GthLocationChooser *self) +{ + if (self->priv->relief == GTK_RELIEF_NONE) + gtk_widget_hide (self->priv->arrow); + + return FALSE; +} + + +void +gth_location_chooser_set_relief (GthLocationChooser *self, + GtkReliefStyle value) +{ + GtkWidget *button; + + if (self->priv->relief == value) + return; + + self->priv->relief = value; + + button = NULL; + gtk_container_forall (GTK_CONTAINER (self->priv->combo), get_combo_box_button, &button); + if (button != NULL) { + gtk_button_set_relief (GTK_BUTTON (button), self->priv->relief); + + /* show the arrow only when the pointer is over the combo_box */ + + if (self->priv->arrow == NULL) { + gtk_container_forall (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (button))), get_combo_box_arrow, &self->priv->arrow); + g_signal_connect_swapped (button, + "enter-notify-event", + G_CALLBACK (show_combo_box_arrow), + self); + g_signal_connect_swapped (button, + "leave-notify-event", + G_CALLBACK (hide_combo_box_arrow), + self); + } + + gtk_widget_set_visible (self->priv->arrow, self->priv->relief != GTK_RELIEF_NONE); + } + + g_object_notify (G_OBJECT (self), "relief"); +} + + +GtkReliefStyle +gth_location_chooser_get_relief (GthLocationChooser *self) +{ + return self->priv->relief; +} + + +void +gth_location_chooser_set_show_entry_points (GthLocationChooser *self, + gboolean value) +{ + self->priv->show_entry_points = value; + + if (self->priv->show_entry_points) { + if (self->priv->entry_points_changed_id == 0) + self->priv->entry_points_changed_id = + g_signal_connect (gth_main_get_default_monitor (), + "entry-points-changed", + G_CALLBACK (entry_points_changed_cb), + self); + entry_points_changed_cb (NULL, self); + } + else { + if (self->priv->entry_points_changed_id != 0) + g_source_remove (self->priv->entry_points_changed_id); + clear_entry_point_list (self); + } + + g_object_notify (G_OBJECT (self), "show-entry-points"); +} + + +gboolean +gth_location_chooser_get_show_entry_points (GthLocationChooser *self) +{ + return self->priv->show_entry_points; +} + + +void +gth_location_chooser_set_current (GthLocationChooser *self, + GFile *file) +{ + + + if (self->priv->file_source != NULL) + g_object_unref (self->priv->file_source); + self->priv->file_source = gth_main_get_file_source (file); + + if (self->priv->file_source == NULL) + return; + + if ((self->priv->location != NULL) && g_file_equal (file, self->priv->location)) + return; + + if (self->priv->location != NULL) + g_object_unref (self->priv->location); + self->priv->location = g_file_dup (file); + + if (gtk_widget_get_realized (GTK_WIDGET (self))) + current_location_changed (self); - g_signal_emit (G_OBJECT (chooser), gth_location_chooser_signals[CHANGED], 0); + g_signal_emit (G_OBJECT (self), gth_location_chooser_signals[CHANGED], 0); } GFile * -gth_location_chooser_get_current (GthLocationChooser *chooser) +gth_location_chooser_get_current (GthLocationChooser *self) { - return chooser->priv->location; + return self->priv->location; } diff -Nru gthumb-2.14.3/gthumb/gth-location-chooser.h gthumb-3.0.0/gthumb/gth-location-chooser.h --- gthumb-2.14.3/gthumb/gth-location-chooser.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-location-chooser.h 2012-02-19 15:01:32.000000000 +0000 @@ -40,26 +40,32 @@ struct _GthLocationChooser { - GtkHBox __parent; + GtkBox __parent; GthLocationChooserPrivate *priv; }; struct _GthLocationChooserClass { - GtkHBoxClass __parent_class; + GtkBoxClass __parent_class; /* -- Signals -- */ void (* changed) (GthLocationChooser *loc); }; -GType gth_location_chooser_get_type (void) G_GNUC_CONST; -GtkWidget * gth_location_chooser_new (void); -void gth_location_chooser_set_current (GthLocationChooser *chooser, - GFile *location); -GFile * gth_location_chooser_get_current (GthLocationChooser *chooser); -GthFileSource * gth_location_chooser_get_file_source (GthLocationChooser *chooser); -void gth_location_chooser_open_other (GthLocationChooser *chooser); +GType gth_location_chooser_get_type (void) G_GNUC_CONST; +GtkWidget * gth_location_chooser_new (void); +void gth_location_chooser_set_relief (GthLocationChooser *chooser, + GtkReliefStyle value); +GtkReliefStyle gth_location_chooser_get_relief (GthLocationChooser *chooser); +void gth_location_chooser_set_show_entry_points (GthLocationChooser *chooser, + gboolean value); +gboolean gth_location_chooser_get_show_entry_points (GthLocationChooser *chooser); +void gth_location_chooser_set_current (GthLocationChooser *chooser, + GFile *location); +GFile * gth_location_chooser_get_current (GthLocationChooser *chooser); +GthFileSource * gth_location_chooser_get_file_source (GthLocationChooser *chooser); +void gth_location_chooser_open_other (GthLocationChooser *chooser); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/gth-main.c gthumb-3.0.0/gthumb/gth-main.c --- gthumb-2.14.3/gthumb/gth-main.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-main.c 2012-03-24 15:51:38.000000000 +0000 @@ -25,7 +25,6 @@ #include #include #include -#include "gconf-utils.h" #include "glib-utils.h" #include "gth-duplicable.h" #include "gth-filter.h" @@ -41,8 +40,6 @@ #include #endif -#include "eggsmclient.h" -#include "eggdesktopfile.h" static GStaticMutex register_mutex = G_STATIC_MUTEX_INIT; @@ -116,7 +113,7 @@ }; -static GObjectClass *parent_class = NULL; +G_DEFINE_TYPE (GthMain, gth_main, G_TYPE_OBJECT) static void @@ -156,7 +153,7 @@ gth_main->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_main_parent_class)->finalize (object); } @@ -165,9 +162,7 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - object_class->finalize = gth_main_finalize; } @@ -188,50 +183,13 @@ } -GType -gth_main_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthMainClass), - NULL, - NULL, - (GClassInitFunc) gth_main_class_init, - NULL, - NULL, - sizeof (GthMain), - 0, - (GInstanceInitFunc) gth_main_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthMain", - &type_info, - 0); - } - - return type; -} - - void gth_main_initialize (void) { if (Main != NULL) return; - Main = (GthMain*) g_object_new (GTH_TYPE_MAIN, NULL); -#ifdef GDK_WINDOWING_X11 - egg_set_desktop_file (GTHUMB_APPLICATIONS_DIR "/gthumb.desktop"); -#else - /* manually set name and icon */ - g_set_application_name (_("gThumb")); - gtk_window_set_default_icon_name ("gthumb"); -#endif - - gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), GTHUMB_ICON_DIR); + Main = (GthMain*) g_object_new (GTH_TYPE_MAIN, NULL); } @@ -787,12 +745,16 @@ GthTest * gth_main_get_general_filter (void) { - char *filter_name; - GthTest *filter; + GSettings *settings; + char *filter_name; + GthTest *filter; + + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + filter_name = g_settings_get_string (settings, PREF_BROWSER_GENERAL_FILTER); + filter = gth_main_get_registered_object (GTH_TYPE_TEST, filter_name); - filter_name = eel_gconf_get_string (PREF_GENERAL_FILTER, DEFAULT_GENERAL_FILTER); - filter = gth_main_get_registered_object (GTH_TYPE_TEST, filter_name); g_free (filter_name); + g_object_unref (settings); return filter; } @@ -1243,46 +1205,42 @@ "rename_series", "resize_images", "search", + "selections", "slideshow", "webalbums", NULL }; - int i; - GError *error = NULL; - GSList *active_extensions; - GthExtensionManager *manager; - GSList *scan; + int i; + GError *error = NULL; + GSettings *settings; + char **active_extensions; + GList *ordered_extensions; + GthExtensionManager *manager; + GList *scan; if (Main->priv->extension_manager == NULL) Main->priv->extension_manager = gth_extension_manager_new (); for (i = 0; mandatory_extensions[i] != NULL; i++) { if (! gth_extension_manager_activate (Main->priv->extension_manager, mandatory_extensions[i], &error)) { - g_warning ("Could not load the '%s' extension: %s", mandatory_extensions[i], error->message); - g_clear_error (&error); + g_critical ("Could not load the mandatory extension '%s': %s", mandatory_extensions[i], error->message); + abort (); } } - active_extensions = eel_gconf_get_string_list_with_error (PREF_ACTIVE_EXTENSIONS, &error); - if ((error != NULL) - || ((active_extensions != NULL) - && (active_extensions->next == NULL) - && (g_strcmp0 (active_extensions->data, "default") == 0))) + settings = g_settings_new (GTHUMB_GENERAL_SCHEMA); + active_extensions = g_settings_get_strv (settings, PREF_GENERAL_ACTIVE_EXTENSIONS); + if ((active_extensions != NULL) + && (active_extensions[1] == NULL) + && (g_strcmp0 (active_extensions[0], "default") == 0)) { - g_clear_error (&error); - g_slist_foreach (active_extensions, (GFunc) g_free, NULL); - g_slist_free (active_extensions); - - active_extensions = NULL; - for (i = 0; default_extensions[i] != NULL; i++) - active_extensions = g_slist_prepend (active_extensions, g_strdup (default_extensions[i])); - - eel_gconf_set_string_list (PREF_ACTIVE_EXTENSIONS, active_extensions); + g_strfreev (active_extensions); + active_extensions = g_strdupv ((char **) default_extensions); + g_settings_set_strv (settings, PREF_GENERAL_ACTIVE_EXTENSIONS, (const char *const *) active_extensions); } - active_extensions = gth_extension_manager_order_extensions (Main->priv->extension_manager, active_extensions); + ordered_extensions = gth_extension_manager_order_extensions (Main->priv->extension_manager, active_extensions); manager = gth_main_get_default_extension_manager (); - - for (scan = active_extensions; scan; scan = scan->next) { + for (scan = ordered_extensions; scan; scan = scan->next) { char *name = scan->data; GthExtensionDescription *description; GError *error = NULL; @@ -1297,8 +1255,8 @@ } } - g_slist_foreach (active_extensions, (GFunc) g_free, NULL); - g_slist_free (active_extensions); + _g_string_list_free (ordered_extensions); + g_strfreev (active_extensions); } diff -Nru gthumb-2.14.3/gthumb/gth-main-default-hooks.c gthumb-3.0.0/gthumb/gth-main-default-hooks.c --- gthumb-2.14.3/gthumb/gth-main-default-hooks.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-main-default-hooks.c 2012-02-19 15:01:32.000000000 +0000 @@ -210,7 +210,7 @@ * Called after a file metadata has been read. Used to syncronize * embedded metadata with the .comment file. * - * @file_data (GthFileData *): the file + * @file_list (GList *): list of GthFileData * @attributes (const char *): the attributes read for the file */ gth_hook_register ("read-metadata-ready", 2); diff -Nru gthumb-2.14.3/gthumb/gth-main-default-metadata.c gthumb-3.0.0/gthumb/gth-main-default-metadata.c --- gthumb-2.14.3/gthumb/gth-main-default-metadata.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-main-default-metadata.c 2012-04-09 18:29:50.000000000 +0000 @@ -53,6 +53,7 @@ { "general::tags", N_("Tags"), "general", 18, NULL, GTH_METADATA_ALLOW_EVERYWHERE }, { "general::rating", N_("Rating"), "general", 19, NULL, GTH_METADATA_ALLOW_EVERYWHERE }, + { "gth::file::emblems", "", "", 0, NULL, GTH_METADATA_ALLOW_NOWHERE }, { "image::width", "", "", 0, NULL, GTH_METADATA_ALLOW_NOWHERE }, { "image::height", "", "", 0, NULL, GTH_METADATA_ALLOW_NOWHERE }, { "frame::width", "", "", 0, NULL, GTH_METADATA_ALLOW_NOWHERE }, diff -Nru gthumb-2.14.3/gthumb/gth-marshal.list gthumb-3.0.0/gthumb/gth-marshal.list --- gthumb-2.14.3/gthumb/gth-marshal.list 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-marshal.list 2012-02-19 15:01:32.000000000 +0000 @@ -1,4 +1,7 @@ +BOOLEAN:ENUM, ENUM +BOOLEAN:VOID VOID:BOOLEAN, POINTER +VOID:BOXED, BOXED VOID:ENUM, ENUM VOID:INT, INT VOID:OBJECT, BOOLEAN diff -Nru gthumb-2.14.3/gthumb/gth-menu-action.c gthumb-3.0.0/gthumb/gth-menu-action.c --- gthumb-2.14.3/gthumb/gth-menu-action.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-menu-action.c 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,184 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "gth-menu-action.h" + + +G_DEFINE_TYPE (GthMenuAction, gth_menu_action, GTK_TYPE_ACTION) + + +/* Properties */ +enum { + PROP_0, + PROP_BUTTON_TOOLTIP, + PROP_ARROW_TOOLTIP, + PROP_MENU +}; + + +struct _GthMenuActionPrivate { + char *button_tooltip; + char *arrow_tooltip; + GtkWidget *menu; +}; + + +static void +gth_menu_action_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + GthMenuAction *self = GTH_MENU_ACTION (object); + + switch (property_id) { + case PROP_BUTTON_TOOLTIP: + g_free (self->priv->button_tooltip); + self->priv->button_tooltip = g_strdup (g_value_get_string (value)); + break; + + case PROP_ARROW_TOOLTIP: + g_free (self->priv->arrow_tooltip); + self->priv->arrow_tooltip = g_strdup (g_value_get_string (value)); + break; + + case PROP_MENU: + if (self->priv->menu != NULL) + g_object_unref (self->priv->menu); + self->priv->menu = g_value_dup_object (value); + break; + + default: + break; + } +} + + +static void +gth_menu_action_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + GthMenuAction *self = GTH_MENU_ACTION (object); + + switch (property_id) { + case PROP_BUTTON_TOOLTIP: + g_value_set_string (value, self->priv->button_tooltip); + break; + + case PROP_ARROW_TOOLTIP: + g_value_set_string (value, self->priv->arrow_tooltip); + break; + + case PROP_MENU: + g_value_set_object (value, self->priv->menu); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + + +static void +gth_menu_action_init (GthMenuAction *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_MENU_ACTION, GthMenuActionPrivate); + self->priv->menu = NULL; + self->priv->arrow_tooltip = NULL; + self->priv->button_tooltip = NULL; +} + + +static void +gth_menu_action_finalize (GObject *base) +{ + GthMenuAction *self = GTH_MENU_ACTION (base); + + g_free (self->priv->arrow_tooltip); + g_free (self->priv->button_tooltip); + + G_OBJECT_CLASS (gth_menu_action_parent_class)->finalize (base); +} + + +static GtkWidget * +gth_menu_action_create_tool_item (GtkAction *base) +{ + GthMenuAction *self = GTH_MENU_ACTION (base); + GtkWidget *tool_item; + + tool_item = g_object_new (GTK_TYPE_MENU_TOOL_BUTTON, NULL); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), FALSE); + gtk_widget_set_tooltip_text (GTK_WIDGET (tool_item), self->priv->button_tooltip); + gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (tool_item), self->priv->arrow_tooltip); + gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (tool_item), self->priv->menu); + + return tool_item; +} + + +static void +gth_menu_action_class_init (GthMenuActionClass *klass) +{ + GObjectClass *object_class; + GtkActionClass *action_class; + + g_type_class_add_private (klass, sizeof (GthMenuActionPrivate)); + + object_class = (GObjectClass*) klass; + object_class->set_property = gth_menu_action_set_property; + object_class->get_property = gth_menu_action_get_property; + object_class->finalize = gth_menu_action_finalize; + + action_class = (GtkActionClass *) klass; + action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON; + action_class->create_tool_item = gth_menu_action_create_tool_item; + + /* properties */ + + g_object_class_install_property (object_class, + PROP_BUTTON_TOOLTIP, + g_param_spec_string ("button-tooltip", + "Button Tooltip", + "The tooltip for the button", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_ARROW_TOOLTIP, + g_param_spec_string ("arrow-tooltip", + "Arrow Tooltip", + "The tooltip for the arrow", + NULL, + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, + PROP_MENU, + g_param_spec_object ("menu", + "Menu", + "The menu to show", + GTK_TYPE_MENU, + G_PARAM_READWRITE)); +} diff -Nru gthumb-2.14.3/gthumb/gth-menu-action.h gthumb-3.0.0/gthumb/gth-menu-action.h --- gthumb-2.14.3/gthumb/gth-menu-action.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-menu-action.h 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,54 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_MENU_ACTION_H +#define GTH_MENU_ACTION_H + +#include + +G_BEGIN_DECLS + +#define GTH_TYPE_MENU_ACTION (gth_menu_action_get_type ()) +#define GTH_MENU_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_MENU_ACTION, GthMenuAction)) +#define GTH_MENU_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_MENU_ACTION, GthMenuActionClass)) +#define GTH_IS_MENU_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_MENU_ACTION)) +#define GTH_IS_MENU_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTH_TYPE_MENU_ACTION)) +#define GTH_MENU_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_MENU_ACTION, GthMenuActionClass)) + +typedef struct _GthMenuAction GthMenuAction; +typedef struct _GthMenuActionClass GthMenuActionClass; +typedef struct _GthMenuActionPrivate GthMenuActionPrivate; + +struct _GthMenuAction { + GtkAction parent; + GthMenuActionPrivate *priv; +}; + +struct _GthMenuActionClass { + GtkActionClass parent_class; +}; + +GType gth_menu_action_get_type (void) G_GNUC_CONST; + +G_END_DECLS + +#endif /* GTH_MENU_ACTION_H */ + diff -Nru gthumb-2.14.3/gthumb/gth-menu-button.c gthumb-3.0.0/gthumb/gth-menu-button.c --- gthumb-2.14.3/gthumb/gth-menu-button.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-menu-button.c 2012-02-19 15:01:32.000000000 +0000 @@ -46,10 +46,13 @@ PROP_MENU }; -static gpointer parent_class = NULL; + static int signals[LAST_SIGNAL]; +G_DEFINE_TYPE (GthMenuButton, gth_menu_button, GTK_TYPE_TOGGLE_BUTTON) + + static void gth_menu_button_state_changed (GtkWidget *widget, GtkStateType previous_state) @@ -143,15 +146,15 @@ gboolean *push_in, GthMenuButton *self) { - GtkWidget *widget = GTK_WIDGET (self); - GtkRequisition menu_req; - GtkTextDirection direction; - GdkRectangle monitor; - int monitor_num; - GdkScreen *screen; - GtkAllocation allocation; + GtkWidget *widget = GTK_WIDGET (self); + GtkRequisition menu_req; + GtkTextDirection direction; + cairo_rectangle_int_t monitor; + int monitor_num; + GdkScreen *screen; + GtkAllocation allocation; - gtk_widget_size_request (GTK_WIDGET (self->priv->menu), &menu_req); + gtk_widget_get_preferred_size (GTK_WIDGET (self->priv->menu), &menu_req, NULL); direction = gtk_widget_get_direction (widget); @@ -253,7 +256,6 @@ GObjectClass *object_class; GtkWidgetClass *widget_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthMenuButtonPrivate)); object_class = (GObjectClass *) klass; @@ -372,11 +374,11 @@ /* box */ - main_box = gtk_hbox_new (FALSE, image_spacing); + main_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, image_spacing); gtk_widget_show (main_box); gtk_container_add (GTK_CONTAINER (self), main_box); - box = gtk_hbox_new (FALSE, image_spacing); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, image_spacing); gtk_widget_show (box); gtk_box_pack_start (GTK_BOX (box), self->priv->icon_widget, FALSE, TRUE, 0); gtk_box_pack_end (GTK_BOX (box), self->priv->label_widget, TRUE, TRUE, 0); @@ -397,33 +399,6 @@ } -GType -gth_menu_button_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthMenuButtonClass), - NULL, - NULL, - (GClassInitFunc) gth_menu_button_class_init, - NULL, - NULL, - sizeof (GthMenuButton), - 0, - (GInstanceInitFunc) gth_menu_button_init - }; - type = g_type_register_static (GTK_TYPE_TOGGLE_BUTTON, - "GthMenuButton", - &type_info, - 0); - } - - return type; -} - - GtkWidget * gth_menu_button_new (void) { diff -Nru gthumb-2.14.3/gthumb/gth-metadata.c gthumb-3.0.0/gthumb/gth-metadata.c --- gthumb-2.14.3/gthumb/gth-metadata.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-metadata.c 2012-02-19 15:01:32.000000000 +0000 @@ -41,7 +41,8 @@ char *value_type; }; -static gpointer gth_metadata_parent_class = NULL; + +G_DEFINE_TYPE (GthMetadata, gth_metadata, G_TYPE_OBJECT) static void @@ -128,7 +129,6 @@ static void gth_metadata_class_init (GthMetadataClass *klass) { - gth_metadata_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthMetadataPrivate)); G_OBJECT_CLASS (klass)->get_property = gth_metadata_get_property; @@ -174,7 +174,7 @@ static void -gth_metadata_instance_init (GthMetadata *self) +gth_metadata_init (GthMetadata *self) { self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_METADATA, GthMetadataPrivate); self->priv->id = NULL; @@ -185,30 +185,6 @@ } -GType -gth_metadata_get_type (void) -{ - static GType gth_metadata_type_id = 0; - - if (gth_metadata_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthMetadataClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_metadata_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthMetadata), - 0, - (GInstanceInitFunc) gth_metadata_instance_init, - NULL - }; - gth_metadata_type_id = g_type_register_static (G_TYPE_OBJECT, "GthMetadata", &g_define_type_info, 0); - } - return gth_metadata_type_id; -} - - GthMetadata * gth_metadata_new (void) { diff -Nru gthumb-2.14.3/gthumb/gth-metadata-chooser.c gthumb-3.0.0/gthumb/gth-metadata-chooser.c --- gthumb-2.14.3/gthumb/gth-metadata-chooser.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-metadata-chooser.c 2012-02-19 15:01:32.000000000 +0000 @@ -57,14 +57,15 @@ }; -static gpointer parent_class = NULL; static guint gth_metadata_chooser_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (GthMetadataChooser, gth_metadata_chooser, GTK_TYPE_TREE_VIEW) + + static void gth_metadata_chooser_class_init (GthMetadataChooserClass *klass) { - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthMetadataChooserPrivate)); /* signals */ @@ -293,7 +294,7 @@ static void -gth_metadata_chooser_instance_init (GthMetadataChooser *self) +gth_metadata_chooser_init (GthMetadataChooser *self) { GtkListStore *store; GtkTreeViewColumn *column; @@ -358,34 +359,6 @@ } -GType -gth_metadata_chooser_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthMetadataChooserClass), - NULL, - NULL, - (GClassInitFunc) gth_metadata_chooser_class_init, - NULL, - NULL, - sizeof (GthMetadataChooser), - 0, - (GInstanceInitFunc) gth_metadata_chooser_instance_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_TREE_VIEW, - "GthMetadataChooser", - &g_define_type_info, - 0); - } - - return type; -} - - GtkWidget * gth_metadata_chooser_new (GthMetadataFlags allowed_flags) { diff -Nru gthumb-2.14.3/gthumb/gth-metadata.h gthumb-3.0.0/gthumb/gth-metadata.h --- gthumb-2.14.3/gthumb/gth-metadata.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-metadata.h 2012-02-19 15:01:32.000000000 +0000 @@ -38,10 +38,11 @@ GTH_METADATA_ALLOW_NOWHERE = 0, GTH_METADATA_ALLOW_IN_FILE_LIST = 1 << 0, GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW = 1 << 1, - GTH_METADATA_ALLOW_IN_PRINT = 1 << 2, - GTH_METADATA_ALLOW_EVERYWHERE = (GTH_METADATA_ALLOW_IN_FILE_LIST | GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW | GTH_METADATA_ALLOW_IN_PRINT) + GTH_METADATA_ALLOW_IN_PRINT = 1 << 2 } GthMetadataFlags; +#define GTH_METADATA_ALLOW_EVERYWHERE (GTH_METADATA_ALLOW_IN_FILE_LIST | GTH_METADATA_ALLOW_IN_PROPERTIES_VIEW | GTH_METADATA_ALLOW_IN_PRINT) + typedef struct { const char *id; const char *display_name; diff -Nru gthumb-2.14.3/gthumb/gth-metadata-provider.c gthumb-3.0.0/gthumb/gth-metadata-provider.c --- gthumb-2.14.3/gthumb/gth-metadata-provider.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-metadata-provider.c 2012-02-19 15:01:32.000000000 +0000 @@ -29,7 +29,7 @@ #define CHECK_THREAD_RATE 5 -static gpointer gth_metadata_provider_parent_class = NULL; +G_DEFINE_TYPE (GthMetadataProvider, gth_metadata_provider, G_TYPE_OBJECT) static gboolean @@ -74,8 +74,6 @@ static void gth_metadata_provider_class_init (GthMetadataProviderClass * klass) { - gth_metadata_provider_parent_class = g_type_class_peek_parent (klass); - GTH_METADATA_PROVIDER_CLASS (klass)->can_read = gth_metadata_provider_real_can_read; GTH_METADATA_PROVIDER_CLASS (klass)->can_write = gth_metadata_provider_real_can_write; GTH_METADATA_PROVIDER_CLASS (klass)->read = gth_metadata_provider_real_read; @@ -83,26 +81,10 @@ } -GType -gth_metadata_provider_get_type (void) +static void +gth_metadata_provider_init (GthMetadataProvider *self) { - static GType gth_metadata_provider_type_id = 0; - if (gth_metadata_provider_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthMetadataProviderClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_metadata_provider_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthMetadataProvider), - 0, - (GInstanceInitFunc) NULL, - NULL - }; - gth_metadata_provider_type_id = g_type_register_static (G_TYPE_OBJECT, "GthMetadataProvider", &g_define_type_info, 0); - } - return gth_metadata_provider_type_id; + /* void */ } @@ -177,6 +159,8 @@ GList *scan; GError *error = NULL; + performance (DEBUG_INFO, "_g_query_metadata_async_thread start"); + qmd = g_simple_async_result_get_op_res_gpointer (result); providers = NULL; @@ -203,17 +187,17 @@ _g_object_list_unref (providers); - if (error == NULL) { - for (scan = qmd->files; scan; scan = scan->next) { - GthFileData *file_data = scan->data; - gth_hook_invoke ("read-metadata-ready", file_data, qmd->attributes); - } - } + performance (DEBUG_INFO, "_g_query_metadata_async_thread before read-metadata-ready"); + + if (error == NULL) + gth_hook_invoke ("read-metadata-ready", qmd->files, qmd->attributes); if (error != NULL) { g_simple_async_result_set_from_error (result, error); g_error_free (error); } + + performance (DEBUG_INFO, "_g_query_metadata_async_thread end"); } diff -Nru gthumb-2.14.3/gthumb/gth-metadata-provider-file.c gthumb-3.0.0/gthumb/gth-metadata-provider-file.c --- gthumb-2.14.3/gthumb/gth-metadata-provider-file.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-metadata-provider-file.c 2012-02-19 15:01:32.000000000 +0000 @@ -25,10 +25,7 @@ #include "gth-metadata-provider-file.h" -#define GTH_METADATA_PROVIDER_FILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_METADATA_PROVIDER_COMMENT, GthMetadataProviderFilePrivate)) - - -static GthMetadataProviderClass *parent_class = NULL; +G_DEFINE_TYPE (GthMetadataProviderFile, gth_metadata_provider_file, GTH_TYPE_METADATA_PROVIDER) static gboolean @@ -58,7 +55,7 @@ matcher = g_file_attribute_matcher_new (attributes); - value = g_format_size_for_display (g_file_info_get_size (file_data->info)); + value = g_format_size (g_file_info_get_size (file_data->info)); g_file_info_set_attribute_string (file_data->info, "gth::file::display-size", value); g_free (value); @@ -82,36 +79,11 @@ static void gth_metadata_provider_file_class_init (GthMetadataProviderFileClass *klass) { - parent_class = g_type_class_peek_parent (klass); - GTH_METADATA_PROVIDER_CLASS (klass)->can_read = gth_metadata_provider_file_can_read; GTH_METADATA_PROVIDER_CLASS (klass)->read = gth_metadata_provider_file_read; } - -GType -gth_metadata_provider_file_get_type (void) +static void +gth_metadata_provider_file_init (GthMetadataProviderFile *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthMetadataProviderFileClass), - NULL, - NULL, - (GClassInitFunc) gth_metadata_provider_file_class_init, - NULL, - NULL, - sizeof (GthMetadataProviderFile), - 0, - (GInstanceInitFunc) NULL - }; - - type = g_type_register_static (GTH_TYPE_METADATA_PROVIDER, - "GthMetadataProviderFile", - &type_info, - 0); - } - - return type; } diff -Nru gthumb-2.14.3/gthumb/gth-monitor.c gthumb-3.0.0/gthumb/gth-monitor.c --- gthumb-2.14.3/gthumb/gth-monitor.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-monitor.c 2012-04-09 18:29:50.000000000 +0000 @@ -38,6 +38,7 @@ FOLDER_CONTENT_CHANGED, FILE_RENAMED, METADATA_CHANGED, + EMBLEMS_CHANGED, ENTRY_POINTS_CHANGED, ORDER_CHANGED, LAST_SIGNAL @@ -50,10 +51,12 @@ }; -static GObjectClass *parent_class = NULL; static guint monitor_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (GthMonitor, gth_monitor, G_TYPE_OBJECT) + + static void gth_monitor_finalize (GObject *object) { @@ -61,7 +64,7 @@ g_hash_table_unref (self->priv->paused_files); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_monitor_parent_class)->finalize (object); } @@ -79,7 +82,6 @@ { GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthMonitorPrivateData)); gobject_class = (GObjectClass*) class; @@ -155,6 +157,16 @@ G_TYPE_NONE, 1, G_TYPE_OBJECT); + monitor_signals[EMBLEMS_CHANGED] = + g_signal_new ("emblems-changed", + G_TYPE_FROM_CLASS (class), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GthMonitorClass, emblems_changed), + NULL, NULL, + g_cclosure_marshal_VOID__BOXED, + G_TYPE_NONE, + 1, + G_TYPE_OBJECT_LIST); monitor_signals[ENTRY_POINTS_CHANGED] = g_signal_new ("entry-points-changed", G_TYPE_FROM_CLASS (class), @@ -178,34 +190,6 @@ } -GType -gth_monitor_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthMonitorClass), - NULL, - NULL, - (GClassInitFunc) gth_monitor_class_init, - NULL, - NULL, - sizeof (GthMonitor), - 0, - (GInstanceInitFunc) gth_monitor_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthMonitor", - &type_info, - 0); - } - - return type; -} - - GthMonitor * gth_monitor_new (void) { @@ -367,7 +351,37 @@ void -gth_monitor_file_entry_points_changed (GthMonitor *self) +gth_monitor_emblems_changed (GthMonitor *self, + GList *list /* GFile list */) +{ + GList *changed_list = NULL; + GList *scan; + + /* ignore paused files */ + for (scan = list; scan; scan = scan->next) { + GFile *file = scan->data; + + if (g_hash_table_lookup (self->priv->paused_files, file) != NULL) + continue; + + changed_list = g_list_prepend (changed_list, g_object_ref (file)); + } + changed_list = g_list_reverse (changed_list); + + if (changed_list == NULL) + return; + + g_signal_emit (G_OBJECT (self), + monitor_signals[EMBLEMS_CHANGED], + 0, + changed_list); + + _g_object_list_unref (changed_list); +} + + +void +gth_monitor_entry_points_changed (GthMonitor *self) { g_return_if_fail (GTH_IS_MONITOR (self)); diff -Nru gthumb-2.14.3/gthumb/gth-monitor.h gthumb-3.0.0/gthumb/gth-monitor.h --- gthumb-2.14.3/gthumb/gth-monitor.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-monitor.h 2012-04-09 18:29:50.000000000 +0000 @@ -65,7 +65,7 @@ void (*tags_changed) (GthMonitor *monitor); void (*folder_changed) (GthMonitor *monitor, GFile *parent, - GList *list, + GList *list /* GFile list */, int position, GthMonitorEvent event); void (*file_renamed) (GthMonitor *monitor, @@ -73,6 +73,8 @@ GFile *new_file); void (*metadata_changed) (GthMonitor *monitor, GthFileData *file_data); + void (*emblems_changed) (GthMonitor *monitor, + GList *list /* GFile list */); void (*entry_points_changed) (GthMonitor *monitor); void (*order_changed) (GthMonitor *monitor, GFile *file, @@ -102,7 +104,9 @@ GFile *new_file); void gth_monitor_metadata_changed (GthMonitor *monitor, GthFileData *file_data); -void gth_monitor_file_entry_points_changed (GthMonitor *monitor); +void gth_monitor_emblems_changed (GthMonitor *monitor, + GList *list /* GFile list */); +void gth_monitor_entry_points_changed (GthMonitor *monitor); void gth_monitor_order_changed (GthMonitor *monitor, GFile *file, int *new_order); diff -Nru gthumb-2.14.3/gthumb/gth-multipage.c gthumb-3.0.0/gthumb/gth-multipage.c --- gthumb-2.14.3/gthumb/gth-multipage.c 2012-03-24 16:42:04.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-multipage.c 2012-03-24 15:40:31.000000000 +0000 @@ -40,7 +40,6 @@ }; -static gpointer parent_class = NULL; static guint gth_multipage_signals[LAST_SIGNAL] = { 0 }; @@ -48,15 +47,36 @@ GtkListStore *model; GtkWidget *combobox; GtkWidget *notebook; + GList *children; }; +G_DEFINE_TYPE (GthMultipage, gth_multipage, GTK_TYPE_BOX) + + +static void +gth_multipage_finalize (GObject *object) +{ + GthMultipage *multipage; + + multipage = GTH_MULTIPAGE (object); + + g_list_free (multipage->priv->children); + + G_OBJECT_CLASS (gth_multipage_parent_class)->finalize (object); +} + + static void gth_multipage_class_init (GthMultipageClass *klass) { - parent_class = g_type_class_peek_parent (klass); + GObjectClass *object_class; + g_type_class_add_private (klass, sizeof (GthMultipagePrivate)); + object_class = (GObjectClass*) klass; + object_class->finalize = gth_multipage_finalize; + /* signals */ gth_multipage_signals[CHANGED] = @@ -77,20 +97,57 @@ { GthMultipage *multipage = user_data; - gtk_notebook_set_current_page (GTK_NOTEBOOK (multipage->priv->notebook), gtk_combo_box_get_active (GTK_COMBO_BOX (multipage->priv->combobox))); + gtk_notebook_set_current_page (GTK_NOTEBOOK (multipage->priv->notebook), + gtk_combo_box_get_active (GTK_COMBO_BOX (multipage->priv->combobox))); g_signal_emit (G_OBJECT (multipage), gth_multipage_signals[CHANGED], 0); } static void +multipage_realize_cb (GtkWidget *widget, + gpointer user_data) +{ + GthMultipage *multipage = user_data; + GtkWidget *orientable_parent; + + orientable_parent = gtk_widget_get_parent (widget); + while ((orientable_parent != NULL ) && ! GTK_IS_ORIENTABLE (orientable_parent)) { + orientable_parent = gtk_widget_get_parent (orientable_parent); + } + + if (orientable_parent == NULL) + return; + + switch (gtk_orientable_get_orientation (GTK_ORIENTABLE (orientable_parent))) { + case GTK_ORIENTATION_HORIZONTAL: + gtk_box_set_spacing (GTK_BOX (multipage), 0); + gtk_widget_set_margin_top (multipage->priv->combobox, 4); + gtk_widget_set_margin_bottom (multipage->priv->combobox, 4); + break; + + case GTK_ORIENTATION_VERTICAL: + gtk_box_set_spacing (GTK_BOX (multipage), 6); + gtk_widget_set_margin_top (multipage->priv->combobox, 0); + gtk_widget_set_margin_bottom (multipage->priv->combobox, 0); + break; + } +} + + +static void gth_multipage_init (GthMultipage *multipage) { GtkCellRenderer *renderer; multipage->priv = GTH_MULTIPAGE_GET_PRIVATE (multipage); + multipage->priv->children = NULL; - gtk_box_set_spacing (GTK_BOX (multipage), 6); + gtk_orientable_set_orientation (GTK_ORIENTABLE (multipage), GTK_ORIENTATION_VERTICAL); + g_signal_connect (multipage, + "realize", + G_CALLBACK (multipage_realize_cb), + multipage); multipage->priv->model = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING); @@ -136,34 +193,6 @@ } -GType -gth_multipage_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthMultipageClass), - NULL, - NULL, - (GClassInitFunc) gth_multipage_class_init, - NULL, - NULL, - sizeof (GthMultipage), - 0, - (GInstanceInitFunc) gth_multipage_init - }; - - type = g_type_register_static (GTK_TYPE_VBOX, - "GthMultipage", - &type_info, - 0); - } - - return type; -} - - GtkWidget * gth_multipage_new (void) { @@ -175,10 +204,16 @@ gth_multipage_add_child (GthMultipage *multipage, GthMultipageChild *child) { - GtkTreeIter iter; + GtkWidget *box; + GtkTreeIter iter; + multipage->priv->children = g_list_append (multipage->priv->children, child); + + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (child), TRUE, TRUE, 0); gtk_widget_show (GTK_WIDGET (child)); - gtk_notebook_append_page (GTK_NOTEBOOK (multipage->priv->notebook), GTK_WIDGET (child), NULL); + gtk_widget_show (box); + gtk_notebook_append_page (GTK_NOTEBOOK (multipage->priv->notebook), box, NULL); gtk_list_store_append (GTK_LIST_STORE (multipage->priv->model), &iter); gtk_list_store_set (GTK_LIST_STORE (multipage->priv->model), &iter, @@ -191,7 +226,7 @@ GList * gth_multipage_get_children (GthMultipage *multipage) { - return gtk_container_get_children (GTK_CONTAINER (multipage->priv->notebook)); + return multipage->priv->children; } @@ -213,25 +248,13 @@ /* -- gth_multipage_child -- */ -GType -gth_multipage_child_get_type (void) { - static GType gth_multipage_child_type_id = 0; - if (gth_multipage_child_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthMultipageChildIface), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) NULL, - (GClassFinalizeFunc) NULL, - NULL, - 0, - 0, - (GInstanceInitFunc) NULL, - NULL - }; - gth_multipage_child_type_id = g_type_register_static (G_TYPE_INTERFACE, "GthMultipageChild", &g_define_type_info, 0); - } - return gth_multipage_child_type_id; +G_DEFINE_INTERFACE (GthMultipageChild, gth_multipage_child, 0) + + +static void +gth_multipage_child_default_init (GthMultipageChildInterface *iface) +{ + /* void */ } diff -Nru gthumb-2.14.3/gthumb/gth-multipage.h gthumb-3.0.0/gthumb/gth-multipage.h --- gthumb-2.14.3/gthumb/gth-multipage.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-multipage.h 2012-03-06 15:26:06.000000000 +0000 @@ -36,7 +36,7 @@ #define GTH_TYPE_MULTIPAGE_CHILD (gth_multipage_child_get_type ()) #define GTH_MULTIPAGE_CHILD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_MULTIPAGE_CHILD, GthMultipageChild)) #define GTH_IS_MULTIPAGE_CHILD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_MULTIPAGE_CHILD)) -#define GTH_MULTIPAGE_CHILD_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_MULTIPAGE_CHILD, GthMultipageChildIface)) +#define GTH_MULTIPAGE_CHILD_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_MULTIPAGE_CHILD, GthMultipageChildInterface)) typedef struct _GthMultipage GthMultipage; typedef struct _GthMultipageClass GthMultipageClass; @@ -44,21 +44,21 @@ struct _GthMultipage { - GtkVBox __parent; + GtkBox __parent; GthMultipagePrivate *priv; }; struct _GthMultipageClass { - GtkVBoxClass __parent_class; + GtkBoxClass __parent_class; void (*changed) (GthMultipage *self); }; typedef struct _GthMultipageChild GthMultipageChild; -typedef struct _GthMultipageChildIface GthMultipageChildIface; +typedef struct _GthMultipageChildInterface GthMultipageChildInterface; -struct _GthMultipageChildIface { +struct _GthMultipageChildInterface { GTypeInterface parent_iface; const char * (*get_name) (GthMultipageChild *self); const char * (*get_icon) (GthMultipageChild *self); diff -Nru gthumb-2.14.3/gthumb/gth-overwrite-dialog.c gthumb-3.0.0/gthumb/gth-overwrite-dialog.c --- gthumb-2.14.3/gthumb/gth-overwrite-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-overwrite-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -33,9 +33,6 @@ #define PREVIEW_SIZE 256 -static gpointer gth_overwrite_dialog_parent_class = NULL; - - struct _GthOverwriteDialogPrivate { GtkBuilder *builder; GFile *source; @@ -50,6 +47,9 @@ }; +G_DEFINE_TYPE (GthOverwriteDialog, gth_overwrite_dialog, GTK_TYPE_DIALOG) + + static void gth_overwrite_dialog_finalize (GObject *object) { @@ -73,9 +73,7 @@ static void gth_overwrite_dialog_class_init (GthOverwriteDialogClass *klass) { - gth_overwrite_dialog_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthOverwriteDialogPrivate)); - G_OBJECT_CLASS (klass)->finalize = gth_overwrite_dialog_finalize; } @@ -89,34 +87,6 @@ } -GType -gth_overwrite_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthOverwriteDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_overwrite_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthOverwriteDialog), - 0, - (GInstanceInitFunc) gth_overwrite_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthOverwriteDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void image_loader_ready_cb (GObject *source_object, GAsyncResult *result, @@ -174,7 +144,7 @@ gtk_label_set_text (GTK_LABEL (_gtk_builder_get_widget (self->priv->builder, "new_image_filename_label")), g_file_info_get_display_name (self->priv->source_data->info)); - text = g_format_size_for_display (g_file_info_get_size (self->priv->source_data->info)); + text = g_format_size (g_file_info_get_size (self->priv->source_data->info)); gtk_label_set_text (GTK_LABEL (_gtk_builder_get_widget (self->priv->builder, "new_image_size_label")), text); g_free (text); @@ -220,7 +190,7 @@ gtk_label_set_text (GTK_LABEL (_gtk_builder_get_widget (self->priv->builder, "old_image_filename_label")), g_file_info_get_display_name (self->priv->destination_data->info)); - text = g_format_size_for_display (g_file_info_get_size (self->priv->destination_data->info)); + text = g_format_size (g_file_info_get_size (self->priv->destination_data->info)); gtk_label_set_text (GTK_LABEL (_gtk_builder_get_widget (self->priv->builder, "old_image_size_label")), text); g_free (text); diff -Nru gthumb-2.14.3/gthumb/gth-pixbuf-list-task.c gthumb-3.0.0/gthumb/gth-pixbuf-list-task.c --- gthumb-2.14.3/gthumb/gth-pixbuf-list-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-pixbuf-list-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -49,7 +49,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthPixbufListTask, gth_pixbuf_list_task, GTH_TYPE_TASK) static void @@ -70,7 +70,7 @@ _g_object_list_unref (self->priv->file_list); _g_object_unref (self->priv->destination_file_data); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_pixbuf_list_task_parent_class)->finalize (object); } @@ -470,7 +470,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthPixbufListTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -493,34 +492,6 @@ } -GType -gth_pixbuf_list_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthPixbufListTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_pixbuf_list_task_class_init, - NULL, - NULL, - sizeof (GthPixbufListTask), - 0, - (GInstanceInitFunc) gth_pixbuf_list_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthPixbufListTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_pixbuf_list_task_new (GthBrowser *browser, GList *file_list, diff -Nru gthumb-2.14.3/gthumb/gth-pixbuf-saver.c gthumb-3.0.0/gthumb/gth-pixbuf-saver.c --- gthumb-2.14.3/gthumb/gth-pixbuf-saver.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-pixbuf-saver.c 2012-02-19 15:01:32.000000000 +0000 @@ -25,7 +25,7 @@ #include "gth-pixbuf-saver.h" -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthPixbufSaver, gth_pixbuf_saver, G_TYPE_OBJECT) static GtkWidget * @@ -65,8 +65,6 @@ static void gth_pixbuf_saver_class_init (GthPixbufSaverClass *klass) { - parent_class = g_type_class_peek_parent (klass); - klass->id = ""; klass->display_name = ""; klass->get_control = base_get_control; @@ -76,31 +74,10 @@ } -GType -gth_pixbuf_saver_get_type (void) +static void +gth_pixbuf_saver_init (GthPixbufSaver *self) { - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthPixbufSaverClass), - NULL, - NULL, - (GClassInitFunc) gth_pixbuf_saver_class_init, - NULL, - NULL, - sizeof (GthPixbufSaver), - 0, - (GInstanceInitFunc) NULL - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthPixbufSaver", - &type_info, - 0); - } - - return type; + /* void */ } diff -Nru gthumb-2.14.3/gthumb/gth-pixbuf-task.c gthumb-3.0.0/gthumb/gth-pixbuf-task.c --- gthumb-2.14.3/gthumb/gth-pixbuf-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-pixbuf-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -34,7 +34,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthPixbufTask, gth_pixbuf_task, GTH_TYPE_ASYNC_TASK) static void @@ -64,7 +64,7 @@ if (self->priv->destroy_data_func != NULL) (*self->priv->destroy_data_func) (self->data); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_pixbuf_task_parent_class)->finalize (object); } @@ -180,7 +180,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthPixbufTaskPrivate)); object_class = G_OBJECT_CLASS (class); @@ -210,34 +209,6 @@ } -GType -gth_pixbuf_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthPixbufTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_pixbuf_task_class_init, - NULL, - NULL, - sizeof (GthPixbufTask), - 0, - (GInstanceInitFunc) gth_pixbuf_task_init - }; - - type = g_type_register_static (GTH_TYPE_ASYNC_TASK, - "GthPixbufTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_pixbuf_task_new (const char *description, gboolean single_step, diff -Nru gthumb-2.14.3/gthumb/gth-preferences.c gthumb-3.0.0/gthumb/gth-preferences.c --- gthumb-2.14.3/gthumb/gth-preferences.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-preferences.c 2012-02-19 15:01:32.000000000 +0000 @@ -22,13 +22,10 @@ #include #include #include -#include "gconf-utils.h" #include "glib-utils.h" #include "gth-enum-types.h" #include "gth-preferences.h" -#define DIALOG_KEY_PREFIX "/apps/gthumb/dialogs/" - typedef struct { char *wallpaper_filename; @@ -37,24 +34,44 @@ } GthPreferences; -static GthPreferences *Preferences; +static GthPreferences *Preferences = NULL; void gth_pref_initialize (void) { - Preferences = g_new0 (GthPreferences, 1); + GSettings *settings; + + if (Preferences == NULL) + Preferences = g_new0 (GthPreferences, 1); + + /* desktop background */ - Preferences->wallpaper_filename = eel_gconf_get_string ("/desktop/gnome/background/picture_filename", NULL); - Preferences->wallpaper_options = eel_gconf_get_string ("/desktop/gnome/background/picture_options", NULL); + settings = g_settings_new (GNOME_DESKTOP_BACKGROUND_SCHEMA); + Preferences->wallpaper_filename = g_settings_get_string(settings, PREF_BACKGROUND_PICTURE_URI); + Preferences->wallpaper_options = g_settings_get_string(settings, PREF_BACKGROUND_PICTURE_OPTIONS); + g_object_unref (settings); + /* startup location */ + + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); Preferences->startup_location = NULL; - if (eel_gconf_get_boolean (PREF_USE_STARTUP_LOCATION, FALSE) || - eel_gconf_get_boolean (PREF_GO_TO_LAST_LOCATION, FALSE)) + if (g_settings_get_boolean (settings, PREF_BROWSER_USE_STARTUP_LOCATION) + || g_settings_get_boolean (settings, PREF_BROWSER_GO_TO_LAST_LOCATION)) { char *startup_location; - startup_location = eel_gconf_get_path (PREF_STARTUP_LOCATION, NULL); + startup_location = _g_settings_get_uri (settings, PREF_BROWSER_STARTUP_LOCATION); + if (startup_location == NULL) { + GFile *file; + + file = g_file_new_for_path (g_get_user_special_dir (G_USER_DIRECTORY_PICTURES)); + startup_location = g_file_get_uri (file); + + g_object_unref (file); + } + if (startup_location == NULL) + startup_location = g_strdup (get_home_uri ()); gth_pref_set_startup_location (startup_location); g_free (startup_location); @@ -71,18 +88,21 @@ g_free (current_uri); g_free (current_dir); } - - eel_gconf_monitor_add ("/apps/gthumb"); + g_object_unref (settings); } void gth_pref_release (void) { + if (Preferences == NULL) + return; + g_free (Preferences->wallpaper_filename); g_free (Preferences->wallpaper_options); g_free (Preferences->startup_location); g_free (Preferences); + Preferences = NULL; } @@ -120,95 +140,74 @@ } -static void -_gth_pref_dialog_property_set_int (const char *dialog_name, - const char *property, - int value) -{ - char *key; - - key = g_strconcat (DIALOG_KEY_PREFIX, dialog_name, "/", property, NULL); - eel_gconf_set_integer (key, value); - g_free (key); -} - - GthToolbarStyle gth_pref_get_real_toolbar_style (void) { - GthToolbarStyle toolbar_style; + GSettings *settings; + GthToolbarStyle toolbar_style; - toolbar_style = eel_gconf_get_enum (PREF_UI_TOOLBAR_STYLE, GTH_TYPE_TOOLBAR_STYLE, GTH_TOOLBAR_STYLE_SYSTEM); + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + toolbar_style = g_settings_get_enum (settings, PREF_BROWSER_TOOLBAR_STYLE); if (toolbar_style == GTH_TOOLBAR_STYLE_SYSTEM) { char *system_style; - system_style = eel_gconf_get_string ("/desktop/gnome/interface/toolbar_style", "system"); + toolbar_style = GTH_TOOLBAR_STYLE_TEXT_BELOW; /* default value */ - if (system_style == NULL) - toolbar_style = GTH_TOOLBAR_STYLE_TEXT_BELOW; - else if (strcmp (system_style, "both") == 0) + g_object_unref (settings); + settings = g_settings_new (GNOME_DESKTOP_INTERFACE_SCHEMA); + + system_style = g_settings_get_string (settings, "toolbar-style"); + if (g_strcmp0 (system_style, "both") == 0) toolbar_style = GTH_TOOLBAR_STYLE_TEXT_BELOW; - else if (strcmp (system_style, "both-horiz") == 0) + else if (g_strcmp0 (system_style, "both-horiz") == 0) toolbar_style = GTH_TOOLBAR_STYLE_TEXT_BESIDE; - else if (strcmp (system_style, "icons") == 0) + else if (g_strcmp0 (system_style, "icons") == 0) toolbar_style = GTH_TOOLBAR_STYLE_ICONS; - else if (strcmp (system_style, "text") == 0) + else if (g_strcmp0 (system_style, "text") == 0) toolbar_style = GTH_TOOLBAR_STYLE_TEXT; - else - toolbar_style = GTH_TOOLBAR_STYLE_TEXT_BELOW; g_free (system_style); } + g_object_unref (settings); + return toolbar_style; } void gth_pref_save_window_geometry (GtkWindow *window, - const char *dialog_name) + const char *schema) { - int x, y, width, height; - - gtk_window_get_position (window, &x, &y); - _gth_pref_dialog_property_set_int (dialog_name, "x", x); - _gth_pref_dialog_property_set_int (dialog_name, "y", y); - - gtk_window_get_size (window, &width, &height); - _gth_pref_dialog_property_set_int (dialog_name, "width", width); - _gth_pref_dialog_property_set_int (dialog_name, "height", height); -} - + GSettings *settings; + int width; + int height; -static int -_gth_pref_dialog_property_get_int (const char *dialog_name, - const char *property) -{ - char *key; - int value; + settings = g_settings_new (schema); - key = g_strconcat (DIALOG_KEY_PREFIX, dialog_name, "/", property, NULL); - value = eel_gconf_get_integer (key, -1); - g_free (key); + gtk_window_get_size (window, &width, &height); + g_settings_set_int (settings, "width", width); + g_settings_set_int (settings, "height", height); - return value; + g_object_unref (settings); } void gth_pref_restore_window_geometry (GtkWindow *window, - const char *dialog_name) + const char *schema) { - int x, y, width, height; + GSettings *settings; + int width; + int height; + + settings = g_settings_new (schema); + + width = g_settings_get_int (settings, "width"); + height = g_settings_get_int (settings, "height"); + if ((width != -1) && (height != 1)) + gtk_window_set_default_size (window, width, height); + gtk_window_present (window); - x = _gth_pref_dialog_property_get_int (dialog_name, "x"); - y = _gth_pref_dialog_property_get_int (dialog_name, "y"); - width = _gth_pref_dialog_property_get_int (dialog_name, "width"); - height = _gth_pref_dialog_property_get_int (dialog_name, "height"); - - if ((width != -1) && (height != 1)) - gtk_window_set_default_size (window, width, height); - if ((x != -1) && (y != 1)) - gtk_window_move (window, x, y); - gtk_window_present (window); + g_object_unref (settings); } diff -Nru gthumb-2.14.3/gthumb/gth-preferences.h gthumb-3.0.0/gthumb/gth-preferences.h --- gthumb-2.14.3/gthumb/gth-preferences.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-preferences.h 2012-03-31 09:42:32.000000000 +0000 @@ -3,7 +3,7 @@ /* * GThumb * - * Copyright (C) 2001-2009 Free Software Foundation, Inc. + * Copyright © 2001-2011 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,82 +28,90 @@ G_BEGIN_DECLS -#define PREF_DESKTOP_ICON_THEME "/desktop/gnome/file_views/icon_theme" +/* schemas */ -#define PREF_GO_TO_LAST_LOCATION "/apps/gthumb/general/go_to_last_location" -#define PREF_USE_STARTUP_LOCATION "/apps/gthumb/general/use_startup_location" -#define PREF_STARTUP_LOCATION "/apps/gthumb/general/startup_location" -#define PREF_STARTUP_CURRENT_FILE "/apps/gthumb/general/startup_current_file" -#define PREF_ACTIVE_EXTENSIONS "/apps/gthumb/general/active_extensions" -#define PREF_STORE_METADATA_IN_FILES "/apps/gthumb/general/store_metadata_in_files" - -#define PREF_DATA_MIGRATION_CATALOGS_2_10 "/apps/gthumb/data_migration/catalogs_2_10" - -#define PREF_GENERAL_FILTER "/apps/gthumb/browser/general_filter" -#define PREF_SHOW_HIDDEN_FILES "/apps/gthumb/browser/show_hidden_files" -#define PREF_SHOW_THUMBNAILS "/apps/gthumb/browser/show_thumbnails" -#define PREF_FAST_FILE_TYPE "/apps/gthumb/browser/fast_file_type" -#define PREF_SAVE_THUMBNAILS "/apps/gthumb/browser/save_thumbnails" -#define PREF_THUMBNAIL_SIZE "/apps/gthumb/browser/thumbnail_size" -#define PREF_THUMBNAIL_LIMIT "/apps/gthumb/browser/thumbnail_limit" -#define PREF_THUMBNAIL_CAPTION "/apps/gthumb/browser/thumbnail_caption" -#define PREF_CLICK_POLICY "/apps/gthumb/browser/click_policy" -#define PREF_SORT_TYPE "/apps/gthumb/browser/sort_type" -#define PREF_SORT_INVERSE "/apps/gthumb/browser/sort_inverse" -#define PREF_VIEW_AS "/apps/gthumb/browser/view_as" - -#define PREF_ZOOM_QUALITY "/apps/gthumb/viewer/zoom_quality" -#define PREF_ZOOM_CHANGE "/apps/gthumb/viewer/zoom_change" -#define PREF_TRANSP_TYPE "/apps/gthumb/viewer/transparency_type" -#define PREF_RESET_SCROLLBARS "/apps/gthumb/viewer/reset_scrollbars" -#define PREF_CHECK_TYPE "/apps/gthumb/viewer/check_type" -#define PREF_CHECK_SIZE "/apps/gthumb/viewer/check_size" -#define PREF_BLACK_BACKGROUND "/apps/gthumb/viewer/black_background" - -#define PREF_UI_TOOLBAR_STYLE "/apps/gthumb/ui/toolbar_style" -#define PREF_UI_WINDOW_WIDTH "/apps/gthumb/ui/window_width" -#define PREF_UI_WINDOW_HEIGHT "/apps/gthumb/ui/window_height" -#define PREF_UI_TOOLBAR_VISIBLE "/apps/gthumb/ui/toolbar_visible" -#define PREF_UI_STATUSBAR_VISIBLE "/apps/gthumb/ui/statusbar_visible" -#define PREF_UI_FILTERBAR_VISIBLE "/apps/gthumb/ui/filterbar_visible" -#define PREF_UI_SIDEBAR_VISIBLE "/apps/gthumb/ui/sidebar_visible" -#define PREF_UI_THUMBNAIL_LIST_VISIBLE "/apps/gthumb/ui/thumbnail_list_visible" -#define PREF_UI_BROWSER_SIDEBAR_WIDTH "/apps/gthumb/ui/browser_sidebar_width" -#define PREF_UI_VIEWER_SIDEBAR_WIDTH "/apps/gthumb/ui/viewer_sidebar_width" -#define PREF_UI_PROPERTIES_HEIGHT "/apps/gthumb/ui/properties_height" -#define PREF_UI_COMMENT_HEIGHT "/apps/gthumb/ui/comment_height" -#define PREF_UI_VIEWER_THUMBNAILS_ORIENT "/apps/gthumb/ui/viewer_thumbnails_orientation" - -#define PREF_ADD_TO_CATALOG_LAST_CATALOG "/apps/gthumb/dialogs/add_to_catalog/last_catalog" -#define PREF_ADD_TO_CATALOG_VIEW "/apps/gthumb/dialogs/add_to_catalog/view" - -#define PREF_MSG_CANNOT_MOVE_TO_TRASH "/apps/gthumb/dialogs/messages/cannot_move_to_trash" -#define PREF_MSG_SAVE_MODIFIED_IMAGE "/apps/gthumb/dialogs/messages/save_modified_image" -#define PREF_MSG_CONFIRM_DELETION "/apps/gthumb/dialogs/messages/confirm_deletion" - -/* default values */ - -#define DEFAULT_GENERAL_FILTER "file::type::is_media" -#define DEFAULT_THUMBNAIL_CAPTION "comment::note,comment::time" -#define DEFAULT_UI_WINDOW_WIDTH 690 -#define DEFAULT_UI_WINDOW_HEIGHT 460 -#define DEFAULT_FAST_FILE_TYPE TRUE -#define DEFAULT_THUMBNAIL_SIZE 128 -#define DEFAULT_CONFIRM_DELETION TRUE -#define DEFAULT_MSG_SAVE_MODIFIED_IMAGE TRUE -#define DEFAULT_MSG_CONFIRM_DELETION TRUE - -void gth_pref_initialize (void); -void gth_pref_release (void); -void gth_pref_set_startup_location (const char *location); -const char * gth_pref_get_startup_location (void); -const char * gth_pref_get_wallpaper_filename (void); -const char * gth_pref_get_wallpaper_options (void); -GthToolbarStyle gth_pref_get_real_toolbar_style (void); -void gth_pref_save_window_geometry (GtkWindow *window, - const char *dialog); -void gth_pref_restore_window_geometry (GtkWindow *window, - const char *dialog); +#define GTHUMB_SCHEMA "org.gnome.gthumb" +#define GTHUMB_GENERAL_SCHEMA GTHUMB_SCHEMA ".general" +#define GTHUMB_DATA_MIGRATION_SCHEMA GTHUMB_SCHEMA ".data-migration" +#define GTHUMB_BROWSER_SCHEMA GTHUMB_SCHEMA ".browser" +#define GTHUMB_DIALOGS_SCHEMA GTHUMB_SCHEMA ".dialogs" +#define GTHUMB_MESSAGES_SCHEMA GTHUMB_DIALOGS_SCHEMA ".messages" +#define GTHUMB_ADD_TO_CATALOG_SCHEMA GTHUMB_DIALOGS_SCHEMA ".add-to-catalog" + +/* keys: general */ + +#define PREF_GENERAL_ACTIVE_EXTENSIONS "active-extensions" +#define PREF_GENERAL_STORE_METADATA_IN_FILES "store-metadata-in-files" + +/* keys: dada migration */ + +#define PREF_DATA_MIGRATION_CATALOGS_2_10 "catalogs-2-10" + +/* keys: browser */ + +#define PREF_BROWSER_GO_TO_LAST_LOCATION "go-to-last-location" +#define PREF_BROWSER_USE_STARTUP_LOCATION "use-startup-location" +#define PREF_BROWSER_STARTUP_LOCATION "startup-location" +#define PREF_BROWSER_STARTUP_CURRENT_FILE "startup-current-file" +#define PREF_BROWSER_GENERAL_FILTER "general-filter" +#define PREF_BROWSER_SHOW_HIDDEN_FILES "show-hidden-files" +#define PREF_BROWSER_SHOW_THUMBNAILS "show-thumbnails" +#define PREF_BROWSER_FAST_FILE_TYPE "fast-file-type" +#define PREF_BROWSER_SAVE_THUMBNAILS "save-thumbnails" +#define PREF_BROWSER_THUMBNAIL_SIZE "thumbnail-size" +#define PREF_BROWSER_THUMBNAIL_LIMIT "thumbnail-limit" +#define PREF_BROWSER_THUMBNAIL_CAPTION "thumbnail-caption" +#define PREF_BROWSER_CLICK_POLICY "click-policy" +#define PREF_BROWSER_SORT_TYPE "sort-type" +#define PREF_BROWSER_SORT_INVERSE "sort-inverse" +#define PREF_BROWSER_TOOLBAR_STYLE "toolbar-style" +#define PREF_BROWSER_WINDOW_WIDTH "window-width" +#define PREF_BROWSER_WINDOW_HEIGHT "window-height" +#define PREF_BROWSER_TOOLBAR_VISIBLE "toolbar-visible" +#define PREF_BROWSER_STATUSBAR_VISIBLE "statusbar-visible" +#define PREF_BROWSER_FILTERBAR_VISIBLE "filterbar-visible" +#define PREF_BROWSER_SIDEBAR_VISIBLE "sidebar-visible" +#define PREF_BROWSER_PROPERTIES_VISIBLE "properties-visible" +#define PREF_BROWSER_PROPERTIES_ON_THE_RIGHT "properties-on-the-right" +#define PREF_BROWSER_THUMBNAIL_LIST_VISIBLE "thumbnail-list-visible" +#define PREF_BROWSER_BROWSER_SIDEBAR_WIDTH "browser-sidebar-width" +#define PREF_BROWSER_VIEWER_SIDEBAR_WIDTH "viewer-sidebar-width" +#define PREF_BROWSER_VIEWER_THUMBNAILS_ORIENT "viewer-thumbnails-orientation" +#define PREF_BROWSER_SHRINK_WRAP_VIEWER "shrink-wrap-viewer" +#define PREF_BROWSER_REUSE_ACTIVE_WINDOW "reuse-active-window" + +/* keys: add to catalog */ + +#define PREF_ADD_TO_CATALOG_LAST_CATALOG "last-catalog" +#define PREF_ADD_TO_CATALOG_VIEW "view" + +/* keys: messages */ + +#define PREF_MSG_CANNOT_MOVE_TO_TRASH "cannot-move-to-trash" +#define PREF_MSG_SAVE_MODIFIED_IMAGE "save-modified-image" +#define PREF_MSG_CONFIRM_DELETION "confirm-deletion" + +/* foreign schemas */ + +#define GNOME_DESKTOP_BACKGROUND_SCHEMA "org.gnome.desktop.background" +#define PREF_BACKGROUND_PICTURE_URI "picture-uri" +#define PREF_BACKGROUND_PICTURE_OPTIONS "picture-options" + +#define GNOME_DESKTOP_INTERFACE_SCHEMA "org.gnome.desktop.interface" + +/* utility functions */ + +void gth_pref_initialize (void); +void gth_pref_release (void); +void gth_pref_set_startup_location (const char *location); +const char * gth_pref_get_startup_location (void); +const char * gth_pref_get_wallpaper_filename (void); +const char * gth_pref_get_wallpaper_options (void); +GthToolbarStyle gth_pref_get_real_toolbar_style (void); +void gth_pref_save_window_geometry (GtkWindow *window, + const char *schema); +void gth_pref_restore_window_geometry (GtkWindow *window, + const char *schema); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/gth-progress-dialog.c gthumb-3.0.0/gthumb/gth-progress-dialog.c --- gthumb-2.14.3/gthumb/gth-progress-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-progress-dialog.c 2012-03-06 15:26:06.000000000 +0000 @@ -43,7 +43,7 @@ typedef struct _GthTaskProgressClass GthTaskProgressClass; struct _GthTaskProgress { - GtkHBox parent_instance; + GtkBox parent_instance; GthTask *task; GtkWidget *description_label; GtkWidget *details_label; @@ -55,10 +55,11 @@ }; struct _GthTaskProgressClass { - GtkHBoxClass parent_class; + GtkBoxClass parent_class; }; -static gpointer gth_task_progress_parent_class = NULL; + +G_DEFINE_TYPE (GthTaskProgress, gth_task_progress, GTK_TYPE_BOX) static void @@ -82,7 +83,6 @@ static void gth_task_progress_class_init (GthTaskProgressClass *klass) { - gth_task_progress_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->finalize = gth_task_progress_finalize; } @@ -102,12 +102,14 @@ PangoAttrList *attr_list; GtkWidget *image; + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_HORIZONTAL); + self->task = NULL; self->task_progress = 0; self->task_completed = 0; self->pulse_event = 0; - vbox = gtk_vbox_new (FALSE, 3); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (self), vbox, TRUE, TRUE, 0); @@ -132,7 +134,7 @@ gtk_widget_show (self->details_label); gtk_box_pack_start (GTK_BOX (vbox), self->details_label, FALSE, FALSE, 0); - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (self), vbox, FALSE, FALSE, 0); @@ -150,34 +152,6 @@ } -GType -gth_task_progress_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthTaskProgressClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_task_progress_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthTaskProgress), - 0, - (GInstanceInitFunc) gth_task_progress_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_HBOX, - "GthTaskProgress", - &g_define_type_info, - 0); - } - - return type; -} - - static gboolean task_pulse_cb (gpointer user_data) { @@ -266,9 +240,6 @@ /* -- gth_progress_dialog -- */ -static gpointer gth_progress_dialog_parent_class = NULL; - - struct _GthProgressDialogPrivate { GtkWindow *parent; GtkWidget *task_box; @@ -277,6 +248,9 @@ }; +G_DEFINE_TYPE (GthProgressDialog, gth_progress_dialog, GTK_TYPE_DIALOG) + + static void gth_progress_dialog_finalize (GObject *base) { @@ -294,7 +268,6 @@ static void gth_progress_dialog_class_init (GthProgressDialogClass *klass) { - gth_progress_dialog_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthProgressDialogPrivate)); G_OBJECT_CLASS (klass)->finalize = gth_progress_dialog_finalize; @@ -325,7 +298,7 @@ gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); - self->priv->task_box = gtk_vbox_new (FALSE, 6); + self->priv->task_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_widget_show (self->priv->task_box); gtk_container_set_border_width (GTK_CONTAINER (self->priv->task_box), 5); gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), self->priv->task_box, FALSE, FALSE, 0); @@ -335,34 +308,6 @@ } -GType -gth_progress_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthProgressDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_progress_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthProgressDialog), - 0, - (GInstanceInitFunc) gth_progress_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthProgressDialog", - &g_define_type_info, - 0); - } - - return type; -} - - GtkWidget * gth_progress_dialog_new (GtkWindow *parent) { diff -Nru gthumb-2.14.3/gthumb/gth-request-dialog.c gthumb-3.0.0/gthumb/gth-request-dialog.c --- gthumb-2.14.3/gthumb/gth-request-dialog.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-request-dialog.c 2012-02-19 15:01:32.000000000 +0000 @@ -28,9 +28,6 @@ #define REQUEST_ENTRY_WIDTH_IN_CHARS 40 -static gpointer gth_request_dialog_parent_class = NULL; - - struct _GthRequestDialogPrivate { GtkWidget *entry; GtkWidget *infobar; @@ -38,6 +35,9 @@ }; +G_DEFINE_TYPE (GthRequestDialog, gth_request_dialog, GTK_TYPE_DIALOG) + + static void gth_request_dialog_finalize (GObject *base) { @@ -50,7 +50,6 @@ static void gth_request_dialog_class_init (GthRequestDialogClass *klass) { - gth_request_dialog_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthRequestDialogPrivate)); G_OBJECT_CLASS (klass)->finalize = gth_request_dialog_finalize; @@ -67,34 +66,6 @@ } -GType -gth_request_dialog_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthRequestDialogClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_request_dialog_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthRequestDialog), - 0, - (GInstanceInitFunc) gth_request_dialog_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_DIALOG, - "GthRequestDialog", - &g_define_type_info, - 0); - } - - return type; -} - - static void _gth_request_dialog_construct (GthRequestDialog *self, GtkWindow *parent, @@ -155,8 +126,8 @@ gtk_label_set_line_wrap (GTK_LABEL (self->priv->info_label), TRUE); gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (self->priv->infobar))), self->priv->info_label); - hbox = gtk_hbox_new (FALSE, 6); - vbox = gtk_vbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); gtk_box_set_spacing (GTK_BOX (hbox), 12); diff -Nru gthumb-2.14.3/gthumb/gth-save-file-data-task.c gthumb-3.0.0/gthumb/gth-save-file-data-task.c --- gthumb-2.14.3/gthumb/gth-save-file-data-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-save-file-data-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -35,7 +35,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthSaveFileDataTask, gth_save_file_data_task, GTH_TYPE_TASK) static void @@ -48,7 +48,7 @@ _g_object_list_unref (self->priv->file_data_list); g_free (self->priv->attributes); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_save_file_data_task_parent_class)->finalize (object); } @@ -136,7 +136,6 @@ GObjectClass *object_class; GthTaskClass *task_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthSaveFileDataTaskPrivate)); object_class = G_OBJECT_CLASS (klass); @@ -156,34 +155,6 @@ } -GType -gth_save_file_data_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthSaveFileDataTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_save_file_data_task_class_init, - NULL, - NULL, - sizeof (GthSaveFileDataTask), - 0, - (GInstanceInitFunc) gth_save_file_data_task_init - }; - - type = g_type_register_static (GTH_TYPE_TASK, - "GthSaveFileDataTask", - &type_info, - 0); - } - - return type; -} - - GthTask * gth_save_file_data_task_new (GList *file_list, const char *attributes) diff -Nru gthumb-2.14.3/gthumb/gth-screensaver.c gthumb-3.0.0/gthumb/gth-screensaver.c --- gthumb-2.14.3/gthumb/gth-screensaver.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-screensaver.c 2012-03-28 19:44:02.000000000 +0000 @@ -36,12 +36,12 @@ struct _GthScreensaverPrivate { char *app_id; - guint cookie; + guint32 cookie; GDBusProxy *proxy; }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthScreensaver, gth_screensaver, G_TYPE_OBJECT) static void @@ -52,12 +52,10 @@ self = GTH_SCREENSAVER (object); g_free (self->priv->app_id); - if (self->priv->proxy != NULL) { + if (self->priv->proxy != NULL) g_object_unref (self->priv->proxy); - self->priv->proxy = NULL; - } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_screensaver_parent_class)->finalize (object); } @@ -108,7 +106,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthScreensaverPrivate)); object_class = (GObjectClass*) klass; @@ -138,34 +135,6 @@ } -GType -gth_screensaver_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthScreensaverClass), - NULL, - NULL, - (GClassInitFunc) gth_screensaver_class_init, - NULL, - NULL, - sizeof (GthScreensaver), - 0, - (GInstanceInitFunc) gth_screensaver_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthScreensaver", - &type_info, - 0); - } - - return type; -} - - GthScreensaver * gth_screensaver_new (const char *application_id) { @@ -293,10 +262,13 @@ void gth_screensaver_uninhibit (GthScreensaver *self) { - GError *error = NULL; + GError *error = NULL; + guint32 cookie; if (self->priv->cookie == 0) return; + cookie = self->priv->cookie; + self->priv->cookie = 0; _gth_screensaver_create_sm_proxy (self, &error); @@ -309,7 +281,7 @@ g_object_ref (self); g_dbus_proxy_call (self->priv->proxy, "Uninhibit", - g_variant_new ("(u)", self->priv->cookie), + g_variant_new ("(u)", cookie), G_DBUS_CALL_FLAGS_NONE, G_MAXINT, NULL, diff -Nru gthumb-2.14.3/gthumb/gth-sidebar.c gthumb-3.0.0/gthumb/gth-sidebar.c --- gthumb-2.14.3/gthumb/gth-sidebar.c 2011-11-06 09:39:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-sidebar.c 2012-02-19 15:01:32.000000000 +0000 @@ -38,9 +38,6 @@ }; -static gpointer parent_class = NULL; - - struct _GthSidebarPrivate { GtkWidget *properties; GtkWidget *toolbox; @@ -49,6 +46,9 @@ }; +G_DEFINE_TYPE (GthSidebar, gth_sidebar, GTK_TYPE_NOTEBOOK) + + static void gth_sidebar_finalize (GObject *object) { @@ -57,7 +57,7 @@ g_free (sidebar->priv->dirty); _g_object_unref (sidebar->priv->file_data); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_sidebar_parent_class)->finalize (object); } @@ -90,8 +90,6 @@ sidebar->priv->dirty[current] = FALSE; gth_property_view_set_file (GTH_PROPERTY_VIEW (current_child), sidebar->priv->file_data); - - g_list_free (children); } } @@ -101,7 +99,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthSidebarPrivate)); object_class = (GObjectClass *) klass; @@ -121,34 +118,6 @@ } -GType -gth_sidebar_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthSidebarClass), - NULL, - NULL, - (GClassInitFunc) gth_sidebar_class_init, - NULL, - NULL, - sizeof (GthSidebar), - 0, - (GInstanceInitFunc) gth_sidebar_init - }; - - type = g_type_register_static (GTK_TYPE_NOTEBOOK, - "GthSidebar", - &type_info, - 0); - } - - return type; -} - - static void _gth_sidebar_add_property_views (GthSidebar *sidebar) { @@ -251,8 +220,6 @@ sidebar->priv->dirty[i] = FALSE; gth_property_view_set_file (GTH_PROPERTY_VIEW (child), sidebar->priv->file_data); } - - g_list_free (children); } @@ -294,25 +261,13 @@ /* -- gth_property_view -- */ -GType -gth_property_view_get_type (void) { - static GType gth_property_view_type_id = 0; - if (gth_property_view_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthPropertyViewIface), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) NULL, - (GClassFinalizeFunc) NULL, - NULL, - 0, - 0, - (GInstanceInitFunc) NULL, - NULL - }; - gth_property_view_type_id = g_type_register_static (G_TYPE_INTERFACE, "GthPropertyView", &g_define_type_info, 0); - } - return gth_property_view_type_id; +G_DEFINE_INTERFACE (GthPropertyView, gth_property_view, 0) + + +static void +gth_property_view_default_init (GthPropertyViewInterface *iface) +{ + /* void */ } diff -Nru gthumb-2.14.3/gthumb/gth-sidebar.h gthumb-3.0.0/gthumb/gth-sidebar.h --- gthumb-2.14.3/gthumb/gth-sidebar.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-sidebar.h 2012-02-19 15:01:32.000000000 +0000 @@ -37,7 +37,7 @@ #define GTH_TYPE_PROPERTY_VIEW (gth_property_view_get_type ()) #define GTH_PROPERTY_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_PROPERTY_VIEW, GthPropertyView)) #define GTH_IS_PROPERTY_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_PROPERTY_VIEW)) -#define GTH_PROPERTY_VIEW_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_PROPERTY_VIEW, GthPropertyViewIface)) +#define GTH_PROPERTY_VIEW_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_PROPERTY_VIEW, GthPropertyViewInterface)) typedef struct _GthSidebar GthSidebar; typedef struct _GthSidebarClass GthSidebarClass; @@ -55,9 +55,9 @@ }; typedef struct _GthPropertyView GthPropertyView; -typedef struct _GthPropertyViewIface GthPropertyViewIface; +typedef struct _GthPropertyViewInterface GthPropertyViewInterface; -struct _GthPropertyViewIface { +struct _GthPropertyViewInterface { GTypeInterface parent_iface; void (*set_file) (GthPropertyView *self, GthFileData *file_data); diff -Nru gthumb-2.14.3/gthumb/gth-source-tree.c gthumb-3.0.0/gthumb/gth-source-tree.c --- gthumb-2.14.3/gthumb/gth-source-tree.c 2011-12-11 16:09:39.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-source-tree.c 2012-02-19 15:01:32.000000000 +0000 @@ -22,7 +22,6 @@ #include #include #include -#include "gconf-utils.h" #include "glib-utils.h" #include "gtk-utils.h" #include "gth-icon-cache.h" @@ -38,7 +37,7 @@ }; -static gpointer parent_class = NULL; +G_DEFINE_TYPE (GthSourceTree, gth_source_tree, GTH_TYPE_FOLDER_TREE) /* -- monitor_event_data -- */ @@ -124,11 +123,16 @@ load_data_run (LoadData *load_data, ListReady func) { + GSettings *settings; + + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); gth_file_source_list (load_data->file_source, load_data->folder, - eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE : GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE, + g_settings_get_boolean (settings, PREF_BROWSER_FAST_FILE_TYPE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE : GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE, func, load_data); + + g_object_unref (settings); } @@ -229,6 +233,9 @@ || ((path != NULL) && gtk_tree_view_row_expanded (GTK_TREE_VIEW (source_tree), path))) { MonitorEventData *monitor_data; + GSettings *settings; + + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); switch (event) { case GTH_MONITOR_EVENT_CREATED: @@ -239,7 +246,7 @@ monitor_data->source_tree = source_tree; gth_file_source_read_attributes (source_tree->priv->file_source, list, - eel_gconf_get_boolean (PREF_FAST_FILE_TYPE, TRUE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE : GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE, + g_settings_get_boolean (settings, PREF_BROWSER_FAST_FILE_TYPE) ? GFILE_STANDARD_ATTRIBUTES_WITH_FAST_CONTENT_TYPE : GFILE_STANDARD_ATTRIBUTES_WITH_CONTENT_TYPE, file_attributes_ready_cb, monitor_data); break; @@ -249,6 +256,8 @@ gth_folder_tree_delete_children (GTH_FOLDER_TREE (source_tree), parent, list); break; } + + g_object_unref (settings); } gtk_tree_path_free (path); @@ -314,7 +323,7 @@ source_tree->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_source_tree_parent_class)->finalize (object); } @@ -323,41 +332,11 @@ { GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (klass); gobject_class = G_OBJECT_CLASS (klass); - gobject_class->finalize = gth_source_tree_finalize; } -GType -gth_source_tree_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthSourceTreeClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_source_tree_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthSourceTree), - 0, - (GInstanceInitFunc) gth_source_tree_init, - NULL - }; - type = g_type_register_static (GTH_TYPE_FOLDER_TREE, - "GthSourceTree", - &g_define_type_info, - 0); - } - - return type; -} - - GtkWidget * gth_source_tree_new (GFile *root) { diff -Nru gthumb-2.14.3/gthumb/gth-statusbar.c gthumb-3.0.0/gthumb/gth-statusbar.c --- gthumb-2.14.3/gthumb/gth-statusbar.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-statusbar.c 2012-03-06 15:26:06.000000000 +0000 @@ -24,12 +24,6 @@ #include "gth-statusbar.h" -#define GTH_STATUSBAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_STATUSBAR, GthStatusbarPrivate)) - - -static gpointer gth_statusbar_parent_class = NULL; - - struct _GthStatusbarPrivate { guint list_info_cid; GtkWidget *primary_text; @@ -43,10 +37,12 @@ }; +G_DEFINE_TYPE (GthStatusbar, gth_statusbar, GTK_TYPE_STATUSBAR) + + static void gth_statusbar_class_init (GthStatusbarClass *klass) { - gth_statusbar_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthStatusbarPrivate)); } @@ -61,20 +57,20 @@ gtk_box_set_spacing (GTK_BOX (statusbar), 0); - statusbar->priv = GTH_STATUSBAR_GET_PRIVATE (statusbar); + statusbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (statusbar, GTH_TYPE_STATUSBAR, GthStatusbarPrivate); statusbar->priv->list_info_cid = gtk_statusbar_get_context_id (GTK_STATUSBAR (statusbar), "gth_list_info"); /* Progress info */ - statusbar->priv->progress_box = gtk_vbox_new (FALSE, 0); + statusbar->priv->progress_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_hide (statusbar->priv->progress_box); gtk_box_pack_start (GTK_BOX (statusbar), statusbar->priv->progress_box, FALSE, FALSE, 0); - separator = gtk_hseparator_new (); + separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_show (separator); gtk_box_pack_start (GTK_BOX (statusbar->priv->progress_box), separator, FALSE, FALSE, 0); - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (statusbar->priv->progress_box), hbox, FALSE, FALSE, 0); @@ -82,7 +78,7 @@ gtk_widget_show (statusbar->priv->progress_label); gtk_box_pack_start (GTK_BOX (hbox), statusbar->priv->progress_label, TRUE, TRUE, 0); - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE); gtk_widget_show (vbox); gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0); @@ -129,34 +125,6 @@ } -GType -gth_statusbar_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthStatusbarClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_statusbar_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthStatusbar), - 0, - (GInstanceInitFunc) gth_statusbar_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_STATUSBAR, - "GthStatusbar", - &g_define_type_info, - 0); - } - - return type; -} - - GtkWidget * gth_statusbar_new (void) { diff -Nru gthumb-2.14.3/gthumb/gth-string-list.c gthumb-3.0.0/gthumb/gth-string-list.c --- gthumb-2.14.3/gthumb/gth-string-list.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-string-list.c 2012-02-19 15:01:32.000000000 +0000 @@ -28,12 +28,12 @@ GList *list; }; -#define GTH_STRING_LIST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_STRING_LIST, GthStringListPrivate)) -static gpointer gth_string_list_parent_class = NULL; + +G_DEFINE_TYPE (GthStringList, gth_string_list, G_TYPE_OBJECT) static void -gth_string_list_finalize (GObject* obj) +gth_string_list_finalize (GObject *obj) { GthStringList *self; @@ -46,38 +46,17 @@ static void -gth_string_list_class_init (GthStringListClass * klass) +gth_string_list_class_init (GthStringListClass *klass) { - gth_string_list_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthStringListPrivate)); - G_OBJECT_CLASS (klass)->finalize = gth_string_list_finalize; } -static void gth_string_list_instance_init (GthStringList * self) { - self->priv = GTH_STRING_LIST_GET_PRIVATE (self); -} - - -GType gth_string_list_get_type (void) { - static GType gth_string_list_type_id = 0; - if (gth_string_list_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthStringListClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_string_list_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthStringList), - 0, - (GInstanceInitFunc) gth_string_list_instance_init, - NULL - }; - gth_string_list_type_id = g_type_register_static (G_TYPE_OBJECT, "GthStringList", &g_define_type_info, 0); - } - return gth_string_list_type_id; +static void +gth_string_list_init (GthStringList *self) { + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_STRING_LIST, GthStringListPrivate); + self->priv->list = NULL; } @@ -134,6 +113,8 @@ GList * gth_string_list_get_list (GthStringList *list) { + if (list == NULL) + return NULL; return list->priv->list; } @@ -206,3 +187,17 @@ if (! g_list_find_custom (list1->priv->list, scan->data, (GCompareFunc) strcmp)) list1->priv->list = g_list_append (list1->priv->list, g_strdup (scan->data)); } + + +GHashTable * +_g_hash_table_from_string_list (GthStringList *list) +{ + GHashTable *h; + GList *scan; + + h = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + for (scan = gth_string_list_get_list (list); scan; scan = scan->next) + g_hash_table_insert (h, g_strdup (scan->data), GINT_TO_POINTER (1)); + + return h; +} diff -Nru gthumb-2.14.3/gthumb/gth-string-list.h gthumb-3.0.0/gthumb/gth-string-list.h --- gthumb-2.14.3/gthumb/gth-string-list.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-string-list.h 2012-02-19 15:01:32.000000000 +0000 @@ -61,6 +61,10 @@ void gth_string_list_append (GthStringList *list1, GthStringList *list2); +/* utilities */ + +GHashTable * _g_hash_table_from_string_list (GthStringList *list); + G_END_DECLS #endif /* GTH_STRING_LIST_H */ diff -Nru gthumb-2.14.3/gthumb/gth-tags-entry.c gthumb-3.0.0/gthumb/gth-tags-entry.c --- gthumb-2.14.3/gthumb/gth-tags-entry.c 2012-03-06 15:35:58.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-tags-entry.c 2012-03-25 13:18:40.000000000 +0000 @@ -38,6 +38,7 @@ enum { EXPANDED_LIST_USED_COLUMN, + EXPANDED_LIST_INCONSISTENT_COLUMN, EXPANDED_LIST_SEPARATOR_COLUMN, EXPANDED_LIST_NAME_COLUMN, EXPANDED_LIST_N_COLUMNS @@ -55,6 +56,7 @@ char *name; gboolean used; gboolean suggested; + gboolean inconsistent; } TagData; @@ -70,19 +72,23 @@ GtkWidget *entry; GtkWidget *expand_button; ExpandedList expanded_list; + gboolean expanded; char **tags; GtkEntryCompletion *completion; GtkListStore *completion_store; char *new_tag; gboolean action_create; gulong monitor_event; + GHashTable *inconsistent; }; -static gpointer parent_class = NULL; static guint signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (GthTagsEntry, gth_tags_entry, GTK_TYPE_BOX) + + static void gth_tags_entry_finalize (GObject *obj) { @@ -96,8 +102,9 @@ g_object_unref (self->priv->completion); g_strfreev (self->priv->tags); g_strfreev (self->priv->expanded_list.last_used); + g_hash_table_unref (self->priv->inconsistent); - G_OBJECT_CLASS (parent_class)->finalize (obj); + G_OBJECT_CLASS (gth_tags_entry_parent_class)->finalize (obj); } @@ -116,7 +123,6 @@ GObjectClass *object_class; GtkWidgetClass *widget_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthTagsEntryPrivate)); object_class = (GObjectClass*) (klass); @@ -237,11 +243,15 @@ tag_data[i] = g_new0 (TagData, 1); tag_data[i]->name = g_strdup (all_tags[i]); - tag_data[i]->suggested = FALSE; tag_data[i]->used = FALSE; + tag_data[i]->inconsistent = (g_hash_table_lookup (self->priv->inconsistent, tag_data[i]->name) != NULL); + tag_data[i]->suggested = tag_data[i]->inconsistent; for (j = 0; ! tag_data[i]->used && (used_tags[j] != NULL); j++) - if (g_utf8_collate (tag_data[i]->name, used_tags[j]) == 0) + if (g_utf8_collate (tag_data[i]->name, used_tags[j]) == 0) { tag_data[i]->used = TRUE; + tag_data[i]->inconsistent = FALSE; + tag_data[i]->suggested = FALSE; + } if (! tag_data[i]->used) for (j = 0; ! tag_data[i]->suggested && (self->priv->expanded_list.last_used[j] != NULL); j++) @@ -272,6 +282,7 @@ gtk_list_store_append (self->priv->expanded_list.store, &iter); gtk_list_store_set (self->priv->expanded_list.store, &iter, EXPANDED_LIST_USED_COLUMN, TRUE, + EXPANDED_LIST_INCONSISTENT_COLUMN, tag_data[i]->inconsistent, EXPANDED_LIST_SEPARATOR_COLUMN, FALSE, EXPANDED_LIST_NAME_COLUMN, tag_data[i]->name, -1); @@ -281,6 +292,7 @@ gtk_list_store_append (self->priv->expanded_list.store, &iter); gtk_list_store_set (self->priv->expanded_list.store, &iter, EXPANDED_LIST_USED_COLUMN, FALSE, + EXPANDED_LIST_INCONSISTENT_COLUMN, FALSE, EXPANDED_LIST_SEPARATOR_COLUMN, TRUE, EXPANDED_LIST_NAME_COLUMN, "", -1); @@ -300,6 +312,7 @@ gtk_list_store_append (self->priv->expanded_list.store, &iter); gtk_list_store_set (self->priv->expanded_list.store, &iter, EXPANDED_LIST_USED_COLUMN, FALSE, + EXPANDED_LIST_INCONSISTENT_COLUMN, tag_data[i]->inconsistent, EXPANDED_LIST_SEPARATOR_COLUMN, FALSE, EXPANDED_LIST_NAME_COLUMN, tag_data[i]->name, -1); @@ -309,6 +322,7 @@ gtk_list_store_append (self->priv->expanded_list.store, &iter); gtk_list_store_set (self->priv->expanded_list.store, &iter, EXPANDED_LIST_USED_COLUMN, FALSE, + EXPANDED_LIST_INCONSISTENT_COLUMN, FALSE, EXPANDED_LIST_SEPARATOR_COLUMN, TRUE, EXPANDED_LIST_NAME_COLUMN, "", -1); @@ -325,6 +339,7 @@ gtk_list_store_append (self->priv->expanded_list.store, &iter); gtk_list_store_set (self->priv->expanded_list.store, &iter, EXPANDED_LIST_USED_COLUMN, FALSE, + EXPANDED_LIST_INCONSISTENT_COLUMN, tag_data[i]->inconsistent, EXPANDED_LIST_SEPARATOR_COLUMN, FALSE, EXPANDED_LIST_NAME_COLUMN, tag_data[i]->name, -1); @@ -530,15 +545,6 @@ g_strfreev (self->priv->tags); self->priv->tags = g_strdupv (gth_tags_file_get_tags (tags)); - for (i = 0; self->priv->tags[i] != NULL; i++) { - GtkTreeIter iter; - - gtk_list_store_append (self->priv->completion_store, &iter); - gtk_list_store_set (self->priv->completion_store, &iter, - COMPLETION_NAME_COLUMN, self->priv->tags[i], - -1); - } - gtk_list_store_clear (self->priv->completion_store); for (i = 0; self->priv->tags[i] != NULL; i++) { GtkTreeIter iter; @@ -617,14 +623,21 @@ tree_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self->priv->expanded_list.tree_view)); if (gtk_tree_model_get_iter (tree_model, &iter, tpath)) { - gboolean used; + char *tag; + gboolean used; gtk_tree_model_get (tree_model, &iter, + EXPANDED_LIST_NAME_COLUMN, &tag, EXPANDED_LIST_USED_COLUMN, &used, -1); + + g_hash_table_remove (self->priv->inconsistent, tag); gtk_list_store_set (GTK_LIST_STORE (tree_model), &iter, EXPANDED_LIST_USED_COLUMN, ! used, + EXPANDED_LIST_INCONSISTENT_COLUMN, FALSE, -1); + + g_free (tag); } update_entry_from_expanded_list (self); @@ -668,22 +681,25 @@ static void -gth_tags_entry_instance_init (GthTagsEntry *self) +gth_tags_entry_init (GthTagsEntry *self) { GtkWidget *hbox; GtkTreeViewColumn *column; GtkCellRenderer *renderer; gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE); + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL); self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TAGS_ENTRY, GthTagsEntryPrivate); self->priv->expanded_list.last_used = g_new0 (char *, 1); + self->priv->expanded = FALSE; + self->priv->inconsistent = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); gtk_box_set_spacing (GTK_BOX (self), 3); /* entry / expander button box */ - hbox = gtk_hbox_new (FALSE, 3); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (self), hbox, FALSE, FALSE, 0); @@ -728,7 +744,11 @@ /* expanded list, the treeview */ - self->priv->expanded_list.store = gtk_list_store_new (EXPANDED_LIST_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_STRING); + self->priv->expanded_list.store = gtk_list_store_new (EXPANDED_LIST_N_COLUMNS, + G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN, + G_TYPE_BOOLEAN, + G_TYPE_STRING); self->priv->expanded_list.tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (self->priv->expanded_list.store)); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (self->priv->expanded_list.tree_view), FALSE); gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (self->priv->expanded_list.tree_view), @@ -748,10 +768,15 @@ gtk_tree_view_column_pack_start (column, renderer, FALSE); gtk_tree_view_column_set_attributes (column, renderer, "active", EXPANDED_LIST_USED_COLUMN, + "inconsistent", EXPANDED_LIST_INCONSISTENT_COLUMN, NULL); /* the name column. */ + renderer = gtk_cell_renderer_pixbuf_new (); + gtk_tree_view_column_pack_start (column, renderer, FALSE); + g_object_set (renderer, "icon-name", "tag", NULL); + renderer = gtk_cell_renderer_text_new (); gtk_tree_view_column_pack_start (column, renderer, TRUE); gtk_tree_view_column_set_attributes (column, renderer, @@ -786,34 +811,6 @@ } -GType -gth_tags_entry_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthTagsEntryClass), - NULL, - NULL, - (GClassInitFunc) gth_tags_entry_class_init, - NULL, - NULL, - sizeof (GthTagsEntry), - 0, - (GInstanceInitFunc) gth_tags_entry_instance_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_VBOX, - "GthTagsEntry", - &g_define_type_info, - 0); - } - - return type; -} - - GtkWidget * gth_tags_entry_new (void) { @@ -827,38 +824,24 @@ } -char ** -gth_tags_entry_get_tags (GthTagsEntry *self, - gboolean update_globals) +void +gth_tags_entry_set_expanded (GthTagsEntry *self, + gboolean expanded) { - GthTagsFile *tags_file; - char **all_tags; - char **tags; - int i; - int j; - - tags_file = gth_main_get_default_tag_file (); + g_return_if_fail (GTH_IS_TAGS_ENTRY (self)); - all_tags = g_strsplit (gtk_entry_get_text (GTK_ENTRY (self->priv->entry)), ",", -1); - tags = g_new0 (char *, g_strv_length (all_tags) + 1); - for (i = 0, j = 0; all_tags[i] != NULL; i++) { - all_tags[i] = g_strstrip (all_tags[i]); - if (all_tags[i][0] != '\0') { - tags[j] = g_strdup (g_strstrip (all_tags[i])); - if (update_globals) - gth_tags_file_add (tags_file, tags[j]); - j++; - } - } - g_strfreev (all_tags); + self->priv->expanded = expanded; + gtk_widget_set_size_request (self->priv->expanded_list.container, -1, self->priv->expanded ? -1 : EXPANDED_LIST_HEIGHT); + gtk_widget_set_visible (self->priv->expand_button, ! expanded); + gtk_widget_set_visible (self->priv->expanded_list.container, expanded || gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->priv->expand_button))); +} - if (update_globals) { - for (i = 0; self->priv->tags[i] != NULL; i++) - gth_tags_file_add (tags_file, self->priv->tags[i]); - gth_main_tags_changed (); - } - return tags; +gboolean +gth_tags_entry_get_expanded (GthTagsEntry *self) +{ + g_return_val_if_fail (GTH_IS_TAGS_ENTRY (self), FALSE); + return self->priv->expanded; } @@ -890,8 +873,8 @@ void -gth_tags_entry_set_text (GthTagsEntry *self, - const char *text) +gth_tags_entry_set_tags_from_text (GthTagsEntry *self, + const char *text) { char **tags; int i; @@ -908,3 +891,87 @@ g_strfreev (tags); } + + +char ** +gth_tags_entry_get_tags (GthTagsEntry *self, + gboolean update_globals) +{ + GthTagsFile *tags_file; + char **all_tags; + char **tags; + int i; + int j; + + tags_file = gth_main_get_default_tag_file (); + + all_tags = g_strsplit (gtk_entry_get_text (GTK_ENTRY (self->priv->entry)), ",", -1); + tags = g_new0 (char *, g_strv_length (all_tags) + 1); + for (i = 0, j = 0; all_tags[i] != NULL; i++) { + all_tags[i] = g_strstrip (all_tags[i]); + if (all_tags[i][0] != '\0') { + tags[j] = g_strdup (g_strstrip (all_tags[i])); + if (update_globals) + gth_tags_file_add (tags_file, tags[j]); + j++; + } + } + g_strfreev (all_tags); + + if (update_globals) { + for (i = 0; self->priv->tags[i] != NULL; i++) + gth_tags_file_add (tags_file, self->priv->tags[i]); + gth_main_tags_changed (); + } + + return tags; +} + + +void +gth_tags_entry_set_tag_list (GthTagsEntry *self, + GList *checked, + GList *inconsistent) +{ + GString *str; + GList *scan; + + g_hash_table_remove_all (self->priv->inconsistent); + for (scan = inconsistent; scan; scan = scan->next) + g_hash_table_insert (self->priv->inconsistent, g_strdup (scan->data), GINT_TO_POINTER (1)); + + str = g_string_new (""); + for (scan = checked; scan; scan = scan->next) { + if (scan != checked) + g_string_append (str, ", "); + g_string_append (str, (char *) scan->data); + } + gth_tags_entry_set_tags_from_text (self, str->str); + + if (checked == NULL) + update_expanded_list_from_entry (self); + + g_string_free (str, TRUE); +} + + +void +gth_tags_entry_get_tag_list (GthTagsEntry *self, + gboolean update_globals, + GList **checked, + GList **inconsistent) +{ + if (checked != NULL) { + char **tags_v; + int i; + + tags_v = gth_tags_entry_get_tags (self, update_globals); + *checked = NULL; + for (i = 0; tags_v[i] != NULL; i++) + *checked = g_list_prepend (*checked, g_strdup (tags_v[i])); + *checked = g_list_reverse (*checked); + } + + if (inconsistent != NULL) + *inconsistent = g_hash_table_get_keys (self->priv->inconsistent); +} diff -Nru gthumb-2.14.3/gthumb/gth-tags-entry.h gthumb-3.0.0/gthumb/gth-tags-entry.h --- gthumb-2.14.3/gthumb/gth-tags-entry.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-tags-entry.h 2012-03-06 15:26:06.000000000 +0000 @@ -38,26 +38,36 @@ typedef struct _GthTagsEntryPrivate GthTagsEntryPrivate; struct _GthTagsEntry { - GtkVBox parent_instance; + GtkBox parent_instance; GthTagsEntryPrivate *priv; }; struct _GthTagsEntryClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; /*< signals >*/ void (*list_collapsed) (GthTagsEntry *self); }; -GType gth_tags_entry_get_type (void); -GtkWidget * gth_tags_entry_new (void); -char ** gth_tags_entry_get_tags (GthTagsEntry *self, - gboolean update_globals); -void gth_tags_entry_set_tags (GthTagsEntry *self, - char **tags); -void gth_tags_entry_set_text (GthTagsEntry *self, - const char *text); +GType gth_tags_entry_get_type (void); +GtkWidget * gth_tags_entry_new (void); +void gth_tags_entry_set_expanded (GthTagsEntry *self, + gboolean expanded); +gboolean gth_tags_entry_get_expanded (GthTagsEntry *self); +void gth_tags_entry_set_tags (GthTagsEntry *self, + char **tags); +void gth_tags_entry_set_tags_from_text (GthTagsEntry *self, + const char *text); +char ** gth_tags_entry_get_tags (GthTagsEntry *self, + gboolean update_globals); +void gth_tags_entry_set_tag_list (GthTagsEntry *self, + GList *checked, + GList *inconsistent); +void gth_tags_entry_get_tag_list (GthTagsEntry *self, + gboolean update_globals, + GList **checked, + GList **inconsistent); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/gth-task.c gthumb-3.0.0/gthumb/gth-task.c --- gthumb-2.14.3/gthumb/gth-task.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-task.c 2012-02-19 15:01:32.000000000 +0000 @@ -42,7 +42,6 @@ }; -static GObjectClass *parent_class = NULL; static guint gth_task_signals[LAST_SIGNAL] = { 0 }; @@ -53,6 +52,9 @@ } +G_DEFINE_TYPE (GthTask, gth_task, G_TYPE_OBJECT) + + static void gth_task_finalize (GObject *object) { @@ -65,21 +67,21 @@ g_object_unref (task->priv->cancellable); } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_task_parent_class)->finalize (object); } static void base_exec (GthTask *task) { - /*gth_task_completed (task, NULL);*/ + /* void */ } static void base_cancelled (GthTask *task) { - /*gth_task_completed (task, g_error_new_literal (GTH_TASK_ERROR, GTH_TASK_ERROR_CANCELLED, ""));*/ + /* void */ } @@ -88,7 +90,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthTaskPrivate)); object_class = (GObjectClass*) class; @@ -148,34 +149,6 @@ } -GType -gth_task_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTaskClass), - NULL, - NULL, - (GClassInitFunc) gth_task_class_init, - NULL, - NULL, - sizeof (GthTask), - 0, - (GInstanceInitFunc) gth_task_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthTask", - &type_info, - 0); - } - - return type; -} - - static void cancellable_cancelled_cb (GCancellable *cancellable, gpointer user_data) diff -Nru gthumb-2.14.3/gthumb/gth-test.c gthumb-3.0.0/gthumb/gth-test.c --- gthumb-2.14.3/gthumb/gth-test.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-test.c 2012-03-24 13:10:15.000000000 +0000 @@ -52,8 +52,7 @@ }; -static gpointer parent_class = NULL; -static GthDuplicableIface *gth_duplicable_parent_iface = NULL; +static GthDuplicableInterface *gth_duplicable_parent_iface = NULL; static guint gth_test_signals[LAST_SIGNAL] = { 0 }; @@ -64,6 +63,16 @@ } +static void gth_test_gth_duplicable_interface_init (GthDuplicableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthTest, + gth_test, + G_TYPE_OBJECT, + G_IMPLEMENT_INTERFACE (GTH_TYPE_DUPLICABLE, + gth_test_gth_duplicable_interface_init)) + + static void gth_test_finalize (GObject *object) { @@ -76,7 +85,7 @@ g_free (self->priv->display_name); g_free (self->files); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_test_parent_class)->finalize (object); } @@ -105,6 +114,7 @@ static void base_reset (GthTest *self) { + /* void */ } @@ -257,7 +267,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthTestPrivate)); object_class = (GObjectClass*) klass; @@ -319,7 +328,7 @@ static void -gth_test_gth_duplicable_interface_init (GthDuplicableIface *iface) +gth_test_gth_duplicable_interface_init (GthDuplicableInterface *iface) { gth_duplicable_parent_iface = g_type_interface_peek_parent (iface); iface->duplicate = gth_test_real_duplicate; @@ -337,40 +346,6 @@ } -GType -gth_test_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTestClass), - NULL, - NULL, - (GClassInitFunc) gth_test_class_init, - NULL, - NULL, - sizeof (GthTest), - 0, - (GInstanceInitFunc) gth_test_init - }; - static const GInterfaceInfo gth_duplicable_info = { - (GInterfaceInitFunc) gth_test_gth_duplicable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthTest", - &type_info, - 0); - g_type_add_interface_static (type, GTH_TYPE_DUPLICABLE, >h_duplicable_info); - } - - return type; -} - - GthTest * gth_test_new (void) { diff -Nru gthumb-2.14.3/gthumb/gth-test-category.c gthumb-3.0.0/gthumb/gth-test-category.c --- gthumb-2.14.3/gthumb/gth-test-category.c 2012-03-06 15:33:59.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-test-category.c 2012-03-06 15:26:06.000000000 +0000 @@ -63,9 +63,21 @@ }; -static gpointer parent_class = NULL; -static DomDomizableIface *dom_domizable_parent_iface = NULL; -static GthDuplicableIface *gth_duplicable_parent_iface = NULL; +static DomDomizableInterface *dom_domizable_parent_iface = NULL; +static GthDuplicableInterface *gth_duplicable_parent_iface = NULL; + + +static void gth_test_category_dom_domizable_interface_init (DomDomizableInterface * iface); +static void gth_test_category_gth_duplicable_interface_init (GthDuplicableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthTestCategory, + gth_test_category, + GTH_TYPE_TEST, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + gth_test_category_dom_domizable_interface_init) + G_IMPLEMENT_INTERFACE (GTH_TYPE_DUPLICABLE, + gth_test_category_gth_duplicable_interface_init)) static void @@ -85,7 +97,7 @@ test->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_test_category_parent_class)->finalize (object); } @@ -178,7 +190,7 @@ test = (GthTestCategory *) base; - control = gtk_hbox_new (FALSE, 6); + control = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); g_signal_connect (control, "destroy", G_CALLBACK (gtk_widget_destroyed), @@ -413,11 +425,10 @@ GObjectClass *object_class; GthTestClass *test_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - test_class = (GthTestClass *) class; - object_class->finalize = gth_test_category_finalize; + + test_class = (GthTestClass *) class; test_class->create_control = gth_test_category_real_create_control; test_class->update_from_control = gth_test_category_real_update_from_control; test_class->match = gth_test_category_real_match; @@ -425,7 +436,7 @@ static void -gth_test_category_dom_domizable_interface_init (DomDomizableIface * iface) +gth_test_category_dom_domizable_interface_init (DomDomizableInterface * iface) { dom_domizable_parent_iface = g_type_interface_peek_parent (iface); iface->create_element = gth_test_category_real_create_element; @@ -434,7 +445,7 @@ static void -gth_test_category_gth_duplicable_interface_init (GthDuplicableIface *iface) +gth_test_category_gth_duplicable_interface_init (GthDuplicableInterface *iface) { gth_duplicable_parent_iface = g_type_interface_peek_parent (iface); iface->duplicate = gth_test_category_real_duplicate; @@ -449,46 +460,6 @@ } -GType -gth_test_category_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTestCategoryClass), - NULL, - NULL, - (GClassInitFunc) gth_test_category_class_init, - NULL, - NULL, - sizeof (GthTestCategory), - 0, - (GInstanceInitFunc) gth_test_category_init - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) gth_test_category_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo gth_duplicable_info = { - (GInterfaceInitFunc) gth_test_category_gth_duplicable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (GTH_TYPE_TEST, - "GthTestCategory", - &type_info, - 0); - g_type_add_interface_static (type, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - g_type_add_interface_static (type, GTH_TYPE_DUPLICABLE, >h_duplicable_info); - } - - return type; -} - - void gth_test_category_set (GthTestCategory *self, GthTestOp op, diff -Nru gthumb-2.14.3/gthumb/gth-test-chain.c gthumb-3.0.0/gthumb/gth-test-chain.c --- gthumb-2.14.3/gthumb/gth-test-chain.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-test-chain.c 2012-03-24 15:41:05.000000000 +0000 @@ -36,9 +36,21 @@ }; -static GthTestClass *parent_class = NULL; -static DomDomizableIface *dom_domizable_parent_iface = NULL; -static GthDuplicableIface *gth_duplicable_parent_iface = NULL; +static DomDomizableInterface *dom_domizable_parent_iface = NULL; +static GthDuplicableInterface *gth_duplicable_parent_iface = NULL; + + +static void gth_test_chain_dom_domizable_interface_init (DomDomizableInterface * iface); +static void gth_test_chain_gth_duplicable_interface_init (GthDuplicableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthTestChain, + gth_test_chain, + GTH_TYPE_TEST, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + gth_test_chain_dom_domizable_interface_init) + G_IMPLEMENT_INTERFACE (GTH_TYPE_DUPLICABLE, + gth_test_chain_gth_duplicable_interface_init)) static void @@ -56,7 +68,7 @@ test->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_test_chain_parent_class)->finalize (object); } @@ -120,6 +132,21 @@ } +static void +gth_test_chain_class_init (GthTestChainClass *class) +{ + GObjectClass *object_class; + GthTestClass *test_class; + + object_class = (GObjectClass*) class; + object_class->finalize = gth_test_chain_finalize; + + test_class = (GthTestClass *) class; + test_class->match = gth_test_chain_match; + test_class->get_attributes = gth_test_chain_get_attributes; +} + + static DomElement* gth_test_chain_real_create_element (DomDomizable *base, DomDocument *doc) @@ -179,6 +206,15 @@ } +static void +gth_test_chain_dom_domizable_interface_init (DomDomizableInterface * iface) +{ + dom_domizable_parent_iface = g_type_interface_peek_parent (iface); + iface->create_element = gth_test_chain_real_create_element; + iface->load_from_element = gth_test_chain_real_load_from_element; +} + + GObject * gth_test_chain_real_duplicate (GthDuplicable *duplicable) { @@ -199,32 +235,7 @@ static void -gth_test_chain_class_init (GthTestChainClass *class) -{ - GObjectClass *object_class; - GthTestClass *test_class; - - parent_class = g_type_class_peek_parent (class); - object_class = (GObjectClass*) class; - test_class = (GthTestClass *) class; - - object_class->finalize = gth_test_chain_finalize; - test_class->match = gth_test_chain_match; - test_class->get_attributes = gth_test_chain_get_attributes; -} - - -static void -gth_test_chain_dom_domizable_interface_init (DomDomizableIface * iface) -{ - dom_domizable_parent_iface = g_type_interface_peek_parent (iface); - iface->create_element = gth_test_chain_real_create_element; - iface->load_from_element = gth_test_chain_real_load_from_element; -} - - -static void -gth_test_chain_gth_duplicable_interface_init (GthDuplicableIface *iface) +gth_test_chain_gth_duplicable_interface_init (GthDuplicableInterface *iface) { gth_duplicable_parent_iface = g_type_interface_peek_parent (iface); iface->duplicate = gth_test_chain_real_duplicate; @@ -238,46 +249,6 @@ } -GType -gth_test_chain_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTestChainClass), - NULL, - NULL, - (GClassInitFunc) gth_test_chain_class_init, - NULL, - NULL, - sizeof (GthTestChain), - 0, - (GInstanceInitFunc) gth_test_chain_init - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) gth_test_chain_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo gth_duplicable_info = { - (GInterfaceInitFunc) gth_test_chain_gth_duplicable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (GTH_TYPE_TEST, - "GthTestChain", - &type_info, - 0); - g_type_add_interface_static (type, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - g_type_add_interface_static (type, GTH_TYPE_DUPLICABLE, >h_duplicable_info); - } - - return type; -} - - GthTest * gth_test_chain_new (GthMatchType match_type, GthTest *test, diff -Nru gthumb-2.14.3/gthumb/gth-test-selector.c gthumb-3.0.0/gthumb/gth-test-selector.c --- gthumb-2.14.3/gthumb/gth-test-selector.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-test-selector.c 2012-03-06 15:26:06.000000000 +0000 @@ -52,10 +52,12 @@ }; -static gpointer parent_class = NULL; static guint gth_test_selector_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (GthTestSelector, gth_test_selector, GTK_TYPE_BOX) + + static void gth_test_selector_finalize (GObject *object) { @@ -70,15 +72,13 @@ selector->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_test_selector_parent_class)->finalize (object); } static void gth_test_selector_class_init (GthTestSelectorClass *klass) { - parent_class = g_type_class_peek_parent (klass); - G_OBJECT_CLASS (klass)->finalize = gth_test_selector_finalize; /* signals */ @@ -105,36 +105,10 @@ static void -gth_test_selector_instance_init (GthTestSelector *self) +gth_test_selector_init (GthTestSelector *self) { self->priv = g_new0 (GthTestSelectorPrivate, 1); -} - - -GType -gth_test_selector_get_type (void) -{ - static GType type_id = 0; - - if (type_id == 0) { - static const GTypeInfo type_info = { - sizeof (GthTestSelectorClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_test_selector_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthTestSelector), - 0, - (GInstanceInitFunc) gth_test_selector_instance_init, - NULL - }; - type_id = g_type_register_static (GTK_TYPE_HBOX, - "GthTestSelector", - &type_info, - 0); - } - return type_id; + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_HORIZONTAL); } @@ -267,7 +241,7 @@ /* test control box */ - self->priv->control_box = gtk_hbox_new (FALSE, 0); + self->priv->control_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (self->priv->control_box); /**/ @@ -296,10 +270,10 @@ /**/ - vbox = gtk_vbox_new (FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox); - hbox = gtk_hbox_new (FALSE, 6); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX (hbox), self->priv->test_combo_box, FALSE, FALSE, 0); diff -Nru gthumb-2.14.3/gthumb/gth-test-selector.h gthumb-3.0.0/gthumb/gth-test-selector.h --- gthumb-2.14.3/gthumb/gth-test-selector.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-test-selector.h 2012-03-06 15:26:06.000000000 +0000 @@ -39,12 +39,12 @@ typedef struct _GthTestSelectorPrivate GthTestSelectorPrivate; struct _GthTestSelector { - GtkHBox parent_instance; + GtkBox parent_instance; GthTestSelectorPrivate * priv; }; struct _GthTestSelectorClass { - GtkHBoxClass parent_class; + GtkBoxClass parent_class; void (*add_test) (GthTestSelector *selector); void (*remove_test) (GthTestSelector *selector); diff -Nru gthumb-2.14.3/gthumb/gth-test-simple.c gthumb-3.0.0/gthumb/gth-test-simple.c --- gthumb-2.14.3/gthumb/gth-test-simple.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-test-simple.c 2012-02-19 15:01:32.000000000 +0000 @@ -112,9 +112,21 @@ }; -static GthTestClass *parent_class = NULL; -static DomDomizableIface* dom_domizable_parent_iface = NULL; -static GthDuplicableIface *gth_duplicable_parent_iface = NULL; +static DomDomizableInterface* dom_domizable_parent_iface = NULL; +static GthDuplicableInterface *gth_duplicable_parent_iface = NULL; + + +static void gth_test_simple_dom_domizable_interface_init (DomDomizableInterface * iface); +static void gth_test_simple_gth_duplicable_interface_init (GthDuplicableInterface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthTestSimple, + gth_test_simple, + GTH_TYPE_TEST, + G_IMPLEMENT_INTERFACE (DOM_TYPE_DOMIZABLE, + gth_test_simple_dom_domizable_interface_init) + G_IMPLEMENT_INTERFACE (GTH_TYPE_DUPLICABLE, + gth_test_simple_gth_duplicable_interface_init)) static void @@ -158,7 +170,7 @@ test->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_test_simple_parent_class)->finalize (object); } @@ -223,7 +235,7 @@ int i, op_idx, size_idx; gboolean size_set = FALSE; - control = gtk_hbox_new (FALSE, 6); + control = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); /* text operation combo box */ @@ -323,7 +335,7 @@ GtkWidget *control; int i, op_idx; - control = gtk_hbox_new (FALSE, 6); + control = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); /* text operation combo box */ @@ -398,7 +410,7 @@ GtkWidget *control; int i, op_idx; - control = gtk_hbox_new (FALSE, 6); + control = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); /* date operation combo box */ @@ -1056,13 +1068,12 @@ GObjectClass *object_class; GthTestClass *test_class; - parent_class = g_type_class_peek_parent (class); object_class = (GObjectClass*) class; - test_class = (GthTestClass *) class; - object_class->set_property = gth_test_simple_set_property; object_class->get_property = gth_test_simple_get_property; object_class->finalize = gth_test_simple_finalize; + + test_class = (GthTestClass *) class; test_class->create_control = gth_test_simple_real_create_control; test_class->update_from_control = gth_test_simple_real_update_from_control; test_class->match = gth_test_simple_real_match; @@ -1125,7 +1136,7 @@ static void -gth_test_simple_dom_domizable_interface_init (DomDomizableIface * iface) +gth_test_simple_dom_domizable_interface_init (DomDomizableInterface * iface) { dom_domizable_parent_iface = g_type_interface_peek_parent (iface); iface->create_element = gth_test_simple_real_create_element; @@ -1134,7 +1145,7 @@ static void -gth_test_simple_gth_duplicable_interface_init (GthDuplicableIface *iface) +gth_test_simple_gth_duplicable_interface_init (GthDuplicableInterface *iface) { gth_duplicable_parent_iface = g_type_interface_peek_parent (iface); iface->duplicate = gth_test_simple_real_duplicate; @@ -1148,46 +1159,6 @@ } -GType -gth_test_simple_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTestSimpleClass), - NULL, - NULL, - (GClassInitFunc) gth_test_simple_class_init, - NULL, - NULL, - sizeof (GthTestSimple), - 0, - (GInstanceInitFunc) gth_test_simple_init - }; - static const GInterfaceInfo dom_domizable_info = { - (GInterfaceInitFunc) gth_test_simple_dom_domizable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - static const GInterfaceInfo gth_duplicable_info = { - (GInterfaceInitFunc) gth_test_simple_gth_duplicable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (GTH_TYPE_TEST, - "GthTestSimple", - &type_info, - 0); - g_type_add_interface_static (type, DOM_TYPE_DOMIZABLE, &dom_domizable_info); - g_type_add_interface_static (type, GTH_TYPE_DUPLICABLE, >h_duplicable_info); - } - - return type; -} - - void gth_test_simple_set_data_as_string (GthTestSimple *test, const char *s) diff -Nru gthumb-2.14.3/gthumb/gth-thumb-loader.c gthumb-3.0.0/gthumb/gth-thumb-loader.c --- gthumb-2.14.3/gthumb/gth-thumb-loader.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-thumb-loader.c 2012-03-24 14:30:07.000000000 +0000 @@ -72,7 +72,7 @@ }; -static GObjectClass *parent_class = NULL; +G_DEFINE_TYPE (GthThumbLoader, gth_thumb_loader, G_TYPE_OBJECT) static void @@ -84,7 +84,7 @@ _g_object_unref (self->priv->iloader); _g_object_unref (self->priv->tloader); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_thumb_loader_parent_class)->finalize (object); } @@ -93,7 +93,6 @@ { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthThumbLoaderPrivate)); object_class = G_OBJECT_CLASS (class); @@ -111,34 +110,6 @@ } -GType -gth_thumb_loader_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthThumbLoaderClass), - NULL, - NULL, - (GClassInitFunc) gth_thumb_loader_class_init, - NULL, - NULL, - sizeof (GthThumbLoader), - 0, - (GInstanceInitFunc) gth_thumb_loader_init - }; - - type = g_type_register_static (G_TYPE_OBJECT, - "GthThumbLoader", - &type_info, - 0); - } - - return type; -} - - static GthImage * generate_thumbnail (GthFileData *file_data, int requested_size, diff -Nru gthumb-2.14.3/gthumb/gth-time-selector.c gthumb-3.0.0/gthumb/gth-time-selector.c --- gthumb-2.14.3/gthumb/gth-time-selector.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-time-selector.c 2012-03-24 15:47:22.000000000 +0000 @@ -52,10 +52,12 @@ }; -static GtkHBoxClass *parent_class = NULL; static guint gth_time_selector_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (GthTimeSelector, gth_time_selector, GTK_TYPE_BOX); + + static void gth_time_selector_finalize (GObject *object) { @@ -66,16 +68,15 @@ gtk_widget_destroy (self->priv->calendar_popup); gth_datetime_free (self->priv->date_time); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_time_selector_parent_class)->finalize (object); } static void gth_time_selector_class_init (GthTimeSelectorClass *class) { - GObjectClass *object_class; + GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (GthTimeSelectorPrivate)); object_class = (GObjectClass*) class; @@ -99,6 +100,8 @@ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TIME_SELECTOR, GthTimeSelectorPrivate); self->priv->date_time = gth_datetime_new (); self->priv->use_time = TRUE; + + gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_HORIZONTAL); } @@ -106,8 +109,9 @@ hide_calendar_popup (GthTimeSelector *self) { gtk_grab_remove (self->priv->calendar_popup); - gdk_keyboard_ungrab (GDK_CURRENT_TIME); - gdk_pointer_ungrab (GDK_CURRENT_TIME); + /*gdk_keyboard_ungrab (GDK_CURRENT_TIME);*/ + gdk_device_ungrab (gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gdk_window_get_display (gtk_widget_get_window (self->priv->calendar_popup)))), + GDK_CURRENT_TIME); gtk_widget_hide (self->priv->calendar_popup); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->priv->calendar_button), FALSE); @@ -117,16 +121,16 @@ static void show_calendar_popup (GthTimeSelector *self) { - GtkRequisition popup_req; - int x; - int y; - GtkAllocation allocation; - int selector_height; - GdkScreen *screen; - gint monitor_num; - GdkRectangle monitor; + GtkRequisition popup_req; + int x; + int y; + GtkAllocation allocation; + int selector_height; + GdkScreen *screen; + gint monitor_num; + cairo_rectangle_int_t monitor; - gtk_widget_size_request (self->priv->popup_box, &popup_req); + gtk_widget_get_preferred_size (self->priv->popup_box, &popup_req, NULL); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->priv->calendar_button), TRUE); @@ -152,18 +156,18 @@ gtk_window_move (GTK_WINDOW (self->priv->calendar_popup), x, y); gtk_widget_show (self->priv->calendar_popup); - gdk_keyboard_grab (gtk_widget_get_window (self->priv->calendar_popup), TRUE, GDK_CURRENT_TIME); + /*gdk_keyboard_grab (gtk_widget_get_window (self->priv->calendar_popup), TRUE, GDK_CURRENT_TIME);*/ gtk_grab_add (self->priv->calendar_popup); - gdk_pointer_grab (gtk_widget_get_window (self->priv->calendar_popup), - TRUE, - (GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON_MOTION_MASK - | GDK_EXTENSION_EVENTS_ALL), - NULL, - NULL, - GDK_CURRENT_TIME); + gdk_device_grab (gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gdk_window_get_display (gtk_widget_get_window (self->priv->calendar_popup)))), + gtk_widget_get_window (self->priv->calendar_popup), + GDK_OWNERSHIP_WINDOW, + TRUE, + (GDK_BUTTON_PRESS_MASK + | GDK_BUTTON_RELEASE_MASK + | GDK_POINTER_MOTION_HINT_MASK + | GDK_BUTTON_MOTION_MASK), + NULL, + GDK_CURRENT_TIME); gtk_widget_grab_focus (self->priv->calendar); } @@ -340,15 +344,14 @@ GdkEventButton *event, gpointer user_data) { - GthTimeSelector *self = user_data; - GdkRectangle popup_area; + GthTimeSelector *self = user_data; + cairo_rectangle_int_t popup_area; gdk_window_get_geometry (gtk_widget_get_window (self->priv->calendar_popup), &popup_area.x, &popup_area.y, &popup_area.width, - &popup_area.height, - NULL); + &popup_area.height); /*g_print ("(%.0f, %.0f) <==> (%d, %d)[%d, %d]\n", event->x_root, event->y_root, popup_area.x, popup_area.y, popup_area.width, popup_area.height);*/ @@ -372,7 +375,7 @@ GthTimeSelector *self = user_data; switch (event->keyval) { - case GDK_Escape: + case GDK_KEY_Escape: hide_calendar_popup (self); break; @@ -414,7 +417,7 @@ g_object_set (self, "spacing", 6, NULL); - box = gtk_hbox_new (FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (box); gtk_box_pack_start (GTK_BOX (self), box, FALSE, FALSE, 0); @@ -448,7 +451,7 @@ gtk_widget_show (frame); gtk_container_add (GTK_CONTAINER (self->priv->calendar_popup), frame); - box = gtk_vbox_new (FALSE, 6); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_set_border_width (GTK_CONTAINER (box), 6); gtk_widget_show (box); gtk_container_add (GTK_CONTAINER (frame), box); @@ -466,7 +469,8 @@ G_CALLBACK (calendar_day_selected_cb), self); - button_box = gtk_hbox_new (TRUE, 6); + button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + gtk_box_set_homogeneous (GTK_BOX (button_box), TRUE); gtk_widget_show (button_box); gtk_box_pack_start (GTK_BOX (box), button_box, FALSE, FALSE, 0); @@ -486,7 +490,7 @@ G_CALLBACK (now_button_clicked_cb), self); - time_box = gtk_hbox_new (FALSE, 0); + time_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (time_box); gtk_box_pack_start (GTK_BOX (self), time_box, FALSE, FALSE, 0); @@ -534,34 +538,6 @@ } -GType -gth_time_selector_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthTimeSelectorClass), - NULL, - NULL, - (GClassInitFunc) gth_time_selector_class_init, - NULL, - NULL, - sizeof (GthTimeSelector), - 0, - (GInstanceInitFunc) gth_time_selector_init - }; - - type = g_type_register_static (GTK_TYPE_HBOX, - "GthTimeSelector", - &type_info, - 0); - } - - return type; -} - - GtkWidget * gth_time_selector_new (void) { diff -Nru gthumb-2.14.3/gthumb/gth-time-selector.h gthumb-3.0.0/gthumb/gth-time-selector.h --- gthumb-2.14.3/gthumb/gth-time-selector.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-time-selector.h 2012-03-06 15:26:06.000000000 +0000 @@ -40,13 +40,13 @@ struct _GthTimeSelector { - GtkHBox __parent; + GtkBox __parent; GthTimeSelectorPrivate *priv; }; struct _GthTimeSelectorClass { - GtkHBoxClass __parent_class; + GtkBoxClass __parent_class; /* -- Signals -- */ diff -Nru gthumb-2.14.3/gthumb/gth-toggle-menu-action.c gthumb-3.0.0/gthumb/gth-toggle-menu-action.c --- gthumb-2.14.3/gthumb/gth-toggle-menu-action.c 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-toggle-menu-action.c 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,186 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include "gth-toggle-menu-action.h" +#include "gth-toggle-menu-tool-button.h" + + +G_DEFINE_TYPE (GthToggleMenuAction, gth_toggle_menu_action, GTK_TYPE_TOGGLE_ACTION) + + +/* Properties */ +enum { + PROP_0, + PROP_MENU +}; + + +struct _GthToggleMenuActionPrivate { + GtkWidget *menu; + GthShowMenuFunc show_menu_func; + gpointer show_menu_data; + GDestroyNotify show_menu_data_destroy; +}; + + +static void +gth_toggle_menu_action_init (GthToggleMenuAction *self) +{ + self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GTH_TYPE_TOGGLE_MENU_ACTION, GthToggleMenuActionPrivate); + self->priv->menu = gtk_menu_new (); + g_object_ref_sink (self->priv->menu); +} + + + +static void +gth_toggle_menu_action_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + GthToggleMenuAction *self = GTH_TOGGLE_MENU_ACTION (object); + + switch (property_id) { + case PROP_MENU: + if (self->priv->menu != NULL) + g_object_unref (self->priv->menu); + self->priv->menu = g_value_dup_object (value); + break; + + default: + break; + } +} + + +static void +gth_toggle_menu_action_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + GthToggleMenuAction *self = GTH_TOGGLE_MENU_ACTION (object); + + switch (property_id) { + case PROP_MENU: + g_value_set_object (value, self->priv->menu); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + + +static void +tool_item_show_menu_cb (GthToggleMenuToolButton *button, + gpointer user_data) +{ + GthToggleMenuAction *self = user_data; + + self->priv->show_menu_func (GTK_ACTION (self), self->priv->show_menu_data); +} + + +static GtkWidget * +gth_toggle_menu_action_create_tool_item (GtkAction *action) +{ + GthToggleMenuAction *self = GTH_TOGGLE_MENU_ACTION (action); + GtkWidget *tool_item; + + tool_item = g_object_new (GTH_TYPE_TOGGLE_MENU_TOOL_BUTTON, NULL); + if (self->priv->show_menu_func != NULL) + g_signal_connect (tool_item, + "show_menu", + G_CALLBACK (tool_item_show_menu_cb), + self); + + return tool_item; +} + + +static void +gth_toggle_menu_action_finalize (GObject *base) +{ + GthToggleMenuAction *self = GTH_TOGGLE_MENU_ACTION (base); + + if (self->priv->show_menu_data_destroy != NULL) + self->priv->show_menu_data_destroy (self->priv->show_menu_data); + if (self->priv->menu != NULL) + g_object_unref (self->priv->menu); + + G_OBJECT_CLASS (gth_toggle_menu_action_parent_class)->finalize (base); +} + + +static void +gth_toggle_menu_action_class_init (GthToggleMenuActionClass *klass) +{ + GObjectClass *object_class; + GtkActionClass *action_class; + + g_type_class_add_private (klass, sizeof (GthToggleMenuActionPrivate)); + + object_class = (GObjectClass *) klass; + object_class->set_property = gth_toggle_menu_action_set_property; + object_class->get_property = gth_toggle_menu_action_get_property; + object_class->finalize = gth_toggle_menu_action_finalize; + + action_class = (GtkActionClass *) klass; + action_class->toolbar_item_type = GTH_TYPE_TOGGLE_MENU_TOOL_BUTTON; + action_class->create_tool_item = gth_toggle_menu_action_create_tool_item; + + /* properties */ + + g_object_class_install_property (object_class, + PROP_MENU, + g_param_spec_object ("menu", + "Menu", + "The menu to show", + GTK_TYPE_MENU, + G_PARAM_READWRITE)); +} + + +void +gth_toggle_menu_action_set_show_menu_func (GthToggleMenuAction *self, + GthShowMenuFunc func, + gpointer data, + GDestroyNotify destroy) +{ + self->priv->show_menu_func = func; + if (self->priv->show_menu_data_destroy != NULL) + self->priv->show_menu_data_destroy (self->priv->show_menu_data); + self->priv->show_menu_data = data; + self->priv->show_menu_data_destroy = destroy; +} + + +GtkWidget * +gth_toggle_menu_action_get_menu (GthToggleMenuAction *self) +{ + return self->priv->menu; +} diff -Nru gthumb-2.14.3/gthumb/gth-toggle-menu-action.h gthumb-3.0.0/gthumb/gth-toggle-menu-action.h --- gthumb-2.14.3/gthumb/gth-toggle-menu-action.h 1970-01-01 00:00:00.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-toggle-menu-action.h 2012-02-19 15:01:32.000000000 +0000 @@ -0,0 +1,62 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * GThumb + * + * Copyright (C) 2011 Free Software Foundation, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef GTH_TOGGLE_MENU_ACTION_H +#define GTH_TOGGLE_MENU_ACTION_H + +#include + +G_BEGIN_DECLS + +typedef void (*GthShowMenuFunc) (GtkAction *action, + gpointer user_data); + +#define GTH_TYPE_TOGGLE_MENU_ACTION (gth_toggle_menu_action_get_type ()) +#define GTH_TOGGLE_MENU_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_TOGGLE_MENU_ACTION, GthToggleMenuAction)) +#define GTH_TOGGLE_MENU_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTH_TYPE_TOGGLE_MENU_ACTION, GthToggleMenuActionClass)) +#define GTH_IS_TOGGLE_MENU_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_TOGGLE_MENU_ACTION)) +#define GTH_IS_TOGGLE_MENU_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GTH_TYPE_TOGGLE_MENU_ACTION)) +#define GTH_TOGGLE_MENU_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTH_TYPE_TOGGLE_MENU_ACTION, GthToggleMenuActionClass)) + +typedef struct _GthToggleMenuAction GthToggleMenuAction; +typedef struct _GthToggleMenuActionClass GthToggleMenuActionClass; +typedef struct _GthToggleMenuActionPrivate GthToggleMenuActionPrivate; + +struct _GthToggleMenuAction { + GtkToggleAction parent; + GthToggleMenuActionPrivate *priv; +}; + +struct _GthToggleMenuActionClass { + GtkToggleActionClass parent_class; +}; + +GType gth_toggle_menu_action_get_type (void) G_GNUC_CONST; +void gth_toggle_menu_action_set_show_menu_func (GthToggleMenuAction *action, + GthShowMenuFunc func, + gpointer data, + GDestroyNotify destroy); +GtkWidget * gth_toggle_menu_action_get_menu (GthToggleMenuAction *action); + +G_END_DECLS + +#endif /* GTH_TOGGLE_MENU_ACTION_H */ + diff -Nru gthumb-2.14.3/gthumb/gth-toggle-menu-tool-button.c gthumb-3.0.0/gthumb/gth-toggle-menu-tool-button.c --- gthumb-2.14.3/gthumb/gth-toggle-menu-tool-button.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-toggle-menu-tool-button.c 2012-02-19 15:01:32.000000000 +0000 @@ -21,6 +21,7 @@ #include #include +#include "gth-toggle-menu-action.h" #include "gth-toggle-menu-tool-button.h" #define MENU_ID "gth-toggle-menu-tool-button-menu-id" @@ -28,6 +29,7 @@ struct _GthToggleMenuToolButtonPrivate { guint active : 1; guint use_underline : 1; + guint contents_invalid : 1; char *stock_id; char *icon_name; char *label_text; @@ -52,11 +54,21 @@ PROP_MENU }; -static gpointer parent_class = NULL; + static GtkActivatableIface *parent_activatable_iface; static int signals[LAST_SIGNAL]; +static void gth_toggle_menu_tool_button_gtk_activable_interface_init (GtkActivatableIface *iface); + + +G_DEFINE_TYPE_WITH_CODE (GthToggleMenuToolButton, + gth_toggle_menu_tool_button, + GTK_TYPE_TOOL_ITEM, + G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE, + gth_toggle_menu_tool_button_gtk_activable_interface_init)) + + gchar * _gtk_toolbar_elide_underscores (const gchar *original) { @@ -119,6 +131,8 @@ GtkOrientation text_orientation = GTK_ORIENTATION_HORIZONTAL; GtkSizeGroup *size_group = NULL; + button->priv->contents_invalid = FALSE; + gtk_widget_style_get (GTK_WIDGET (tool_item), "icon-spacing", &icon_spacing, NULL); @@ -278,14 +292,14 @@ if (size_group != NULL) gtk_size_group_add_widget (size_group, arrow_align); - main_box = gtk_hbox_new (FALSE, icon_spacing); + main_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, icon_spacing); gtk_widget_show (main_box); gtk_container_add (GTK_CONTAINER (button->priv->toggle_button), main_box); if (style == GTK_TOOLBAR_BOTH_HORIZ) - box = gtk_hbox_new (FALSE, icon_spacing); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, icon_spacing); else - box = gtk_vbox_new (FALSE, icon_spacing); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, icon_spacing); gtk_widget_show (box); gtk_box_pack_start (GTK_BOX (main_box), box, TRUE, TRUE, 0); @@ -360,9 +374,9 @@ static void -gth_toggle_menu_tool_button_style_set (GtkWidget *widget, - GtkStyle *prev_style) +gth_toggle_menu_tool_button_style_updated (GtkWidget *widget) { + GTK_WIDGET_CLASS (gth_toggle_menu_tool_button_parent_class)->style_updated (widget); gth_toggle_menu_tool_button_update_icon_spacing (GTH_TOGGLE_MENU_TOOL_BUTTON (widget)); } @@ -435,6 +449,20 @@ } +static void +gth_toggle_menu_tool_button_property_notify (GObject *object, + GParamSpec *pspec) +{ + GthToggleMenuToolButton *button = GTH_TOGGLE_MENU_TOOL_BUTTON (object); + + if (button->priv->contents_invalid || strcmp ("is-important", pspec->name) == 0) + gth_toggle_menu_tool_button_construct_contents (GTK_TOOL_ITEM (object)); + + if (G_OBJECT_CLASS (gth_toggle_menu_tool_button_parent_class)->notify) + G_OBJECT_CLASS (gth_toggle_menu_tool_button_parent_class)->notify (object, pspec); +} + + /* Callback for the "deactivate" signal on the pop-up menu. * This is used so that we unset the state of the toggle button * when the pop-up menu disappears. @@ -455,17 +483,17 @@ gboolean *push_in, GthToggleMenuToolButton *button) { - GtkWidget *widget = GTK_WIDGET (button); - GtkRequisition req; - GtkRequisition menu_req; - GtkOrientation orientation; - GtkTextDirection direction; - GdkRectangle monitor; - int monitor_num; - GdkScreen *screen; - GtkAllocation allocation; + GtkWidget *widget = GTK_WIDGET (button); + GtkRequisition req; + GtkRequisition menu_req; + GtkOrientation orientation; + GtkTextDirection direction; + cairo_rectangle_int_t monitor; + int monitor_num; + GdkScreen *screen; + GtkAllocation allocation; - gtk_widget_size_request (GTK_WIDGET (button->priv->menu), &menu_req); + gtk_widget_get_preferred_size (GTK_WIDGET (button->priv->menu), &menu_req, NULL); orientation = gtk_tool_item_get_orientation (GTK_TOOL_ITEM (button)); direction = gtk_widget_get_direction (widget); @@ -498,8 +526,7 @@ } else { gdk_window_get_origin (gtk_button_get_event_window (GTK_BUTTON (widget)), x, y); - - gtk_widget_size_request (widget, &req); + gtk_widget_get_preferred_size (widget, &req, NULL); if (direction == GTK_TEXT_DIR_LTR) *x += allocation.width; @@ -578,7 +605,7 @@ static void -gth_toggle_menu_tool_button_destroy (GtkObject *object) +gth_toggle_menu_tool_button_finalize (GObject *object) { GthToggleMenuToolButton *button; @@ -594,7 +621,7 @@ button->priv->toggle_button = NULL; } - GTK_OBJECT_CLASS (parent_class)->destroy (object); + G_OBJECT_CLASS (gth_toggle_menu_tool_button_parent_class)->finalize (object); } @@ -662,23 +689,20 @@ gth_toggle_menu_tool_button_class_init (GthToggleMenuToolButtonClass *klass) { GObjectClass *object_class; - GtkObjectClass *gtk_object_class; GtkWidgetClass *widget_class; GtkToolItemClass *tool_item_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthToggleMenuToolButtonPrivate)); object_class = (GObjectClass *) klass; + object_class->finalize = gth_toggle_menu_tool_button_finalize; object_class->set_property = gth_toggle_menu_tool_button_set_property; object_class->get_property = gth_toggle_menu_tool_button_get_property; - - gtk_object_class = (GtkObjectClass *) klass; - gtk_object_class->destroy = gth_toggle_menu_tool_button_destroy; + object_class->notify = gth_toggle_menu_tool_button_property_notify; widget_class = (GtkWidgetClass *) klass; widget_class->state_changed = gth_toggle_menu_tool_button_state_changed; - widget_class->style_set = gth_toggle_menu_tool_button_style_set; + widget_class->style_updated = gth_toggle_menu_tool_button_style_updated; tool_item_class = (GtkToolItemClass *) klass; tool_item_class->create_menu_proxy = gth_toggle_menu_tool_button_create_menu_proxy; @@ -769,6 +793,7 @@ { button->priv = G_TYPE_INSTANCE_GET_PRIVATE (button, GTH_TYPE_TOGGLE_MENU_TOOL_BUTTON, GthToggleMenuToolButtonPrivate); button->priv->menu = NULL; + button->priv->contents_invalid = TRUE; button->priv->toggle_button = gtk_toggle_button_new (); gtk_button_set_focus_on_click (GTK_BUTTON (button->priv->toggle_button), FALSE); @@ -807,6 +832,20 @@ gth_toggle_menu_tool_button_set_active (button, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); gtk_action_unblock_activate (action); } + else if ((strcmp (property_name, "menu") == 0) && GTH_IS_TOGGLE_MENU_ACTION (action)) { + gth_toggle_menu_tool_button_set_menu (button, gth_toggle_menu_action_get_menu (GTH_TOGGLE_MENU_ACTION (action))); + } + else if (gtk_activatable_get_use_action_appearance (activatable)) { + if (strcmp (property_name, "label") == 0) { + gth_toggle_menu_tool_button_set_label (button, gtk_action_get_label (action)); + } + else if (strcmp (property_name, "stock-id") == 0) { + gth_toggle_menu_tool_button_set_stock_id (button, gtk_action_get_stock_id (action)); + } + else if (strcmp (property_name, "icon-name") == 0) { + gth_toggle_menu_tool_button_set_icon_name (button, gtk_action_get_icon_name (action)); + } + } } @@ -826,6 +865,15 @@ gtk_action_block_activate (action); gth_toggle_menu_tool_button_set_active (button, gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); gtk_action_unblock_activate (action); + + if (GTH_IS_TOGGLE_MENU_ACTION (action)) + gth_toggle_menu_tool_button_set_menu (button, gth_toggle_menu_action_get_menu (GTH_TOGGLE_MENU_ACTION (action))); + + if (gtk_activatable_get_use_action_appearance (activatable)) { + gth_toggle_menu_tool_button_set_label (button, gtk_action_get_label (action)); + gth_toggle_menu_tool_button_set_stock_id (button, gtk_action_get_stock_id (action)); + gth_toggle_menu_tool_button_set_icon_name (button, gtk_action_get_icon_name (action)); + } } @@ -838,40 +886,6 @@ } -GType -gth_toggle_menu_tool_button_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthToggleMenuToolButtonClass), - NULL, - NULL, - (GClassInitFunc) gth_toggle_menu_tool_button_class_init, - NULL, - NULL, - sizeof (GthToggleMenuToolButton), - 0, - (GInstanceInitFunc) gth_toggle_menu_tool_button_init - }; - static const GInterfaceInfo gtk_activable_info = { - (GInterfaceInitFunc) gth_toggle_menu_tool_button_gtk_activable_interface_init, - (GInterfaceFinalizeFunc) NULL, - NULL - }; - - type = g_type_register_static (GTK_TYPE_TOOL_ITEM, - "GthToggleMenuToolButton", - &type_info, - 0); - g_type_add_interface_static (type, GTK_TYPE_ACTIVATABLE, >k_activable_info); - } - - return type; -} - - GtkToolItem * gth_toggle_menu_tool_button_new (void) { diff -Nru gthumb-2.14.3/gthumb/gth-toggle-menu-tool-button.h gthumb-3.0.0/gthumb/gth-toggle-menu-tool-button.h --- gthumb-2.14.3/gthumb/gth-toggle-menu-tool-button.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-toggle-menu-tool-button.h 2012-02-19 15:01:32.000000000 +0000 @@ -53,27 +53,27 @@ void (*show_menu) (GthToggleMenuToolButton *button); }; -GType gth_toggle_menu_tool_button_get_type (void) G_GNUC_CONST; -GtkToolItem * gth_toggle_menu_tool_button_new (void); -GtkToolItem * gth_toggle_menu_tool_button_new_from_stock (const char *stock_id); -void gth_toggle_menu_tool_button_set_label (GthToggleMenuToolButton *button, - const char *label); -const char * gth_toggle_menu_tool_button_get_label (GthToggleMenuToolButton *button); -void gth_toggle_menu_tool_button_set_use_underline (GthToggleMenuToolButton *button, - gboolean use_underline); -gboolean gth_toggle_menu_tool_button_get_use_underline (GthToggleMenuToolButton *button); -void gth_toggle_menu_tool_button_set_stock_id (GthToggleMenuToolButton *button, - const char *stock_id); -const char * gth_toggle_menu_tool_button_get_stock_id (GthToggleMenuToolButton *button); -void gth_toggle_menu_tool_button_set_icon_name (GthToggleMenuToolButton *button, - const char *icon_name); -const char * gth_toggle_menu_tool_button_get_icon_name (GthToggleMenuToolButton *button); -void gth_toggle_menu_tool_button_set_active (GthToggleMenuToolButton *button, - gboolean is_active); -gboolean gth_toggle_menu_tool_button_get_active (GthToggleMenuToolButton *button); -void gth_toggle_menu_tool_button_set_menu (GthToggleMenuToolButton *button, - GtkWidget *menu); -GtkWidget * gth_toggle_menu_tool_button_get_menu (GthToggleMenuToolButton *button); +GType gth_toggle_menu_tool_button_get_type (void) G_GNUC_CONST; +GtkToolItem * gth_toggle_menu_tool_button_new (void); +GtkToolItem * gth_toggle_menu_tool_button_new_from_stock (const char *stock_id); +void gth_toggle_menu_tool_button_set_label (GthToggleMenuToolButton *button, + const char *label); +const char * gth_toggle_menu_tool_button_get_label (GthToggleMenuToolButton *button); +void gth_toggle_menu_tool_button_set_use_underline (GthToggleMenuToolButton *button, + gboolean use_underline); +gboolean gth_toggle_menu_tool_button_get_use_underline (GthToggleMenuToolButton *button); +void gth_toggle_menu_tool_button_set_stock_id (GthToggleMenuToolButton *button, + const char *stock_id); +const char * gth_toggle_menu_tool_button_get_stock_id (GthToggleMenuToolButton *button); +void gth_toggle_menu_tool_button_set_icon_name (GthToggleMenuToolButton *button, + const char *icon_name); +const char * gth_toggle_menu_tool_button_get_icon_name (GthToggleMenuToolButton *button); +void gth_toggle_menu_tool_button_set_active (GthToggleMenuToolButton *button, + gboolean is_active); +gboolean gth_toggle_menu_tool_button_get_active (GthToggleMenuToolButton *button); +void gth_toggle_menu_tool_button_set_menu (GthToggleMenuToolButton *button, + GtkWidget *menu); +GtkWidget * gth_toggle_menu_tool_button_get_menu (GthToggleMenuToolButton *button); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/gth-toolbox.c gthumb-3.0.0/gthumb/gth-toolbox.c --- gthumb-2.14.3/gthumb/gth-toolbox.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-toolbox.c 2012-03-06 15:26:06.000000000 +0000 @@ -27,9 +27,6 @@ #include "gtk-utils.h" -#define GTH_TOOLBOX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_TOOLBOX, GthToolboxPrivate)) - - enum { GTH_TOOLBOX_LIST_PAGE = 0, GTH_TOOLBOX_OPTIONS_PAGE @@ -42,9 +39,6 @@ }; -static gpointer parent_class = NULL; - - struct _GthToolboxPrivate { char *name; GtkWidget *box; @@ -55,6 +49,9 @@ }; +G_DEFINE_TYPE (GthToolbox, gth_toolbox, GTK_TYPE_NOTEBOOK) + + static void gth_toolbox_set_name (GthToolbox *self, const char *name) @@ -97,7 +94,7 @@ g_free (self->priv->name); - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_toolbox_parent_class)->finalize (object); } @@ -106,7 +103,6 @@ { GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthToolboxPrivate)); gobject_class = (GObjectClass*) klass; @@ -131,35 +127,35 @@ GtkWidget *options_header; GtkWidget *header_align; - toolbox->priv = GTH_TOOLBOX_GET_PRIVATE (toolbox); + toolbox->priv = G_TYPE_INSTANCE_GET_PRIVATE (toolbox, GTH_TYPE_TOOLBOX, GthToolboxPrivate); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (toolbox), FALSE); gtk_notebook_set_show_border (GTK_NOTEBOOK (toolbox), FALSE); - /* tools vbox page */ + /* tool list page */ scrolled = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_NONE); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_widget_show (scrolled); gtk_notebook_append_page (GTK_NOTEBOOK (toolbox), scrolled, NULL); - toolbox->priv->box = gtk_vbox_new (FALSE, 0); + toolbox->priv->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_set_spacing (GTK_BOX (toolbox->priv->box), 0); gtk_widget_show (toolbox->priv->box); gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled), toolbox->priv->box); /* tool options page */ - options_box = gtk_vbox_new (FALSE, 0); + options_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (options_box); gtk_notebook_append_page (GTK_NOTEBOOK (toolbox), options_box, NULL); header_align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0); gtk_alignment_set_padding (GTK_ALIGNMENT (header_align), 5, 5, 0, 0); - options_header = gtk_hbox_new (FALSE, 6); + options_header = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (options_header); gtk_container_add (GTK_CONTAINER (header_align), options_header); @@ -176,41 +172,13 @@ gtk_box_pack_start (GTK_BOX (options_box), header_align, FALSE, FALSE, 0); toolbox->priv->options = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (toolbox->priv->options), GTK_SHADOW_NONE); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (toolbox->priv->options), GTK_SHADOW_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (toolbox->priv->options), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_widget_show (toolbox->priv->options); gtk_box_pack_start (GTK_BOX (options_box), toolbox->priv->options, TRUE, TRUE, 0); } -GType -gth_toolbox_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthToolboxClass), - NULL, - NULL, - (GClassInitFunc) gth_toolbox_class_init, - NULL, - NULL, - sizeof (GthToolbox), - 0, - (GInstanceInitFunc) gth_toolbox_init - }; - - type = g_type_register_static (GTK_TYPE_NOTEBOOK, - "GthToolbox", - &type_info, - 0); - } - - return type; -} - - static void child_clicked_cb (GtkWidget *tool, gpointer data) @@ -282,7 +250,7 @@ if (gth_file_tool_has_separator (GTH_FILE_TOOL (child))) { GtkWidget *separator; - separator = gtk_hseparator_new (); + separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_show (separator); gtk_box_pack_start (GTK_BOX (toolbox->priv->box), separator, FALSE, FALSE, 0); } diff -Nru gthumb-2.14.3/gthumb/gth-uri-list.c gthumb-3.0.0/gthumb/gth-uri-list.c --- gthumb-2.14.3/gthumb/gth-uri-list.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-uri-list.c 2012-02-19 15:01:32.000000000 +0000 @@ -51,10 +51,12 @@ }; -static gpointer parent_class = NULL; static guint uri_list_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE (GthUriList, gth_uri_list, GTK_TYPE_TREE_VIEW) + + static void add_columns (GtkTreeView *treeview) { @@ -171,7 +173,7 @@ uri_list->priv = NULL; } - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (gth_uri_list_parent_class)->finalize (object); } @@ -180,7 +182,6 @@ { GObjectClass *gobject_class; - parent_class = g_type_class_peek_parent (klass); gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = gth_uri_list_finalize; @@ -197,34 +198,6 @@ } -GType -gth_uri_list_get_type (void) -{ - static GType type = 0; - - if (type == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthUriListClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) gth_uri_list_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (GthUriList), - 0, - (GInstanceInitFunc) gth_uri_list_init, - NULL - }; - type = g_type_register_static (GTK_TYPE_TREE_VIEW, - "GthUriList", - &g_define_type_info, - 0); - } - - return type; -} - - GtkWidget * gth_uri_list_new (void) { diff -Nru gthumb-2.14.3/gthumb/gth-viewer-page.c gthumb-3.0.0/gthumb/gth-viewer-page.c --- gthumb-2.14.3/gthumb/gth-viewer-page.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-viewer-page.c 2012-02-19 15:01:32.000000000 +0000 @@ -32,8 +32,11 @@ static guint gth_viewer_page_signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_INTERFACE (GthViewerPage, gth_viewer_page, 0) + + static void -gth_viewer_page_base_init (gpointer g_iface) +gth_viewer_page_default_init (GthViewerPageInterface *iface) { static gboolean initialized = FALSE; @@ -44,7 +47,7 @@ g_signal_new ("file-loaded", GTH_TYPE_VIEWER_PAGE, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GthViewerPageIface, file_loaded), + G_STRUCT_OFFSET (GthViewerPageInterface, file_loaded), NULL, NULL, gth_marshal_VOID__OBJECT_BOOLEAN, G_TYPE_NONE, @@ -56,28 +59,6 @@ } -GType -gth_viewer_page_get_type (void) { - static GType gth_viewer_page_type_id = 0; - if (gth_viewer_page_type_id == 0) { - static const GTypeInfo g_define_type_info = { - sizeof (GthViewerPageIface), - (GBaseInitFunc) gth_viewer_page_base_init, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) NULL, - (GClassFinalizeFunc) NULL, - NULL, - 0, - 0, - (GInstanceInitFunc) NULL, - NULL - }; - gth_viewer_page_type_id = g_type_register_static (G_TYPE_INTERFACE, "GthViewerPage", &g_define_type_info, 0); - } - return gth_viewer_page_type_id; -} - - void gth_viewer_page_activate (GthViewerPage *self, GthBrowser *browser) @@ -210,6 +191,17 @@ void +gth_viewer_page_shrink_wrap (GthViewerPage *self, + gboolean value, + int *other_width, + int *other_height) +{ + if (GTH_VIEWER_PAGE_GET_INTERFACE (self)->shrink_wrap != NULL) + GTH_VIEWER_PAGE_GET_INTERFACE (self)->shrink_wrap (self, value, other_width, other_height); +} + + +void gth_viewer_page_file_loaded (GthViewerPage *self, GthFileData *file_data, gboolean success) diff -Nru gthumb-2.14.3/gthumb/gth-viewer-page.h gthumb-3.0.0/gthumb/gth-viewer-page.h --- gthumb-2.14.3/gthumb/gth-viewer-page.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-viewer-page.h 2012-02-19 15:01:32.000000000 +0000 @@ -31,17 +31,17 @@ #define GTH_TYPE_VIEWER_PAGE (gth_viewer_page_get_type ()) #define GTH_VIEWER_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTH_TYPE_VIEWER_PAGE, GthViewerPage)) #define GTH_IS_VIEWER_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTH_TYPE_VIEWER_PAGE)) -#define GTH_VIEWER_PAGE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_VIEWER_PAGE, GthViewerPageIface)) +#define GTH_VIEWER_PAGE_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTH_TYPE_VIEWER_PAGE, GthViewerPageInterface)) typedef struct _GthViewerPage GthViewerPage; -typedef struct _GthViewerPageIface GthViewerPageIface; +typedef struct _GthViewerPageInterface GthViewerPageInterface; typedef void (*FileSavedFunc) (GthViewerPage *viewer_page, GthFileData *file_data, GError *error, gpointer user_data); -struct _GthViewerPageIface { +struct _GthViewerPageInterface { GTypeInterface parent_iface; /*< virtual functions >*/ @@ -74,6 +74,10 @@ GthFileData *file_data); void (*show_properties) (GthViewerPage *self, gboolean show); + void (*shrink_wrap) (GthViewerPage *self, + gboolean show, + int *other_width, + int *other_height); /*< signals >*/ @@ -111,6 +115,10 @@ GthFileData *file_data); void gth_viewer_page_show_properties (GthViewerPage *self, gboolean show); +void gth_viewer_page_shrink_wrap (GthViewerPage *self, + gboolean show, + int *other_width, + int *other_height); void gth_viewer_page_file_loaded (GthViewerPage *self, GthFileData *file_data, gboolean success); diff -Nru gthumb-2.14.3/gthumb/gth-window-actions-entries.h gthumb-3.0.0/gthumb/gth-window-actions-entries.h --- gthumb-2.14.3/gthumb/gth-window-actions-entries.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-window-actions-entries.h 2012-02-19 15:01:32.000000000 +0000 @@ -37,6 +37,5 @@ NULL, G_CALLBACK (gth_window_activate_action_file_quit_application) } }; -static guint gth_window_action_entries_size = G_N_ELEMENTS (gth_window_action_entries); #endif /* GTH_WINDOW_ACTION_ENTRIES_H */ diff -Nru gthumb-2.14.3/gthumb/gth-window.c gthumb-3.0.0/gthumb/gth-window.c --- gthumb-2.14.3/gthumb/gth-window.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-window.c 2012-02-19 15:01:32.000000000 +0000 @@ -23,20 +23,18 @@ #include #include "gth-window.h" #include "gtk-utils.h" +#include "main.h" -#define GTH_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTH_TYPE_WINDOW, GthWindowPrivate)) +G_DEFINE_TYPE (GthWindow, gth_window, GTK_TYPE_WINDOW) + enum { - GTH_WINDOW_DUMMY_PROPERTY, - GTH_WINDOW_N_PAGES + PROP_0, + PROP_N_PAGES }; -static GtkWindowClass *parent_class = NULL; -static GList *window_list = NULL; - - struct _GthWindowPrivate { int n_pages; int current_page; @@ -58,6 +56,11 @@ { int i; + if (self->priv->n_pages != 0) { + g_critical ("The number of pages of a GthWindow can be set only once."); + return; + } + self->priv->n_pages = n_pages; self->priv->table = gtk_table_new (5, 1, FALSE); @@ -67,6 +70,7 @@ gtk_container_add (GTK_CONTAINER (self), self->priv->table); self->priv->notebook = gtk_notebook_new (); + gtk_style_context_remove_class (gtk_widget_get_style_context (self->priv->notebook), GTK_STYLE_CLASS_NOTEBOOK); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (self->priv->notebook), FALSE); gtk_notebook_set_show_border (GTK_NOTEBOOK (self->priv->notebook), FALSE); gtk_widget_show (self->priv->notebook); @@ -84,18 +88,18 @@ for (i = 0; i < n_pages; i++) { GtkWidget *page; - page = gtk_vbox_new (FALSE, 0); + page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (page); gtk_notebook_append_page (GTK_NOTEBOOK (self->priv->notebook), page, NULL); - self->priv->toolbars[i] = gtk_hbox_new (FALSE, 0); + self->priv->toolbars[i] = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (self->priv->toolbars[i]); gtk_box_pack_start (GTK_BOX (page), self->priv->toolbars[i], FALSE, FALSE, 0); - self->priv->contents[i] = gtk_hbox_new (FALSE, 0); - gtk_widget_show (self->priv->contents[i]); + self->priv->contents[i] = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_widget_hide (self->priv->contents[i]); gtk_box_pack_start (GTK_BOX (page), self->priv->contents[i], TRUE, TRUE, 0); } @@ -116,7 +120,7 @@ self = GTH_WINDOW (object); switch (property_id) { - case GTH_WINDOW_N_PAGES: + case PROP_N_PAGES: gth_window_set_n_pages (self, g_value_get_int (value)); break; default: @@ -127,6 +131,27 @@ static void +gth_window_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + GthWindow *self; + + self = GTH_WINDOW (object); + + switch (property_id) { + case PROP_N_PAGES: + g_value_set_int (value, self->priv->n_pages); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + + +static void gth_window_finalize (GObject *object) { GthWindow *window = GTH_WINDOW (object); @@ -135,12 +160,7 @@ g_free (window->priv->contents); g_free (window->priv->window_size); - window_list = g_list_remove (window_list, window); - - G_OBJECT_CLASS (parent_class)->finalize (object); - - if (window_list == NULL) - gtk_main_quit (); + G_OBJECT_CLASS (gth_window_parent_class)->finalize (object); } @@ -181,78 +201,61 @@ static void +gth_window_realize (GtkWidget *widget) +{ + GTK_WIDGET_CLASS (gth_window_parent_class)->realize (widget); + + gtk_icon_theme_append_search_path (gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)), + GTHUMB_ICON_DIR); +} + + +static void gth_window_class_init (GthWindowClass *klass) { GObjectClass *gobject_class; GtkWidgetClass *widget_class; - parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (GthWindowPrivate)); gobject_class = (GObjectClass*) klass; gobject_class->set_property = gth_window_set_property; + gobject_class->get_property = gth_window_get_property; gobject_class->finalize = gth_window_finalize; widget_class = (GtkWidgetClass*) klass; widget_class->delete_event = gth_window_delete_event; + widget_class->realize = gth_window_realize; klass->close = gth_window_real_close; klass->set_current_page = gth_window_real_set_current_page; g_object_class_install_property (G_OBJECT_CLASS (klass), - GTH_WINDOW_N_PAGES, + PROP_N_PAGES, g_param_spec_int ("n-pages", "n-pages", "n-pages", 0, G_MAXINT, 1, - G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_READWRITE)); } static void gth_window_init (GthWindow *window) { - window->priv = GTH_WINDOW_GET_PRIVATE (window); + window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, GTH_TYPE_WINDOW, GthWindowPrivate); window->priv->table = NULL; window->priv->contents = NULL; window->priv->n_pages = 0; - window->priv->current_page = -1; + window->priv->current_page = GTH_WINDOW_PAGE_UNDEFINED; window->priv->menubar = NULL; window->priv->toolbar = NULL; window->priv->infobar = NULL; window->priv->statusbar = NULL; - window_list = g_list_prepend (window_list, window); -} - - -GType -gth_window_get_type (void) -{ - static GType type = 0; - - if (! type) { - GTypeInfo type_info = { - sizeof (GthWindowClass), - NULL, - NULL, - (GClassInitFunc) gth_window_class_init, - NULL, - NULL, - sizeof (GthWindow), - 0, - (GInstanceInitFunc) gth_window_init - }; - - type = g_type_register_static (GTK_TYPE_WINDOW, - "GthWindow", - &type_info, - 0); - } - - return type; + gtk_window_set_application (GTK_WINDOW (window), Main_Application); } @@ -318,6 +321,8 @@ g_return_if_fail (GTK_IS_WIDGET (child)); _gtk_container_remove_children (GTK_CONTAINER (window->priv->toolbars[page]), NULL, NULL); + gtk_style_context_add_class (gtk_widget_get_style_context (child), GTK_STYLE_CLASS_PRIMARY_TOOLBAR); + gtk_widget_set_hexpand (child, TRUE); gtk_container_add (GTK_CONTAINER (window->priv->toolbars[page]), child); } @@ -334,6 +339,7 @@ g_return_if_fail (GTK_IS_WIDGET (child)); _gtk_container_remove_children (GTK_CONTAINER (window->priv->contents[page]), NULL, NULL); + gtk_widget_set_hexpand (child, TRUE); gtk_container_add (GTK_CONTAINER (window->priv->contents[page]), child); } @@ -482,27 +488,3 @@ return TRUE; } - - -int -gth_window_get_n_windows (void) -{ - return g_list_length (window_list); -} - - -GList * -gth_window_get_window_list (void) -{ - return window_list; -} - - -GtkWidget * -gth_window_get_current_window (void) -{ - if ((window_list == NULL) || (g_list_length (window_list) > 1)) - return NULL; - else - return (GtkWidget *) window_list->data; -} diff -Nru gthumb-2.14.3/gthumb/gth-window.h gthumb-3.0.0/gthumb/gth-window.h --- gthumb-2.14.3/gthumb/gth-window.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gth-window.h 2012-02-19 15:01:32.000000000 +0000 @@ -26,6 +26,8 @@ G_BEGIN_DECLS +#define GTH_WINDOW_PAGE_UNDEFINED -1 + typedef enum { /*< skip >*/ GTH_WINDOW_MENUBAR, GTH_WINDOW_TOOLBAR, @@ -98,12 +100,6 @@ void gth_window_clear_saved_size (GthWindow *window, int page); -/**/ - -int gth_window_get_n_windows (void); -GList * gth_window_get_window_list (void); -GtkWidget * gth_window_get_current_window (void); - G_END_DECLS #endif /* GTH_WINDOW_H */ diff -Nru gthumb-2.14.3/gthumb/gtk-utils.c gthumb-3.0.0/gthumb/gtk-utils.c --- gthumb-2.14.3/gthumb/gtk-utils.c 2012-03-24 16:26:30.000000000 +0000 +++ gthumb-3.0.0/gthumb/gtk-utils.c 2012-03-31 09:42:24.000000000 +0000 @@ -21,13 +21,63 @@ #include #include -#include "gconf-utils.h" #include "gtk-utils.h" #include "pixbuf-utils.h" #define REQUEST_ENTRY_WIDTH_IN_CHARS 40 +void +_gtk_action_group_add_actions_with_flags (GtkActionGroup *action_group, + const GthActionEntryExt *entries, + guint n_entries, + gpointer user_data) +{ + guint i; + + g_return_if_fail (GTK_IS_ACTION_GROUP (action_group)); + + for (i = 0; i < n_entries; i++) { + GtkAction *action; + const char *label; + const char *tooltip; + + label = gtk_action_group_translate_string (action_group, entries[i].label); + tooltip = gtk_action_group_translate_string (action_group, entries[i].tooltip); + + action = gtk_action_new (entries[i].name, + label, + tooltip, + NULL); + + if (entries[i].stock_id) { + g_object_set (action, "stock-id", entries[i].stock_id, NULL); + if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (), entries[i].stock_id)) + g_object_set (action, "icon-name", entries[i].stock_id, NULL); + } + + if (entries[i].callback) { + GClosure *closure; + + closure = g_cclosure_new (entries[i].callback, user_data, NULL); + g_signal_connect_closure (action, "activate", closure, FALSE); + } + + gtk_action_group_add_action_with_accel (action_group, + action, + entries[i].accelerator); + + if (entries[i].flags & GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE) + gtk_action_set_always_show_image (action, TRUE); + + if (entries[i].flags & GTH_ACTION_FLAG_IS_IMPORTANT) + gtk_action_set_is_important (action, TRUE); + + g_object_unref (action); + } +} + + GtkWidget * _gtk_button_new_from_stock_with_text (const char *stock_id, const char *text) @@ -85,7 +135,7 @@ if (stock_id == NULL) stock_id = GTK_STOCK_DIALOG_INFO; - d = gtk_dialog_new_with_buttons ("", parent, flags, NULL); + d = gtk_dialog_new_with_buttons ("", parent, flags, NULL, NULL); gtk_window_set_resizable (GTK_WINDOW (d), FALSE); gtk_container_set_border_width (GTK_CONTAINER (d), 6); @@ -116,7 +166,7 @@ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_selectable (GTK_LABEL (label), TRUE); - hbox = gtk_hbox_new (FALSE, 18); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 18); gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); gtk_box_pack_start (GTK_BOX (hbox), image, @@ -172,86 +222,7 @@ GtkWidget *button; char *stock_id = GTK_STOCK_DIALOG_QUESTION; - d = gtk_dialog_new_with_buttons ("", parent, flags, NULL); - gtk_window_set_resizable (GTK_WINDOW (d), FALSE); - - gtk_container_set_border_width (GTK_CONTAINER (d), 6); - gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (d))), 6); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (d))), 8); - - /* Add label and image */ - - image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); - - label = gtk_label_new (message); - gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); - - hbox = gtk_hbox_new (FALSE, 12); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); - - gtk_box_pack_start (GTK_BOX (hbox), image, - FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (hbox), label, - TRUE, TRUE, 0); - - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (d))), - hbox, - FALSE, FALSE, 0); - - gtk_widget_show_all (hbox); - - /* Add buttons */ - - button = _gtk_button_new_from_stock_with_text (GTK_STOCK_CANCEL, no_button_text); - gtk_dialog_add_action_widget (GTK_DIALOG (d), - button, - GTK_RESPONSE_CANCEL); - - /**/ - - button = _gtk_button_new_from_stock_with_text (GTK_STOCK_OK, yes_button_text); - gtk_dialog_add_action_widget (GTK_DIALOG (d), - button, - GTK_RESPONSE_YES); - - /**/ - - gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_YES); - - return d; -} - - -static void -yesno__check_button_toggled_cb (GtkToggleButton *button, - const char *gconf_key) -{ - eel_gconf_set_boolean (gconf_key, - ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))); -} - - -GtkWidget* -_gtk_yesno_dialog_with_checkbutton_new (GtkWindow *parent, - GtkDialogFlags flags, - const char *message, - const char *no_button_text, - const char *yes_button_text, - const char *check_button_label, - const char *gconf_key) -{ - GtkWidget *d; - GtkWidget *label; - GtkWidget *image; - GtkWidget *hbox; - GtkWidget *button; - GtkWidget *check_button; - char *stock_id = GTK_STOCK_DIALOG_QUESTION; - - d = gtk_dialog_new_with_buttons ("", parent, flags, NULL); + d = gtk_dialog_new_with_buttons ("", parent, flags, NULL, NULL); gtk_window_set_resizable (GTK_WINDOW (d), FALSE); gtk_container_set_border_width (GTK_CONTAINER (d), 6); @@ -267,7 +238,7 @@ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_selectable (GTK_LABEL (label), TRUE); - hbox = gtk_hbox_new (FALSE, 12); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); gtk_box_pack_start (GTK_BOX (hbox), image, @@ -280,14 +251,6 @@ hbox, FALSE, FALSE, 0); - /* Add checkbutton */ - - check_button = gtk_check_button_new_with_mnemonic (check_button_label); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (d))), - check_button, - FALSE, FALSE, 0); - gtk_widget_show (check_button); - gtk_widget_show_all (hbox); /* Add buttons */ @@ -308,122 +271,6 @@ gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_YES); - g_signal_connect (G_OBJECT (check_button), - "toggled", - G_CALLBACK (yesno__check_button_toggled_cb), - (gpointer) gconf_key); - - return d; -} - - -GtkWidget* -_gtk_message_dialog_with_checkbutton_new (GtkWindow *parent, - GtkDialogFlags flags, - const char *stock_id, - const char *message, - const char *secondary_message, - const char *gconf_key, - const char *check_button_label, - const char *first_button_text, - ...) -{ - GtkWidget *d; - GtkWidget *label; - GtkWidget *image; - GtkWidget *hbox; - GtkWidget *check_button; - va_list args; - const char *text; - int response_id; - char *escaped_message, *markup_text; - - g_return_val_if_fail (message != NULL, NULL); - - if (stock_id == NULL) - stock_id = GTK_STOCK_DIALOG_INFO; - - d = gtk_dialog_new_with_buttons ("", parent, flags, NULL); - gtk_window_set_resizable (GTK_WINDOW (d), FALSE); - - gtk_container_set_border_width (GTK_CONTAINER (d), 6); - gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (d))), 6); - gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (d))), 8); - - /* Add label and image */ - - image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_DIALOG); - gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); - - label = gtk_label_new (""); - - escaped_message = g_markup_escape_text (message, -1); - if (secondary_message != NULL) { - char *escaped_secondary_message = g_markup_escape_text (secondary_message, -1); - markup_text = g_strdup_printf ("%s\n\n%s", - escaped_message, - escaped_secondary_message); - g_free (escaped_secondary_message); - } else - markup_text = g_strdup (escaped_message); - gtk_label_set_markup (GTK_LABEL (label), markup_text); - g_free (markup_text); - g_free (escaped_message); - - gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); - - hbox = gtk_hbox_new (FALSE, 6); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 6); - - gtk_box_pack_start (GTK_BOX (hbox), image, - FALSE, FALSE, 0); - - gtk_box_pack_start (GTK_BOX (hbox), label, - TRUE, TRUE, 0); - - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (d))), - hbox, - FALSE, FALSE, 0); - - gtk_widget_show_all (hbox); - - /* Add checkbutton */ - - check_button = gtk_check_button_new_with_mnemonic (check_button_label); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (d))), - check_button, - FALSE, FALSE, 0); - gtk_widget_show (check_button); - - /* Add buttons */ - - if (first_button_text == NULL) - return d; - - va_start (args, first_button_text); - - text = first_button_text; - response_id = va_arg (args, gint); - - while (text != NULL) { - gtk_dialog_add_button (GTK_DIALOG (d), text, response_id); - - text = va_arg (args, gchar*); - if (text == NULL) - break; - response_id = va_arg (args, int); - } - - va_end (args); - - gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_YES); - - g_signal_connect (G_OBJECT (check_button), - "toggled", - G_CALLBACK (yesno__check_button_toggled_cb), - (gpointer) gconf_key); - return d; } @@ -900,8 +747,8 @@ int *width, int *height) { - GdkScreen *screen; - GdkRectangle geometry; + GdkScreen *screen; + cairo_rectangle_int_t geometry; screen = gtk_widget_get_screen (widget); gdk_screen_get_monitor_geometry (screen, @@ -913,6 +760,36 @@ } +int +_gtk_widget_get_allocated_width (GtkWidget *widget) +{ + int width = 0; + + if ((widget != NULL) && gtk_widget_get_mapped (widget)) { + width = gtk_widget_get_allocated_width (widget); + width += gtk_widget_get_margin_left (widget); + width += gtk_widget_get_margin_right (widget); + } + + return width; +} + + +int +_gtk_widget_get_allocated_height (GtkWidget *widget) +{ + int height = 0; + + if ((widget != NULL) && gtk_widget_get_mapped (widget)) { + height = gtk_widget_get_allocated_height (widget); + height += gtk_widget_get_margin_top (widget); + height += gtk_widget_get_margin_bottom (widget); + } + + return height; +} + + void _gtk_tree_path_list_free (GList *list) { @@ -993,9 +870,7 @@ return; } - launch_context = gdk_app_launch_context_new (); - gdk_app_launch_context_set_screen (launch_context, gtk_widget_get_screen (parent)); - + launch_context = gdk_display_get_app_launch_context (gtk_widget_get_display (parent)); if (! g_app_info_launch (app_info, files, G_APP_LAUNCH_CONTEXT (launch_context), &error)) { _gtk_error_dialog_from_gerror_show (GTK_WINDOW (parent), _("Could not launch the application"), error); g_clear_error (&error); @@ -1156,24 +1031,24 @@ float page_increment, int digits) { - GtkWidget *hbox; - GtkWidget *scale; - GtkWidget *spinbutton; - GtkObject *adj; + GtkAdjustment *adj; + GtkWidget *spinbutton; + GtkWidget *scale; + GtkWidget *hbox; adj = gtk_adjustment_new (value, lower, upper, step_increment, page_increment, 0.0); - spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), page_increment, 0); + spinbutton = gtk_spin_button_new (GTK_ADJUSTMENT (adj), page_increment, 0); gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinbutton), digits); gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), 4); - scale = gtk_hscale_new (GTK_ADJUSTMENT (adj)); + scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adj)); gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE); gtk_scale_set_digits (GTK_SCALE (scale), digits); - hbox = gtk_hbox_new (FALSE, 5); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0); @@ -1185,3 +1060,40 @@ return (GtkAdjustment *) adj; } + + +static gboolean +_gdk_rgba_shade (GdkRGBA *color, + GdkRGBA *result, + gdouble factor) +{ + GtkSymbolicColor *sym_color; + GtkSymbolicColor *sym_result; + gboolean retval; + + sym_color = gtk_symbolic_color_new_literal (color); + sym_result = gtk_symbolic_color_new_shade (sym_color, factor); + + retval = gtk_symbolic_color_resolve (sym_result, NULL, result); + + gtk_symbolic_color_unref (sym_result); + gtk_symbolic_color_unref (sym_color); + + return retval; +} + + +gboolean +_gdk_rgba_darker (GdkRGBA *color, + GdkRGBA *result) +{ + return _gdk_rgba_shade (color, result, 0.8); +} + + +gboolean +_gdk_rgba_lighter (GdkRGBA *color, + GdkRGBA *result) +{ + return _gdk_rgba_shade (color, result, 1.2); +} diff -Nru gthumb-2.14.3/gthumb/gtk-utils.h gthumb-3.0.0/gthumb/gtk-utils.h --- gthumb-2.14.3/gthumb/gtk-utils.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/gtk-utils.h 2012-03-31 09:42:24.000000000 +0000 @@ -28,113 +28,115 @@ G_BEGIN_DECLS -GtkWidget * _gtk_button_new_from_stock_with_text (const char *stock_id, - const char *text); -GtkWidget* _gtk_message_dialog_new (GtkWindow *parent, - GtkDialogFlags flags, - const char *stock_id, - const char *message, - const char *secondary_message, - const char *first_button_text, - ...); -GtkWidget* -_gtk_message_dialog_with_checkbutton_new (GtkWindow *parent, - GtkDialogFlags flags, - const char *stock_id, - const char *message, - const char *secondary_message, - const char *gconf_key, - const char *check_button_label, - const char *first_button_text, - ...); -GtkWidget* _gtk_yesno_dialog_new (GtkWindow *parent, - GtkDialogFlags flags, - const char *message, - const char *no_button_text, - const char *yes_button_text); -GtkWidget* -_gtk_yesno_dialog_with_checkbutton_new (GtkWindow *parent, - GtkDialogFlags flags, - const char *message, - const char *no_button_text, - const char *yes_button_text, - const char *check_button_label, - const char *gconf_key); -void -_gtk_error_dialog_from_gerror_run (GtkWindow *parent, - const char *title, - GError *gerror); -void -_gtk_error_dialog_from_gerror_show (GtkWindow *parent, - const char *title, - GError *gerror); -void _gtk_error_dialog_run (GtkWindow *parent, - const gchar *format, - ...) G_GNUC_PRINTF (2, 3); -void _gtk_error_dialog_show (GtkWindow *parent, - const char *title, - const char *format, - ...) G_GNUC_PRINTF (3, 4); -void _gtk_info_dialog_run (GtkWindow *parent, - const gchar *format, - ...) G_GNUC_PRINTF (2, 3); -GdkPixbuf * _g_icon_get_pixbuf (GIcon *icon, - int size, - GtkIconTheme *icon_theme); -GdkPixbuf * get_mime_type_pixbuf (const char *mime_type, - int icon_size, - GtkIconTheme *icon_theme); -int _gtk_icon_get_pixel_size (GtkWidget *widget, - GtkIconSize size); -void show_help_dialog (GtkWindow *parent, - const char *section); -void _gtk_container_remove_children - (GtkContainer *container, - gpointer start_after_this, - gpointer stop_before_this); -int _gtk_container_get_pos (GtkContainer *container, - GtkWidget *child); -guint _gtk_container_get_n_children (GtkContainer *container); -GtkBuilder * - _gtk_builder_new_from_file (const char *filename, - const char *extension); -GtkWidget * - _gtk_builder_get_widget (GtkBuilder *builder, - const char *name); -GtkWidget * _gtk_combo_box_new_with_texts (const char *first_text, - ...); -void _gtk_combo_box_append_texts (GtkComboBoxText *combo_box, - const char *first_text, - ...); -GtkWidget * _gtk_image_new_from_xpm_data (char *xpm_data[]); -GtkWidget * _gtk_image_new_from_inline (const guint8 *data); -void _gtk_widget_get_screen_size (GtkWidget *widget, - int *width, - int *height); -void _gtk_tree_path_list_free (GList *list); -int _gtk_paned_get_position2 (GtkPaned *paned); -void _gtk_paned_set_position2 (GtkPaned *paned, - int pos); -void _g_launch_command (GtkWidget *parent, - const char *command, - const char *name, - GList *files); -void _gtk_window_resize_to_fit_screen_height - (GtkWidget *window, - int default_width); -void _gtk_info_bar_clear_action_area (GtkInfoBar *info_bar); - -GdkDragAction _gtk_menu_ask_drag_drop_action (GtkWidget *widget, - GdkDragAction actions, - guint32 activate_time); -GtkAdjustment * gimp_scale_entry_new (GtkWidget *parent_box, - GtkLabel *label, - float value, - float lower, - float upper, - float step_increment, - float page_increment, - int digits); +typedef enum { + GTH_ACTION_FLAG_NONE = 0, + GTH_ACTION_FLAG_ALWAYS_SHOW_IMAGE = 1 << 0, + GTH_ACTION_FLAG_IS_IMPORTANT = 1 << 1 +} GthActionFlags; + +typedef struct { + const char *name; + const char *stock_id; + const char *label; + const char *accelerator; + const char *tooltip; + GthActionFlags flags; + GCallback callback; +} GthActionEntryExt; + +void _gtk_action_group_add_actions_with_flags (GtkActionGroup *action_group, + const GthActionEntryExt + *entries, + guint n_entries, + gpointer user_data); +GtkWidget * _gtk_button_new_from_stock_with_text (const char *stock_id, + const char *text); +GtkWidget * _gtk_message_dialog_new (GtkWindow *parent, + GtkDialogFlags flags, + const char *stock_id, + const char *message, + const char *secondary_message, + const char *first_button_text, + ...); +GtkWidget * _gtk_yesno_dialog_new (GtkWindow *parent, + GtkDialogFlags flags, + const char *message, + const char *no_button_text, + const char *yes_button_text); +void _gtk_error_dialog_from_gerror_run (GtkWindow *parent, + const char *title, + GError *gerror); +void _gtk_error_dialog_from_gerror_show (GtkWindow *parent, + const char *title, + GError *gerror); +void _gtk_error_dialog_run (GtkWindow *parent, + const gchar *format, + ...) G_GNUC_PRINTF (2, 3); +void _gtk_error_dialog_show (GtkWindow *parent, + const char *title, + const char *format, + ...) G_GNUC_PRINTF (3, 4); +void _gtk_info_dialog_run (GtkWindow *parent, + const gchar *format, + ...) G_GNUC_PRINTF (2, 3); +GdkPixbuf * _g_icon_get_pixbuf (GIcon *icon, + int size, + GtkIconTheme *icon_theme); +GdkPixbuf * get_mime_type_pixbuf (const char *mime_type, + int icon_size, + GtkIconTheme *icon_theme); +int _gtk_icon_get_pixel_size (GtkWidget *widget, + GtkIconSize size); +void show_help_dialog (GtkWindow *parent, + const char *section); +void _gtk_container_remove_children (GtkContainer *container, + gpointer start_after_this, + gpointer stop_before_this); +int _gtk_container_get_pos (GtkContainer *container, + GtkWidget *child); +guint _gtk_container_get_n_children (GtkContainer *container); +GtkBuilder * _gtk_builder_new_from_file (const char *filename, + const char *extension); +GtkWidget * _gtk_builder_get_widget (GtkBuilder *builder, + const char *name); +GtkWidget * _gtk_combo_box_new_with_texts (const char *first_text, + ...); +void _gtk_combo_box_append_texts (GtkComboBoxText *combo_box, + const char *first_text, + ...); +GtkWidget * _gtk_image_new_from_xpm_data (char *xpm_data[]); +GtkWidget * _gtk_image_new_from_inline (const guint8 *data); +void _gtk_widget_get_screen_size (GtkWidget *widget, + int *width, + int *height); +int _gtk_widget_get_allocated_width (GtkWidget *widget); +int _gtk_widget_get_allocated_height (GtkWidget *widget); +void _gtk_tree_path_list_free (GList *list); +int _gtk_paned_get_position2 (GtkPaned *paned); +void _gtk_paned_set_position2 (GtkPaned *paned, + int pos); +void _g_launch_command (GtkWidget *parent, + const char *command, + const char *name, + GList *files); +void _gtk_window_resize_to_fit_screen_height (GtkWidget *window, + int default_width); +void _gtk_info_bar_clear_action_area (GtkInfoBar *info_bar); +GdkDragAction _gtk_menu_ask_drag_drop_action (GtkWidget *widget, + GdkDragAction actions, + guint32 activate_time); +GtkAdjustment * gimp_scale_entry_new (GtkWidget *parent_box, + GtkLabel *label, + float value, + float lower, + float upper, + float step_increment, + float page_increment, + int digits); +gboolean _gdk_rgba_darker (GdkRGBA *color, + GdkRGBA *result); +gboolean _gdk_rgba_lighter (GdkRGBA *color, + GdkRGBA *result); G_END_DECLS diff -Nru gthumb-2.14.3/gthumb/main.c gthumb-3.0.0/gthumb/main.c --- gthumb-2.14.3/gthumb/main.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/main.c 2012-03-31 09:53:11.000000000 +0000 @@ -23,15 +23,17 @@ #include #include #include -#ifdef HAVE_UNIQUE -#include +#ifdef HAVE_GSTREAMER +# include #endif #ifdef HAVE_CLUTTER -#include -#include +# include +# include #endif -#include "eggsmclient.h" -#include "gconf-utils.h" +#ifdef USE_SMCLIENT +# include "eggsmclient.h" +#endif +#include "eggdesktopfile.h" #include "glib-utils.h" #include "gth-browser.h" #include "gth-file-data.h" @@ -41,26 +43,11 @@ #include "main-migrate.h" -enum { - COMMAND_UNUSED, - COMMAND_FULLSCREEN, - COMMAND_IMPORT_PHOTOS, - COMMAND_SLIDESHOW -}; - - -gboolean NewWindow = FALSE; -gboolean StartInFullscreen = FALSE; -gboolean StartSlideshow = FALSE; -gboolean ImportPhotos = FALSE; -#ifdef HAVE_CLUTTER -int ClutterInitResult = CLUTTER_INIT_ERROR_UNKNOWN; -#endif - - -#ifdef HAVE_UNIQUE -static UniqueApp *gthumb_app; -#endif +GtkApplication *Main_Application = NULL; +gboolean NewWindow = FALSE; +gboolean StartInFullscreen = FALSE; +gboolean StartSlideshow = FALSE; +gboolean ImportPhotos = FALSE; static char **remaining_args; static const char *program_argv0; /* argv[0] from main(); used as the command to restart the program */ static gboolean Restart = FALSE; @@ -95,6 +82,53 @@ }; +static void +open_browser_window (GFile *location, + GFile *file_to_select, + gboolean force_new_window) +{ + gboolean reuse_active_window; + GtkWidget *window; + + if (! force_new_window) { + GSettings *settings; + + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + reuse_active_window = g_settings_get_boolean (settings, PREF_BROWSER_REUSE_ACTIVE_WINDOW); + g_object_unref (settings); + } + else + reuse_active_window = FALSE; + + window = NULL; + + if (reuse_active_window) { + GList *windows = gtk_application_get_windows (Main_Application); + if (windows != NULL) + window = windows->data; + } + + if (window == NULL) + window = gth_browser_new (location, file_to_select); + else if (file_to_select != NULL) + gth_browser_go_to (GTH_BROWSER (window), location, file_to_select); + else + gth_browser_load_location (GTH_BROWSER (window), location); + + if (! StartSlideshow) + gtk_window_present (GTK_WINDOW (window)); +} + + +static void +import_photos_from_location (GFile *location) +{ + GtkWidget *window; + + window = gth_browser_new (NULL, NULL); + gth_hook_invoke ("import-photos", window, location, NULL); +} + static void migrate_data (void) @@ -103,10 +137,16 @@ } +/* -- session management -- */ + + +#ifdef USE_SMCLIENT + + static void -gth_save_state (EggSMClient *client, - GKeyFile *state, - gpointer user_data) +client_save_state (EggSMClient *client, + GKeyFile *state, + gpointer user_data) { const char *argv[2] = { NULL }; GList *scan; @@ -117,7 +157,7 @@ egg_sm_client_set_restart_command (client, 1, argv); i = 0; - for (scan = gth_window_get_window_list (); scan; scan = scan->next) { + for (scan = gtk_application_get_windows (Main_Application); scan; scan = scan->next) { GtkWidget *window = scan->data; GFile *location; char *key; @@ -196,7 +236,7 @@ client_quit_requested_cb (EggSMClient *client, gpointer data) { - client_window = gth_window_get_window_list (); + client_window = gtk_application_get_windows (Main_Application); check_whether_to_save (client); } @@ -210,28 +250,7 @@ static void -gth_session_manager_init (void) -{ - EggSMClient *client = NULL; - - client = egg_sm_client_get (); - g_signal_connect (client, - "save_state", - G_CALLBACK (gth_save_state), - NULL); - g_signal_connect (client, - "quit_requested", - G_CALLBACK (client_quit_requested_cb), - NULL); - g_signal_connect (client, - "quit", - G_CALLBACK (client_quit_cb), - NULL); -} - - -static void -gth_restore_session (EggSMClient *client) +restore_session (EggSMClient *client) { GKeyFile *state = NULL; guint i; @@ -252,11 +271,9 @@ g_assert (location != NULL); - window = gth_browser_new (NULL); - gtk_widget_show (window); - file = g_file_new_for_uri (location); - gth_browser_load_location(GTH_BROWSER (window), file); + window = gth_browser_new (file, NULL); + gtk_widget_show (window); g_object_unref (file); g_free (location); @@ -264,191 +281,147 @@ } -#ifdef HAVE_UNIQUE - - -static void -show_window (GtkWindow *window, - const char *startup_id, - GdkScreen *screen) -{ - gtk_window_set_startup_id (window, startup_id); - gtk_window_set_screen (window, screen); - gtk_window_present (window); -} - - -static UniqueResponse -unique_app_message_received_cb (UniqueApp *unique_app, - UniqueCommand command, - UniqueMessageData *message, - guint time_, - gpointer user_data) -{ - UniqueResponse res; - char *uri; - GFile *location = NULL; - GtkWidget *window = NULL; - - res = UNIQUE_RESPONSE_OK; - - switch (command) { - case UNIQUE_OPEN: - case UNIQUE_NEW: - if (command == UNIQUE_OPEN) - window = gth_window_get_current_window (); +#endif - if (window == NULL) - window = gth_browser_new (NULL); - show_window (GTK_WINDOW (window), - unique_message_data_get_startup_id (message), - unique_message_data_get_screen (message)); +/* -- main application -- */ - uri = unique_message_data_get_text (message); - location = g_file_new_for_uri (uri); - gth_browser_load_location (GTH_BROWSER (window), location); - g_object_unref (location); - g_free (uri); - break; +typedef GtkApplication GthApplication; +typedef GtkApplicationClass GthApplicationClass; - case COMMAND_IMPORT_PHOTOS: - window = gth_window_get_current_window (); - if (window == NULL) - window = gth_browser_new (NULL); - - uri = unique_message_data_get_text (message); - if ((uri != NULL) && (strcmp (uri, "") != 0)) - location = g_file_new_for_uri (uri); - gth_hook_invoke ("import-photos", window, location, NULL); +static gpointer gth_application_parent_class; - _g_object_unref (location); - g_free (uri); - break; - case COMMAND_SLIDESHOW: - window = gth_window_get_current_window (); - if (window == NULL) - window = gth_browser_new (NULL); - gth_hook_invoke ("slideshow", window, NULL); +G_DEFINE_TYPE (GthApplication, gth_application, GTK_TYPE_APPLICATION) - default: - res = UNIQUE_RESPONSE_PASSTHROUGH; - break; - } - return res; +static void +gth_application_finalize (GObject *object) +{ + G_OBJECT_CLASS (gth_application_parent_class)->finalize (object); } +static void +gth_application_init (GthApplication *app) +{ +#ifdef GDK_WINDOWING_X11 + egg_set_desktop_file (GTHUMB_APPLICATIONS_DIR "/gthumb.desktop"); +#else + /* manually set name and icon */ + g_set_application_name (_("gThumb")); + gtk_window_set_default_icon_name ("gthumb"); #endif +} static void -open_browser_window (GFile *location, - GFile *current_file) +gth_application_startup (GApplication *application) { -#ifdef HAVE_UNIQUE - if (unique_app_is_running (gthumb_app)) { - UniqueMessageData *data; - char *uri; + G_APPLICATION_CLASS (gth_application_parent_class)->startup (application); - data = unique_message_data_new (); - uri = g_file_get_uri (location); - unique_message_data_set_text (data, uri, -1); - unique_app_send_message (gthumb_app, NewWindow ? UNIQUE_NEW : UNIQUE_OPEN, data); + gth_pref_initialize (); + migrate_data (); + gth_main_initialize (); + gth_main_register_default_hooks (); + gth_main_register_file_source (GTH_TYPE_FILE_SOURCE_VFS); + gth_main_register_default_sort_types (); + gth_main_register_default_tests (); + gth_main_register_default_types (); + gth_main_register_default_metadata (); + gth_main_activate_extensions (); + gth_hook_invoke ("initialize", NULL); +} - g_free (uri); - unique_message_data_free (data); - } - else -#endif +static GOptionContext * +gth_application_create_option_context (void) +{ + GOptionContext *context; + static gsize initialized = FALSE; - { - GtkWidget *window; + context = g_option_context_new (N_("- Image browser and viewer")); + g_option_context_set_translation_domain (context, GETTEXT_PACKAGE); + g_option_context_set_ignore_unknown_options (context, TRUE); + g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); - window = gth_browser_new (NULL); - if (! StartSlideshow) - gtk_window_present (GTK_WINDOW (window)); - if (current_file != NULL) - gth_browser_go_to (GTH_BROWSER (window), location, current_file); - else - gth_browser_load_location (GTH_BROWSER (window), location); + if (g_once_init_enter (&initialized)) { + g_option_context_add_group (context, gtk_get_option_group (TRUE)); +#ifdef USE_SMCLIENT + g_option_context_add_group (context, egg_sm_client_get_option_group ()); +#endif +#ifdef HAVE_CLUTTER + g_option_context_add_group (context, cogl_get_option_group ()); + g_option_context_add_group (context, clutter_get_option_group_without_init ()); + g_option_context_add_group (context, gtk_clutter_get_option_group ()); +#endif +#ifdef HAVE_GSTREAMER + g_option_context_add_group (context, gst_init_get_option_group ()); +#endif + g_once_init_leave (&initialized, TRUE); } + + return context; } -static void -import_photos_from_location (GFile *location) +static int +gth_application_command_line (GApplication *application, + GApplicationCommandLine *command_line) { -#ifdef HAVE_UNIQUE - if (unique_app_is_running (gthumb_app)) { - UniqueMessageData *data; - - data = unique_message_data_new (); - if (location != NULL) { - char *uri; - uri = g_file_get_uri (location); - unique_message_data_set_text (data, uri, -1); - g_free (uri); - } - unique_app_send_message (gthumb_app, COMMAND_IMPORT_PHOTOS, data); - unique_message_data_free (data); - } - else + char **argv; + int argc; + GOptionContext *context; + GError *error = NULL; + const char *arg; + int i; + GList *files; + GList *dirs; + GFile *location; + gboolean singleton; + GList *scan; -#endif + argv = g_application_command_line_get_arguments (command_line, &argc); - { - GtkWidget *window; + /* parse command line options */ - window = gth_browser_new (NULL); - gth_hook_invoke ("import-photos", window, location, NULL); + context = gth_application_create_option_context (); + if (! g_option_context_parse (context, &argc, &argv, &error)) { + g_critical ("Failed to parse arguments: %s", error->message); + g_error_free (error); + g_option_context_free (context); + return EXIT_FAILURE; } -} - - -static void -prepare_application (void) -{ - EggSMClient *client = NULL; - const char *arg; - int i; - GList *files; - GList *dirs; - GFile *location; - GList *scan; + g_option_context_free (context); -#ifdef HAVE_UNIQUE - gthumb_app = unique_app_new_with_commands ("org.gnome.gthumb", NULL, - "import-photos", COMMAND_IMPORT_PHOTOS, - NULL); -#endif + /* restore the session */ - gth_main_register_default_hooks (); - gth_main_register_file_source (GTH_TYPE_FILE_SOURCE_VFS); - gth_main_register_default_sort_types (); - gth_main_register_default_tests (); - gth_main_register_default_types (); - gth_main_register_default_metadata (); - gth_main_activate_extensions (); - gth_hook_invoke ("initialize", NULL); +#ifdef USE_SMCLIENT + { + EggSMClient *client; -#ifdef HAVE_UNIQUE - if (! unique_app_is_running (gthumb_app)) - g_signal_connect (gthumb_app, - "message-received", - G_CALLBACK (unique_app_message_received_cb), + client = egg_sm_client_get (); + g_signal_connect (client, + "save_state", + G_CALLBACK (client_save_state), NULL); + g_signal_connect (client, + "quit_requested", + G_CALLBACK (client_quit_requested_cb), + NULL); + g_signal_connect (client, + "quit", + G_CALLBACK (client_quit_cb), + NULL); + if (egg_sm_client_is_resumed (client)) { + restore_session (client); + return 0; + } + } #endif - client = egg_sm_client_get (); - if (egg_sm_client_is_resumed (client)) { - gth_restore_session (client); - return; - } + /* exec the command line */ if (ImportPhotos) { GFile *location = NULL; @@ -456,28 +429,34 @@ if (remaining_args != NULL) location = g_file_new_for_commandline_arg (remaining_args[0]); import_photos_from_location (location); + gdk_notify_startup_complete (); - return; + return 0; } if (remaining_args == NULL) { /* No location specified. */ - GFile *location; - char *current_file_uri; - GFile *current_file; + GFile *location; + GSettings *settings; + char *file_to_select_uri; + GFile *file_to_select; location = g_file_new_for_uri (gth_pref_get_startup_location ()); - current_file_uri = eel_gconf_get_path (PREF_STARTUP_CURRENT_FILE, NULL); - if (current_file_uri != NULL) - current_file = g_file_new_for_uri (current_file_uri); + settings = g_settings_new (GTHUMB_BROWSER_SCHEMA); + file_to_select_uri = _g_settings_get_uri (settings, PREF_BROWSER_STARTUP_CURRENT_FILE); + if (file_to_select_uri != NULL) + file_to_select = g_file_new_for_uri (file_to_select_uri); else - current_file = NULL; - open_browser_window (location, current_file); + file_to_select = NULL; + + open_browser_window (location, file_to_select, TRUE); + gdk_notify_startup_complete (); - _g_object_unref (current_file); - g_free (current_file_uri); + _g_object_unref (file_to_select); + g_free (file_to_select_uri); + g_object_unref (settings); g_object_unref (location); - return; + return 0; } /* At least a location was specified */ @@ -500,92 +479,128 @@ location = gth_hook_invoke_get ("command-line-files", files); if (location != NULL) { - open_browser_window (location, NULL); + open_browser_window (location, NULL, FALSE); g_object_unref (location); } - else /* Open each file in a new window */ + else { + /* Open each file in a new window */ + + singleton = (files != NULL) && (files->next == NULL); for (scan = files; scan; scan = scan->next) - open_browser_window ((GFile *) scan->data, NULL); + open_browser_window ((GFile *) scan->data, NULL, ! singleton); + } /* Open each dir in a new window */ + singleton = (dirs != NULL) && (dirs->next == NULL); for (scan = dirs; scan; scan = scan->next) - open_browser_window ((GFile *) scan->data, NULL); + open_browser_window ((GFile *) scan->data, NULL, ! singleton); + + gdk_notify_startup_complete (); _g_object_list_unref (dirs); _g_object_list_unref (files); + + return 0; } -int -main (int argc, char *argv[]) +static gboolean +gth_application_local_command_line (GApplication *application, + char ***arguments, + int *exit_status) +{ + char **local_argv; + int local_argc; + GOptionContext *context; + GError *error = NULL; + gboolean handled_locally = FALSE; + + local_argv = g_strdupv (*arguments); + local_argc = g_strv_length (local_argv); + + *exit_status = 0; + + context = gth_application_create_option_context (); + if (! g_option_context_parse (context, &local_argc, &local_argv, &error)) { + *exit_status = EXIT_FAILURE; + g_critical ("Failed to parse arguments: %s", error->message); + g_clear_error (&error); + handled_locally = TRUE; + } + + if (version) { + g_printf ("%s %s, Copyright © 2001-2010 Free Software Foundation, Inc.\n", PACKAGE_NAME, PACKAGE_VERSION); + handled_locally = TRUE; + } + + g_option_context_free (context); + g_strfreev (local_argv); + + return handled_locally; +} + + +static void +gth_application_class_init (GthApplicationClass *klass) { - GOptionContext *context; - GError *error = NULL; + GObjectClass *object_class; + GApplicationClass *application_class; - if (! g_thread_supported ()) - g_thread_init (NULL); + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = gth_application_finalize; - program_argv0 = argv[0]; + application_class = G_APPLICATION_CLASS (klass); + application_class->startup = gth_application_startup; + application_class->command_line = gth_application_command_line; + application_class->local_command_line = gth_application_local_command_line; +} - /* text domain */ - bindtextdomain (GETTEXT_PACKAGE, GTHUMB_LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); +static GtkApplication * +gth_application_new (void) +{ + return g_object_new (gth_application_get_type (), + "application-id", "org.gnome.Gthumb", + "flags", 0, + NULL); +} - /* command line options */ - context = g_option_context_new (N_("- Image browser and viewer")); - g_option_context_set_translation_domain (context, GETTEXT_PACKAGE); - g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); - g_option_context_add_group (context, egg_sm_client_get_option_group ()); -#ifdef HAVE_CLUTTER - g_option_context_add_group (context, cogl_get_option_group ()); - g_option_context_add_group (context, clutter_get_option_group_without_init ()); -#endif - if (! g_option_context_parse (context, &argc, &argv, &error)) { - g_critical ("Failed to parse arguments: %s", error->message); - g_error_free (error); - g_option_context_free (context); - return EXIT_FAILURE; - } +/* -- main -- */ - if (version) { - g_printf ("%s %s, Copyright © 2001-2010 Free Software Foundation, Inc.\n", PACKAGE_NAME, PACKAGE_VERSION); - return 0; - } -#ifdef HAVE_CLUTTER - ClutterInitResult = gtk_clutter_init (NULL, NULL); -#endif +int +main (int argc, char *argv[]) +{ + int status; - /* other initializations */ + program_argv0 = argv[0]; - gth_session_manager_init (); - gth_pref_initialize (); - migrate_data (); - gth_main_initialize (); - prepare_application (); + g_thread_init (NULL); + g_type_init (); - g_option_context_free (context); + /* text domain */ -#ifdef HAVE_UNIQUE - if (! unique_app_is_running (gthumb_app)) - gtk_main (); - g_object_unref (gthumb_app); -#else - gtk_main (); -#endif + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + + /* run the main application */ + + Main_Application = gth_application_new (); + status = g_application_run (G_APPLICATION (Main_Application), argc, argv); gth_main_release (); gth_pref_release (); + g_object_unref (Main_Application); + + /* restart if requested by the user */ if (Restart) g_spawn_command_line_async (program_argv0, NULL); - return 0; + return status; } @@ -595,7 +610,7 @@ GList *windows; GList *scan; - windows = g_list_copy (gth_window_get_window_list ()); + windows = g_list_copy (gtk_application_get_windows (Main_Application)); for (scan = windows; scan; scan = scan->next) gth_window_close (GTH_WINDOW (scan->data)); g_list_free (windows); diff -Nru gthumb-2.14.3/gthumb/main.h gthumb-3.0.0/gthumb/main.h --- gthumb-2.14.3/gthumb/main.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/main.h 2012-02-19 15:01:32.000000000 +0000 @@ -24,14 +24,11 @@ G_BEGIN_DECLS -extern gboolean NewWindow; -extern gboolean StartInFullscreen; -extern gboolean StartSlideshow; -extern gboolean ImportPhotos; - -#ifdef HAVE_CLUTTER -extern int ClutterInitResult; -#endif +extern GtkApplication *Main_Application; +extern gboolean NewWindow; +extern gboolean StartInFullscreen; +extern gboolean StartSlideshow; +extern gboolean ImportPhotos; void gth_quit (gboolean restart); diff -Nru gthumb-2.14.3/gthumb/main-migrate-catalogs.c gthumb-3.0.0/gthumb/main-migrate-catalogs.c --- gthumb-2.14.3/gthumb/main-migrate-catalogs.c 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/main-migrate-catalogs.c 2012-02-19 15:01:32.000000000 +0000 @@ -22,7 +22,6 @@ #include #include #include "dom.h" -#include "gconf-utils.h" #include "gio-utils.h" #include "glib-utils.h" #include "gth-time.h" @@ -33,14 +32,29 @@ #define MAX_LINE_LENGTH 4096 +typedef struct { + GSettings *settings; + GFile *collections_dir; +} MigrationData; + + +static void +migration_data_free (MigrationData *data) +{ + _g_object_unref (data->collections_dir); + _g_object_unref (data->settings); + g_free (data); +} + + static void migration_done (GError *error, gpointer user_data) { - GFile *collections_dir = user_data; + MigrationData *data = user_data; - eel_gconf_set_boolean (PREF_DATA_MIGRATION_CATALOGS_2_10, TRUE); - g_object_unref (collections_dir); + g_settings_set_boolean (data->settings, PREF_DATA_MIGRATION_CATALOGS_2_10, TRUE); + migration_data_free (data); } @@ -60,22 +74,22 @@ GFileInfo *info, gpointer user_data) { - GFile *collections_dir = user_data; - char *buffer; - gsize buffer_size; - GError *error = NULL; - DomDocument *document; - char *extension; - char *new_buffer; - gsize new_buffer_size; - char *catalogs_path; - char *relative_path; - char *tmp_path; - char *full_path_no_ext; - char *full_path; - GFile *catalog_file; - GFile *catalog_dir; - char *catalog_dir_path; + MigrationData *data = user_data; + char *buffer; + gsize buffer_size; + GError *error = NULL; + DomDocument *document; + char *extension; + char *new_buffer; + gsize new_buffer_size; + char *catalogs_path; + char *relative_path; + char *tmp_path; + char *full_path_no_ext; + char *full_path; + GFile *catalog_file; + GFile *catalog_dir; + char *catalog_dir_path; if (g_file_info_get_file_type (info) != G_FILE_TYPE_REGULAR) return; @@ -415,7 +429,7 @@ new_buffer = dom_document_dump (document, &new_buffer_size); catalogs_path = gth_user_dir_get_file (GTH_DIR_DATA, "gthumb", "catalogs", NULL); - relative_path = g_file_get_relative_path (collections_dir, file); + relative_path = g_file_get_relative_path (data->collections_dir, file); tmp_path = g_strconcat (catalogs_path, G_DIR_SEPARATOR_S, relative_path, NULL); full_path_no_ext = _g_uri_remove_extension (tmp_path); full_path = g_strconcat (full_path_no_ext, extension, NULL); @@ -468,16 +482,21 @@ void migrate_catalogs_from_2_10 (void) { - GFile *home_dir; - GFile *collections_dir; + MigrationData *data; + GFile *home_dir; - if (eel_gconf_get_boolean (PREF_DATA_MIGRATION_CATALOGS_2_10, FALSE)) + data = g_new0 (MigrationData, 1); + data->settings = g_settings_new (GTHUMB_DATA_MIGRATION_SCHEMA); + + if (g_settings_get_boolean (data->settings, PREF_DATA_MIGRATION_CATALOGS_2_10)) { + migration_data_free (data); return; + } home_dir = g_file_new_for_path (g_get_home_dir ()); - collections_dir = _g_file_get_child (home_dir, ".gnome2", "gthumb", "collections", NULL); + data->collections_dir = _g_file_get_child (home_dir, ".gnome2", "gthumb", "collections", NULL); - g_directory_foreach_child (collections_dir, + g_directory_foreach_child (data->collections_dir, TRUE, TRUE, "standard::name,standard::type", @@ -485,7 +504,7 @@ migration_start_dir, migration_for_each_file, migration_done, - collections_dir); + data); g_object_unref (home_dir); } diff -Nru gthumb-2.14.3/gthumb/Makefile.am gthumb-3.0.0/gthumb/Makefile.am --- gthumb-2.14.3/gthumb/Makefile.am 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/Makefile.am 2012-03-25 11:31:03.000000000 +0000 @@ -28,16 +28,15 @@ dom.h \ egg-macros.h \ eggfileformatchooser.h \ - gconf-utils.h \ gedit-message-area.h \ gio-utils.h \ glib-utils.h \ gnome-desktop-thumbnail.h \ gsignature.h \ + gth-auto-paned.h \ gth-async-task.h \ gth-buffer-data.h \ gth-browser.h \ - gth-cell-renderer-thumbnail.h \ gth-dumb-notebook.h \ gth-duplicable.h \ gth-embedded-dialog.h \ @@ -59,11 +58,11 @@ gth-filter-editor-dialog.h \ gth-filter-file.h \ gth-folder-tree.h \ + gth-grid-view.h \ gth-histogram.h \ gth-histogram-view.h \ gth-hook.h \ gth-icon-cache.h \ - gth-icon-view.h \ gth-image.h \ gth-image-dragger.h \ gth-image-history.h \ @@ -74,10 +73,10 @@ gth-image-viewer.h \ gth-image-viewer-tool.h \ gth-info-bar.h \ - gth-list-view.h \ gth-load-file-data-task.h \ gth-location-chooser.h \ gth-main.h \ + gth-menu-action.h \ gth-menu-button.h \ gth-metadata.h \ gth-metadata-chooser.h \ @@ -109,6 +108,7 @@ gth-thumb-loader.h \ gth-time.h \ gth-time-selector.h \ + gth-toggle-menu-action.h \ gth-toggle-menu-tool-button.h \ gth-toolbox.h \ gth-uri-list.h \ @@ -126,6 +126,7 @@ $(NULL) PRIVATE_HEADER_FILES = \ + dlg-location.h \ dlg-preferences-extensions.h \ gth-browser-actions-callbacks.h \ gth-browser-actions-entries.h \ @@ -146,20 +147,20 @@ $(PUBLIC_HEADER_FILES) \ $(PRIVATE_HEADER_FILES) \ cairo-utils.c \ + dlg-location.c \ dlg-personalize-filters.c \ dlg-preferences.c \ dlg-preferences-extensions.c \ dlg-sort-order.c \ dom.c \ - gconf-utils.c \ gio-utils.c \ glib-utils.c \ gsignature.c \ + gth-auto-paned.c \ gth-async-task.c \ gth-browser.c \ gth-browser-actions-callbacks.c \ gth-buffer-data.c \ - gth-cell-renderer-thumbnail.c \ gth-dumb-notebook.c \ gth-duplicable.c \ gth-embedded-dialog.c \ @@ -181,11 +182,11 @@ gth-filter-editor-dialog.c \ gth-filter-file.c \ gth-folder-tree.c \ + gth-grid-view.c \ gth-histogram.c \ gth-histogram-view.c \ gth-hook.c \ gth-icon-cache.c \ - gth-icon-view.c \ gth-image.c \ gth-image-dragger.c \ gth-image-history.c \ @@ -196,7 +197,6 @@ gth-image-viewer.c \ gth-image-viewer-tool.c \ gth-info-bar.c \ - gth-list-view.c \ gth-load-file-data-task.c \ gth-location-chooser.c \ gth-main.c \ @@ -205,6 +205,7 @@ gth-main-default-sort-types.c \ gth-main-default-tests.c \ gth-main-default-types.c \ + gth-menu-action.c \ gth-menu-button.c \ gth-metadata.c \ gth-metadata-chooser.c \ @@ -236,6 +237,7 @@ gth-thumb-loader.c \ gth-time.c \ gth-time-selector.c \ + gth-toggle-menu-action.c \ gth-toggle-menu-tool-button.c \ gth-toolbox.c \ gth-uri-list.c \ @@ -273,15 +275,18 @@ $(LIBOPENRAW_LIBS) \ $(LIBSOUP_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ + $(LIBRSVG_LIBS) \ $(NULL) if RUN_IN_PLACE -ui_dir = $(abs_top_srcdir)/data/ui -icon_dir = $(abs_top_srcdir)/data/icons +data_dir = $(abs_top_srcdir)/data +ui_dir = $(data_dir)/ui +icon_dir = $(data_dir)/icons extensions_ui_dir = $(abs_top_srcdir)/extensions extensions_dir = $(abs_top_builddir)/extensions applications_dir = $(abs_top_builddir)/data else +data_dir = $(datadir) ui_dir = $(pkgdatadir)/ui icon_dir = $(pkgdatadir)/icons extensions_ui_dir = $(pkgdatadir)/ui @@ -307,7 +312,7 @@ -DGTHUMB_LOCALEDIR=\"$(datadir)/locale\" \ -DGTHUMB_PREFIX=\"$(prefix)\" \ -DGTHUMB_SYSCONFDIR=\"$(sysconfdir)\" \ - -DGTHUMB_DATADIR=\"$(datadir)\" \ + -DGTHUMB_DATADIR=\"$(data_dir)\" \ -DGTHUMB_LIBDIR=\"$(libdir)\" \ -DGTHUMB_PKGDATADIR=\"$(pkgdatadir)\" \ -DGTHUMB_UI_DIR=\"$(ui_dir)\" \ diff -Nru gthumb-2.14.3/gthumb/Makefile.in gthumb-3.0.0/gthumb/Makefile.in --- gthumb-2.14.3/gthumb/Makefile.in 2012-03-25 18:34:16.000000000 +0000 +++ gthumb-3.0.0/gthumb/Makefile.in 2012-04-23 18:09:52.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -65,16 +82,16 @@ am__objects_5 = $(am__objects_4) am_gthumb_OBJECTS = $(am__objects_1) $(am__objects_2) $(am__objects_3) \ $(am__objects_5) $(am__objects_4) gthumb-cairo-utils.$(OBJEXT) \ + gthumb-dlg-location.$(OBJEXT) \ gthumb-dlg-personalize-filters.$(OBJEXT) \ gthumb-dlg-preferences.$(OBJEXT) \ gthumb-dlg-preferences-extensions.$(OBJEXT) \ gthumb-dlg-sort-order.$(OBJEXT) gthumb-dom.$(OBJEXT) \ - gthumb-gconf-utils.$(OBJEXT) gthumb-gio-utils.$(OBJEXT) \ - gthumb-glib-utils.$(OBJEXT) gthumb-gsignature.$(OBJEXT) \ + gthumb-gio-utils.$(OBJEXT) gthumb-glib-utils.$(OBJEXT) \ + gthumb-gsignature.$(OBJEXT) gthumb-gth-auto-paned.$(OBJEXT) \ gthumb-gth-async-task.$(OBJEXT) gthumb-gth-browser.$(OBJEXT) \ gthumb-gth-browser-actions-callbacks.$(OBJEXT) \ gthumb-gth-buffer-data.$(OBJEXT) \ - gthumb-gth-cell-renderer-thumbnail.$(OBJEXT) \ gthumb-gth-dumb-notebook.$(OBJEXT) \ gthumb-gth-duplicable.$(OBJEXT) \ gthumb-gth-embedded-dialog.$(OBJEXT) \ @@ -92,10 +109,10 @@ gthumb-gth-filter-editor-dialog.$(OBJEXT) \ gthumb-gth-filter-file.$(OBJEXT) \ gthumb-gth-folder-tree.$(OBJEXT) \ - gthumb-gth-histogram.$(OBJEXT) \ + gthumb-gth-grid-view.$(OBJEXT) gthumb-gth-histogram.$(OBJEXT) \ gthumb-gth-histogram-view.$(OBJEXT) gthumb-gth-hook.$(OBJEXT) \ - gthumb-gth-icon-cache.$(OBJEXT) gthumb-gth-icon-view.$(OBJEXT) \ - gthumb-gth-image.$(OBJEXT) gthumb-gth-image-dragger.$(OBJEXT) \ + gthumb-gth-icon-cache.$(OBJEXT) gthumb-gth-image.$(OBJEXT) \ + gthumb-gth-image-dragger.$(OBJEXT) \ gthumb-gth-image-history.$(OBJEXT) \ gthumb-gth-image-loader.$(OBJEXT) \ gthumb-gth-image-navigator.$(OBJEXT) \ @@ -103,7 +120,7 @@ gthumb-gth-image-selector.$(OBJEXT) \ gthumb-gth-image-viewer.$(OBJEXT) \ gthumb-gth-image-viewer-tool.$(OBJEXT) \ - gthumb-gth-info-bar.$(OBJEXT) gthumb-gth-list-view.$(OBJEXT) \ + gthumb-gth-info-bar.$(OBJEXT) \ gthumb-gth-load-file-data-task.$(OBJEXT) \ gthumb-gth-location-chooser.$(OBJEXT) \ gthumb-gth-main.$(OBJEXT) \ @@ -112,6 +129,7 @@ gthumb-gth-main-default-sort-types.$(OBJEXT) \ gthumb-gth-main-default-tests.$(OBJEXT) \ gthumb-gth-main-default-types.$(OBJEXT) \ + gthumb-gth-menu-action.$(OBJEXT) \ gthumb-gth-menu-button.$(OBJEXT) gthumb-gth-metadata.$(OBJEXT) \ gthumb-gth-metadata-chooser.$(OBJEXT) \ gthumb-gth-metadata-provider.$(OBJEXT) \ @@ -137,6 +155,7 @@ gthumb-gth-test-simple.$(OBJEXT) \ gthumb-gth-thumb-loader.$(OBJEXT) gthumb-gth-time.$(OBJEXT) \ gthumb-gth-time-selector.$(OBJEXT) \ + gthumb-gth-toggle-menu-action.$(OBJEXT) \ gthumb-gth-toggle-menu-tool-button.$(OBJEXT) \ gthumb-gth-toolbox.$(OBJEXT) gthumb-gth-uri-list.$(OBJEXT) \ gthumb-gth-user-dir.$(OBJEXT) gthumb-gth-viewer-page.$(OBJEXT) \ @@ -190,6 +209,11 @@ am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(gthumb_SOURCES) DIST_SOURCES = $(gthumb_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -265,10 +289,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -276,6 +298,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -315,6 +338,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -363,8 +388,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -395,6 +418,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -453,16 +477,15 @@ dom.h \ egg-macros.h \ eggfileformatchooser.h \ - gconf-utils.h \ gedit-message-area.h \ gio-utils.h \ glib-utils.h \ gnome-desktop-thumbnail.h \ gsignature.h \ + gth-auto-paned.h \ gth-async-task.h \ gth-buffer-data.h \ gth-browser.h \ - gth-cell-renderer-thumbnail.h \ gth-dumb-notebook.h \ gth-duplicable.h \ gth-embedded-dialog.h \ @@ -484,11 +507,11 @@ gth-filter-editor-dialog.h \ gth-filter-file.h \ gth-folder-tree.h \ + gth-grid-view.h \ gth-histogram.h \ gth-histogram-view.h \ gth-hook.h \ gth-icon-cache.h \ - gth-icon-view.h \ gth-image.h \ gth-image-dragger.h \ gth-image-history.h \ @@ -499,10 +522,10 @@ gth-image-viewer.h \ gth-image-viewer-tool.h \ gth-info-bar.h \ - gth-list-view.h \ gth-load-file-data-task.h \ gth-location-chooser.h \ gth-main.h \ + gth-menu-action.h \ gth-menu-button.h \ gth-metadata.h \ gth-metadata-chooser.h \ @@ -534,6 +557,7 @@ gth-thumb-loader.h \ gth-time.h \ gth-time-selector.h \ + gth-toggle-menu-action.h \ gth-toggle-menu-tool-button.h \ gth-toolbox.h \ gth-uri-list.h \ @@ -551,6 +575,7 @@ $(NULL) PRIVATE_HEADER_FILES = \ + dlg-location.h \ dlg-preferences-extensions.h \ gth-browser-actions-callbacks.h \ gth-browser-actions-entries.h \ @@ -571,20 +596,20 @@ $(PUBLIC_HEADER_FILES) \ $(PRIVATE_HEADER_FILES) \ cairo-utils.c \ + dlg-location.c \ dlg-personalize-filters.c \ dlg-preferences.c \ dlg-preferences-extensions.c \ dlg-sort-order.c \ dom.c \ - gconf-utils.c \ gio-utils.c \ glib-utils.c \ gsignature.c \ + gth-auto-paned.c \ gth-async-task.c \ gth-browser.c \ gth-browser-actions-callbacks.c \ gth-buffer-data.c \ - gth-cell-renderer-thumbnail.c \ gth-dumb-notebook.c \ gth-duplicable.c \ gth-embedded-dialog.c \ @@ -606,11 +631,11 @@ gth-filter-editor-dialog.c \ gth-filter-file.c \ gth-folder-tree.c \ + gth-grid-view.c \ gth-histogram.c \ gth-histogram-view.c \ gth-hook.c \ gth-icon-cache.c \ - gth-icon-view.c \ gth-image.c \ gth-image-dragger.c \ gth-image-history.c \ @@ -621,7 +646,6 @@ gth-image-viewer.c \ gth-image-viewer-tool.c \ gth-info-bar.c \ - gth-list-view.c \ gth-load-file-data-task.c \ gth-location-chooser.c \ gth-main.c \ @@ -630,6 +654,7 @@ gth-main-default-sort-types.c \ gth-main-default-tests.c \ gth-main-default-types.c \ + gth-menu-action.c \ gth-menu-button.c \ gth-metadata.c \ gth-metadata-chooser.c \ @@ -661,6 +686,7 @@ gth-thumb-loader.c \ gth-time.c \ gth-time-selector.c \ + gth-toggle-menu-action.c \ gth-toggle-menu-tool-button.c \ gth-toolbox.c \ gth-uri-list.c \ @@ -695,12 +721,15 @@ $(LIBOPENRAW_LIBS) \ $(LIBSOUP_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ + $(LIBRSVG_LIBS) \ $(NULL) +@RUN_IN_PLACE_FALSE@data_dir = $(datadir) +@RUN_IN_PLACE_TRUE@data_dir = $(abs_top_srcdir)/data @RUN_IN_PLACE_FALSE@ui_dir = $(pkgdatadir)/ui -@RUN_IN_PLACE_TRUE@ui_dir = $(abs_top_srcdir)/data/ui +@RUN_IN_PLACE_TRUE@ui_dir = $(data_dir)/ui @RUN_IN_PLACE_FALSE@icon_dir = $(pkgdatadir)/icons -@RUN_IN_PLACE_TRUE@icon_dir = $(abs_top_srcdir)/data/icons +@RUN_IN_PLACE_TRUE@icon_dir = $(data_dir)/icons @RUN_IN_PLACE_FALSE@extensions_ui_dir = $(pkgdatadir)/ui @RUN_IN_PLACE_TRUE@extensions_ui_dir = $(abs_top_srcdir)/extensions @RUN_IN_PLACE_FALSE@extensions_dir = $(pkglibdir)/extensions @@ -725,7 +754,7 @@ -DGTHUMB_LOCALEDIR=\"$(datadir)/locale\" \ -DGTHUMB_PREFIX=\"$(prefix)\" \ -DGTHUMB_SYSCONFDIR=\"$(sysconfdir)\" \ - -DGTHUMB_DATADIR=\"$(datadir)\" \ + -DGTHUMB_DATADIR=\"$(data_dir)\" \ -DGTHUMB_LIBDIR=\"$(libdir)\" \ -DGTHUMB_PKGDATADIR=\"$(pkgdatadir)\" \ -DGTHUMB_UI_DIR=\"$(ui_dir)\" \ @@ -783,8 +812,11 @@ $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ while read p p1; do if test -f $$p || test -f $$p1; \ @@ -835,13 +867,13 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-cairo-utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-dlg-location.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-dlg-personalize-filters.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-dlg-preferences-extensions.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-dlg-preferences.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-dlg-sort-order.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-dom.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-eggfileformatchooser.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gconf-utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gedit-message-area.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gio-utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-glib-utils.Po@am__quote@ @@ -849,10 +881,10 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gnome-thumbnail-pixbuf-utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gsignature.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-async-task.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-auto-paned.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-browser-actions-callbacks.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-browser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-buffer-data.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-cell-renderer-thumbnail.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-dumb-notebook.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-duplicable.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-embedded-dialog.Po@am__quote@ @@ -875,11 +907,11 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-filter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-filterbar.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-folder-tree.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-grid-view.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-histogram-view.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-histogram.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-hook.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-icon-cache.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-icon-view.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-image-dragger.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-image-history.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-image-loader.Po@am__quote@ @@ -890,7 +922,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-image-viewer.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-image.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-info-bar.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-list-view.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-load-file-data-task.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-location-chooser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-main-default-hooks.Po@am__quote@ @@ -900,6 +931,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-main-default-types.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-marshal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-menu-action.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-menu-button.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-metadata-chooser.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-metadata-provider-file.Po@am__quote@ @@ -931,6 +963,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-thumb-loader.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-time-selector.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-time.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-toggle-menu-action.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-toggle-menu-tool-button.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-toolbox.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gthumb-gth-uri-list.Po@am__quote@ @@ -1066,6 +1099,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-cairo-utils.obj `if test -f 'cairo-utils.c'; then $(CYGPATH_W) 'cairo-utils.c'; else $(CYGPATH_W) '$(srcdir)/cairo-utils.c'; fi` +gthumb-dlg-location.o: dlg-location.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-dlg-location.o -MD -MP -MF $(DEPDIR)/gthumb-dlg-location.Tpo -c -o gthumb-dlg-location.o `test -f 'dlg-location.c' || echo '$(srcdir)/'`dlg-location.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-dlg-location.Tpo $(DEPDIR)/gthumb-dlg-location.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dlg-location.c' object='gthumb-dlg-location.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-dlg-location.o `test -f 'dlg-location.c' || echo '$(srcdir)/'`dlg-location.c + +gthumb-dlg-location.obj: dlg-location.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-dlg-location.obj -MD -MP -MF $(DEPDIR)/gthumb-dlg-location.Tpo -c -o gthumb-dlg-location.obj `if test -f 'dlg-location.c'; then $(CYGPATH_W) 'dlg-location.c'; else $(CYGPATH_W) '$(srcdir)/dlg-location.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-dlg-location.Tpo $(DEPDIR)/gthumb-dlg-location.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dlg-location.c' object='gthumb-dlg-location.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-dlg-location.obj `if test -f 'dlg-location.c'; then $(CYGPATH_W) 'dlg-location.c'; else $(CYGPATH_W) '$(srcdir)/dlg-location.c'; fi` + gthumb-dlg-personalize-filters.o: dlg-personalize-filters.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-dlg-personalize-filters.o -MD -MP -MF $(DEPDIR)/gthumb-dlg-personalize-filters.Tpo -c -o gthumb-dlg-personalize-filters.o `test -f 'dlg-personalize-filters.c' || echo '$(srcdir)/'`dlg-personalize-filters.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-dlg-personalize-filters.Tpo $(DEPDIR)/gthumb-dlg-personalize-filters.Po @@ -1136,20 +1183,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-dom.obj `if test -f 'dom.c'; then $(CYGPATH_W) 'dom.c'; else $(CYGPATH_W) '$(srcdir)/dom.c'; fi` -gthumb-gconf-utils.o: gconf-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gconf-utils.o -MD -MP -MF $(DEPDIR)/gthumb-gconf-utils.Tpo -c -o gthumb-gconf-utils.o `test -f 'gconf-utils.c' || echo '$(srcdir)/'`gconf-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gconf-utils.Tpo $(DEPDIR)/gthumb-gconf-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gconf-utils.c' object='gthumb-gconf-utils.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gconf-utils.o `test -f 'gconf-utils.c' || echo '$(srcdir)/'`gconf-utils.c - -gthumb-gconf-utils.obj: gconf-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gconf-utils.obj -MD -MP -MF $(DEPDIR)/gthumb-gconf-utils.Tpo -c -o gthumb-gconf-utils.obj `if test -f 'gconf-utils.c'; then $(CYGPATH_W) 'gconf-utils.c'; else $(CYGPATH_W) '$(srcdir)/gconf-utils.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gconf-utils.Tpo $(DEPDIR)/gthumb-gconf-utils.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gconf-utils.c' object='gthumb-gconf-utils.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gconf-utils.obj `if test -f 'gconf-utils.c'; then $(CYGPATH_W) 'gconf-utils.c'; else $(CYGPATH_W) '$(srcdir)/gconf-utils.c'; fi` - gthumb-gio-utils.o: gio-utils.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gio-utils.o -MD -MP -MF $(DEPDIR)/gthumb-gio-utils.Tpo -c -o gthumb-gio-utils.o `test -f 'gio-utils.c' || echo '$(srcdir)/'`gio-utils.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gio-utils.Tpo $(DEPDIR)/gthumb-gio-utils.Po @@ -1192,6 +1225,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gsignature.obj `if test -f 'gsignature.c'; then $(CYGPATH_W) 'gsignature.c'; else $(CYGPATH_W) '$(srcdir)/gsignature.c'; fi` +gthumb-gth-auto-paned.o: gth-auto-paned.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-auto-paned.o -MD -MP -MF $(DEPDIR)/gthumb-gth-auto-paned.Tpo -c -o gthumb-gth-auto-paned.o `test -f 'gth-auto-paned.c' || echo '$(srcdir)/'`gth-auto-paned.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-auto-paned.Tpo $(DEPDIR)/gthumb-gth-auto-paned.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-auto-paned.c' object='gthumb-gth-auto-paned.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-auto-paned.o `test -f 'gth-auto-paned.c' || echo '$(srcdir)/'`gth-auto-paned.c + +gthumb-gth-auto-paned.obj: gth-auto-paned.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-auto-paned.obj -MD -MP -MF $(DEPDIR)/gthumb-gth-auto-paned.Tpo -c -o gthumb-gth-auto-paned.obj `if test -f 'gth-auto-paned.c'; then $(CYGPATH_W) 'gth-auto-paned.c'; else $(CYGPATH_W) '$(srcdir)/gth-auto-paned.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-auto-paned.Tpo $(DEPDIR)/gthumb-gth-auto-paned.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-auto-paned.c' object='gthumb-gth-auto-paned.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-auto-paned.obj `if test -f 'gth-auto-paned.c'; then $(CYGPATH_W) 'gth-auto-paned.c'; else $(CYGPATH_W) '$(srcdir)/gth-auto-paned.c'; fi` + gthumb-gth-async-task.o: gth-async-task.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-async-task.o -MD -MP -MF $(DEPDIR)/gthumb-gth-async-task.Tpo -c -o gthumb-gth-async-task.o `test -f 'gth-async-task.c' || echo '$(srcdir)/'`gth-async-task.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-async-task.Tpo $(DEPDIR)/gthumb-gth-async-task.Po @@ -1248,20 +1295,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-buffer-data.obj `if test -f 'gth-buffer-data.c'; then $(CYGPATH_W) 'gth-buffer-data.c'; else $(CYGPATH_W) '$(srcdir)/gth-buffer-data.c'; fi` -gthumb-gth-cell-renderer-thumbnail.o: gth-cell-renderer-thumbnail.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-cell-renderer-thumbnail.o -MD -MP -MF $(DEPDIR)/gthumb-gth-cell-renderer-thumbnail.Tpo -c -o gthumb-gth-cell-renderer-thumbnail.o `test -f 'gth-cell-renderer-thumbnail.c' || echo '$(srcdir)/'`gth-cell-renderer-thumbnail.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-cell-renderer-thumbnail.Tpo $(DEPDIR)/gthumb-gth-cell-renderer-thumbnail.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-cell-renderer-thumbnail.c' object='gthumb-gth-cell-renderer-thumbnail.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-cell-renderer-thumbnail.o `test -f 'gth-cell-renderer-thumbnail.c' || echo '$(srcdir)/'`gth-cell-renderer-thumbnail.c - -gthumb-gth-cell-renderer-thumbnail.obj: gth-cell-renderer-thumbnail.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-cell-renderer-thumbnail.obj -MD -MP -MF $(DEPDIR)/gthumb-gth-cell-renderer-thumbnail.Tpo -c -o gthumb-gth-cell-renderer-thumbnail.obj `if test -f 'gth-cell-renderer-thumbnail.c'; then $(CYGPATH_W) 'gth-cell-renderer-thumbnail.c'; else $(CYGPATH_W) '$(srcdir)/gth-cell-renderer-thumbnail.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-cell-renderer-thumbnail.Tpo $(DEPDIR)/gthumb-gth-cell-renderer-thumbnail.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-cell-renderer-thumbnail.c' object='gthumb-gth-cell-renderer-thumbnail.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-cell-renderer-thumbnail.obj `if test -f 'gth-cell-renderer-thumbnail.c'; then $(CYGPATH_W) 'gth-cell-renderer-thumbnail.c'; else $(CYGPATH_W) '$(srcdir)/gth-cell-renderer-thumbnail.c'; fi` - gthumb-gth-dumb-notebook.o: gth-dumb-notebook.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-dumb-notebook.o -MD -MP -MF $(DEPDIR)/gthumb-gth-dumb-notebook.Tpo -c -o gthumb-gth-dumb-notebook.o `test -f 'gth-dumb-notebook.c' || echo '$(srcdir)/'`gth-dumb-notebook.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-dumb-notebook.Tpo $(DEPDIR)/gthumb-gth-dumb-notebook.Po @@ -1556,6 +1589,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-folder-tree.obj `if test -f 'gth-folder-tree.c'; then $(CYGPATH_W) 'gth-folder-tree.c'; else $(CYGPATH_W) '$(srcdir)/gth-folder-tree.c'; fi` +gthumb-gth-grid-view.o: gth-grid-view.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-grid-view.o -MD -MP -MF $(DEPDIR)/gthumb-gth-grid-view.Tpo -c -o gthumb-gth-grid-view.o `test -f 'gth-grid-view.c' || echo '$(srcdir)/'`gth-grid-view.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-grid-view.Tpo $(DEPDIR)/gthumb-gth-grid-view.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-grid-view.c' object='gthumb-gth-grid-view.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-grid-view.o `test -f 'gth-grid-view.c' || echo '$(srcdir)/'`gth-grid-view.c + +gthumb-gth-grid-view.obj: gth-grid-view.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-grid-view.obj -MD -MP -MF $(DEPDIR)/gthumb-gth-grid-view.Tpo -c -o gthumb-gth-grid-view.obj `if test -f 'gth-grid-view.c'; then $(CYGPATH_W) 'gth-grid-view.c'; else $(CYGPATH_W) '$(srcdir)/gth-grid-view.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-grid-view.Tpo $(DEPDIR)/gthumb-gth-grid-view.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-grid-view.c' object='gthumb-gth-grid-view.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-grid-view.obj `if test -f 'gth-grid-view.c'; then $(CYGPATH_W) 'gth-grid-view.c'; else $(CYGPATH_W) '$(srcdir)/gth-grid-view.c'; fi` + gthumb-gth-histogram.o: gth-histogram.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-histogram.o -MD -MP -MF $(DEPDIR)/gthumb-gth-histogram.Tpo -c -o gthumb-gth-histogram.o `test -f 'gth-histogram.c' || echo '$(srcdir)/'`gth-histogram.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-histogram.Tpo $(DEPDIR)/gthumb-gth-histogram.Po @@ -1612,20 +1659,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-icon-cache.obj `if test -f 'gth-icon-cache.c'; then $(CYGPATH_W) 'gth-icon-cache.c'; else $(CYGPATH_W) '$(srcdir)/gth-icon-cache.c'; fi` -gthumb-gth-icon-view.o: gth-icon-view.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-icon-view.o -MD -MP -MF $(DEPDIR)/gthumb-gth-icon-view.Tpo -c -o gthumb-gth-icon-view.o `test -f 'gth-icon-view.c' || echo '$(srcdir)/'`gth-icon-view.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-icon-view.Tpo $(DEPDIR)/gthumb-gth-icon-view.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-icon-view.c' object='gthumb-gth-icon-view.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-icon-view.o `test -f 'gth-icon-view.c' || echo '$(srcdir)/'`gth-icon-view.c - -gthumb-gth-icon-view.obj: gth-icon-view.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-icon-view.obj -MD -MP -MF $(DEPDIR)/gthumb-gth-icon-view.Tpo -c -o gthumb-gth-icon-view.obj `if test -f 'gth-icon-view.c'; then $(CYGPATH_W) 'gth-icon-view.c'; else $(CYGPATH_W) '$(srcdir)/gth-icon-view.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-icon-view.Tpo $(DEPDIR)/gthumb-gth-icon-view.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-icon-view.c' object='gthumb-gth-icon-view.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-icon-view.obj `if test -f 'gth-icon-view.c'; then $(CYGPATH_W) 'gth-icon-view.c'; else $(CYGPATH_W) '$(srcdir)/gth-icon-view.c'; fi` - gthumb-gth-image.o: gth-image.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-image.o -MD -MP -MF $(DEPDIR)/gthumb-gth-image.Tpo -c -o gthumb-gth-image.o `test -f 'gth-image.c' || echo '$(srcdir)/'`gth-image.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-image.Tpo $(DEPDIR)/gthumb-gth-image.Po @@ -1766,20 +1799,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-info-bar.obj `if test -f 'gth-info-bar.c'; then $(CYGPATH_W) 'gth-info-bar.c'; else $(CYGPATH_W) '$(srcdir)/gth-info-bar.c'; fi` -gthumb-gth-list-view.o: gth-list-view.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-list-view.o -MD -MP -MF $(DEPDIR)/gthumb-gth-list-view.Tpo -c -o gthumb-gth-list-view.o `test -f 'gth-list-view.c' || echo '$(srcdir)/'`gth-list-view.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-list-view.Tpo $(DEPDIR)/gthumb-gth-list-view.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-list-view.c' object='gthumb-gth-list-view.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-list-view.o `test -f 'gth-list-view.c' || echo '$(srcdir)/'`gth-list-view.c - -gthumb-gth-list-view.obj: gth-list-view.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-list-view.obj -MD -MP -MF $(DEPDIR)/gthumb-gth-list-view.Tpo -c -o gthumb-gth-list-view.obj `if test -f 'gth-list-view.c'; then $(CYGPATH_W) 'gth-list-view.c'; else $(CYGPATH_W) '$(srcdir)/gth-list-view.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-list-view.Tpo $(DEPDIR)/gthumb-gth-list-view.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-list-view.c' object='gthumb-gth-list-view.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-list-view.obj `if test -f 'gth-list-view.c'; then $(CYGPATH_W) 'gth-list-view.c'; else $(CYGPATH_W) '$(srcdir)/gth-list-view.c'; fi` - gthumb-gth-load-file-data-task.o: gth-load-file-data-task.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-load-file-data-task.o -MD -MP -MF $(DEPDIR)/gthumb-gth-load-file-data-task.Tpo -c -o gthumb-gth-load-file-data-task.o `test -f 'gth-load-file-data-task.c' || echo '$(srcdir)/'`gth-load-file-data-task.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-load-file-data-task.Tpo $(DEPDIR)/gthumb-gth-load-file-data-task.Po @@ -1892,6 +1911,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-main-default-types.obj `if test -f 'gth-main-default-types.c'; then $(CYGPATH_W) 'gth-main-default-types.c'; else $(CYGPATH_W) '$(srcdir)/gth-main-default-types.c'; fi` +gthumb-gth-menu-action.o: gth-menu-action.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-menu-action.o -MD -MP -MF $(DEPDIR)/gthumb-gth-menu-action.Tpo -c -o gthumb-gth-menu-action.o `test -f 'gth-menu-action.c' || echo '$(srcdir)/'`gth-menu-action.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-menu-action.Tpo $(DEPDIR)/gthumb-gth-menu-action.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-menu-action.c' object='gthumb-gth-menu-action.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-menu-action.o `test -f 'gth-menu-action.c' || echo '$(srcdir)/'`gth-menu-action.c + +gthumb-gth-menu-action.obj: gth-menu-action.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-menu-action.obj -MD -MP -MF $(DEPDIR)/gthumb-gth-menu-action.Tpo -c -o gthumb-gth-menu-action.obj `if test -f 'gth-menu-action.c'; then $(CYGPATH_W) 'gth-menu-action.c'; else $(CYGPATH_W) '$(srcdir)/gth-menu-action.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-menu-action.Tpo $(DEPDIR)/gthumb-gth-menu-action.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-menu-action.c' object='gthumb-gth-menu-action.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-menu-action.obj `if test -f 'gth-menu-action.c'; then $(CYGPATH_W) 'gth-menu-action.c'; else $(CYGPATH_W) '$(srcdir)/gth-menu-action.c'; fi` + gthumb-gth-menu-button.o: gth-menu-button.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-menu-button.o -MD -MP -MF $(DEPDIR)/gthumb-gth-menu-button.Tpo -c -o gthumb-gth-menu-button.o `test -f 'gth-menu-button.c' || echo '$(srcdir)/'`gth-menu-button.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-menu-button.Tpo $(DEPDIR)/gthumb-gth-menu-button.Po @@ -2326,6 +2359,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-time-selector.obj `if test -f 'gth-time-selector.c'; then $(CYGPATH_W) 'gth-time-selector.c'; else $(CYGPATH_W) '$(srcdir)/gth-time-selector.c'; fi` +gthumb-gth-toggle-menu-action.o: gth-toggle-menu-action.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-toggle-menu-action.o -MD -MP -MF $(DEPDIR)/gthumb-gth-toggle-menu-action.Tpo -c -o gthumb-gth-toggle-menu-action.o `test -f 'gth-toggle-menu-action.c' || echo '$(srcdir)/'`gth-toggle-menu-action.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-toggle-menu-action.Tpo $(DEPDIR)/gthumb-gth-toggle-menu-action.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-toggle-menu-action.c' object='gthumb-gth-toggle-menu-action.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-toggle-menu-action.o `test -f 'gth-toggle-menu-action.c' || echo '$(srcdir)/'`gth-toggle-menu-action.c + +gthumb-gth-toggle-menu-action.obj: gth-toggle-menu-action.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-toggle-menu-action.obj -MD -MP -MF $(DEPDIR)/gthumb-gth-toggle-menu-action.Tpo -c -o gthumb-gth-toggle-menu-action.obj `if test -f 'gth-toggle-menu-action.c'; then $(CYGPATH_W) 'gth-toggle-menu-action.c'; else $(CYGPATH_W) '$(srcdir)/gth-toggle-menu-action.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-toggle-menu-action.Tpo $(DEPDIR)/gthumb-gth-toggle-menu-action.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gth-toggle-menu-action.c' object='gthumb-gth-toggle-menu-action.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -c -o gthumb-gth-toggle-menu-action.obj `if test -f 'gth-toggle-menu-action.c'; then $(CYGPATH_W) 'gth-toggle-menu-action.c'; else $(CYGPATH_W) '$(srcdir)/gth-toggle-menu-action.c'; fi` + gthumb-gth-toggle-menu-tool-button.o: gth-toggle-menu-tool-button.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gthumb_CFLAGS) $(CFLAGS) -MT gthumb-gth-toggle-menu-tool-button.o -MD -MP -MF $(DEPDIR)/gthumb-gth-toggle-menu-tool-button.Tpo -c -o gthumb-gth-toggle-menu-tool-button.o `test -f 'gth-toggle-menu-tool-button.c' || echo '$(srcdir)/'`gth-toggle-menu-tool-button.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gthumb-gth-toggle-menu-tool-button.Tpo $(DEPDIR)/gthumb-gth-toggle-menu-tool-button.Po @@ -2543,8 +2590,11 @@ -rm -rf .libs _libs install-gthumbincludeHEADERS: $(gthumbinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(gthumbincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gthumbincludedir)" @list='$(gthumbinclude_HEADERS)'; test -n "$(gthumbincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(gthumbincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(gthumbincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -2561,8 +2611,11 @@ dir='$(DESTDIR)$(gthumbincludedir)'; $(am__uninstall_files_from_dir) install-gthumbsubincludeHEADERS: $(gthumbsubinclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(gthumbsubincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gthumbsubincludedir)" @list='$(gthumbsubinclude_HEADERS)'; test -n "$(gthumbsubincludedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(gthumbsubincludedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(gthumbsubincludedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/gthumb/pixbuf-utils.c gthumb-3.0.0/gthumb/pixbuf-utils.c --- gthumb-2.14.3/gthumb/pixbuf-utils.c 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/pixbuf-utils.c 2012-02-19 15:01:32.000000000 +0000 @@ -341,8 +341,7 @@ * modified for gthumb */ GdkPixbuf * _gdk_pixbuf_colorize (GdkPixbuf *src, - GdkColor *new_color, - gdouble alpha) + GdkRGBA *new_color) { gint i, j; gint width, height, has_alpha, src_row_stride, dst_row_stride; @@ -379,9 +378,9 @@ *pixdest++ = (*pixsrc++ * green_value) >> 8; *pixdest++ = (*pixsrc++ * blue_value) >> 8; if (has_alpha) - *pixdest++ = (*pixsrc++ * alpha); + *pixdest++ = (*pixsrc++ * new_color->alpha); else - *pixdest++ = (255 * alpha); + *pixdest++ = (255 * new_color->alpha); } } diff -Nru gthumb-2.14.3/gthumb/pixbuf-utils.h gthumb-3.0.0/gthumb/pixbuf-utils.h --- gthumb-2.14.3/gthumb/pixbuf-utils.h 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/gthumb/pixbuf-utils.h 2012-02-19 15:01:32.000000000 +0000 @@ -52,8 +52,7 @@ GdkPixbuf *src, int shift); GdkPixbuf * _gdk_pixbuf_colorize (GdkPixbuf *src, - GdkColor *new_color, - gdouble alpha); + GdkRGBA *new_color); void _gdk_pixbuf_vertical_gradient (GdkPixbuf *pixbuf, guint32 color1, guint32 color2); diff -Nru gthumb-2.14.3/gthumb/typedefs.h gthumb-3.0.0/gthumb/typedefs.h --- gthumb-2.14.3/gthumb/typedefs.h 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/gthumb/typedefs.h 2012-02-19 15:01:32.000000000 +0000 @@ -26,15 +26,6 @@ G_BEGIN_DECLS -/* -#define RC_DIR ".gnome2/gthumb" -#define RC_CATALOG_DIR ".gnome2/gthumb/collections" -#define RC_COMMENTS_DIR ".gnome2/gthumb/comments" -#define RC_BOOKMARKS_FILE ".gnome2/gthumb/bookmarks" -#define RC_HISTORY_FILE ".gnome2/gthumb/history" -#define RC_CATEGORIES_FILE ".gnome2/gthumb/categories" -#define RC_REMOTE_CACHE_DIR ".gnome2/gthumb/remote_cache" -*/ #define BOOKMARKS_FILE "bookmarks.xbel" #define FILTERS_FILE "filters.xml" @@ -132,6 +123,7 @@ GTH_GRID_UNIFORM } GthGridType; + typedef void (*DataFunc) (gpointer user_data); typedef void (*ReadyFunc) (GError *error, gpointer user_data); @@ -148,6 +140,7 @@ GtkWidget *dialog, gpointer user_data); + G_END_DECLS #endif /* TYPEDEFS_H */ diff -Nru gthumb-2.14.3/help/C/import.page gthumb-3.0.0/help/C/import.page --- gthumb-2.14.3/help/C/import.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/C/import.page 2012-04-23 19:15:27.000000000 +0000 @@ -34,7 +34,7 @@

An event name may also be optionally associated with the photos. This event name can be used to generate an automatic subfolder name (possibly incorporating a date) as described below. For example, - if the base destinator folder is "/photos", and you enter + if the base destination folder is "/photos", and you enter "Wedding-Jennifer" in the Event field, you can configure generation of automatic subfolders like "/photos/2010-07-31, Wedding-Jennifer".

diff -Nru gthumb-2.14.3/help/C/index.page gthumb-3.0.0/help/C/index.page --- gthumb-2.14.3/help/C/index.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/C/index.page 2012-04-23 19:15:27.000000000 +0000 @@ -17,7 +17,7 @@ - <app>gThumb</app>Help + gThumb Help
Welcome diff -Nru gthumb-2.14.3/help/de/bookmarks.page gthumb-3.0.0/help/de/bookmarks.page --- gthumb-2.14.3/help/de/bookmarks.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/bookmarks.page 2012-04-23 19:15:27.000000000 +0000 @@ -7,8 +7,8 @@

Häufig genutzte Ordner können für schnellen Zugriff den Lesezeichen hinzugefügt werden. Wechseln Sie zu dem Ordner, den Sie hinzufügen möchten, und drücken Sie StrgD oder verwenden Sie das Menü LesezeichenLesezeichen hinzufügen.

-

Wählen Sie LesezeichenLesezeichen bearbeiten, um Lesezeichen zu löschen oder neu zu sortieren.

+

Wählen Sie LesezeichenLesezeichen bearbeiten, um Lesezeichen zu löschen oder neu zu sortieren.

-

LesezeichenSystemlesezeichen bietet Zugriff auf die Systemlesezeichen, welche in Nautilus oder dem Dateiwähler-Dialog festgelegt wurden, welcher von den meisten Gnome-Anwendungen eingesetzt wird.

+

LesezeichenSystemlesezeichen bietet Zugriff auf die Systemlesezeichen, welche in Nautilus oder dem Dateiwähler-Dialog festgelegt wurden, welcher von den meisten GNOME-Anwendungen eingesetzt wird.

diff -Nru gthumb-2.14.3/help/de/de.po gthumb-3.0.0/help/de/de.po --- gthumb-2.14.3/help/de/de.po 2012-03-25 19:24:49.000000000 +0000 +++ gthumb-3.0.0/help/de/de.po 2012-04-23 19:15:29.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: gthumb docs master\n" -"POT-Creation-Date: 2011-10-20 07:07+0000\n" -"PO-Revision-Date: 2011-10-21 13:22+0100\n" +"POT-Creation-Date: 2011-10-21 10:21+0000\n" +"PO-Revision-Date: 2011-10-21 13:20+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \n" "MIME-Version: 1.0\n" @@ -118,7 +118,7 @@ "the EditPreferencesSlideshow dialog." msgstr "" -"Die Überblendeffekte und die Anzeigedauer jedes Bildes können im Dialog " +"Die Überblendeffekte und die Anzeigedauer jedes Bildes können im Dialog " "BearbeitenEinstellungenDiaschau angepasst werden." @@ -128,16 +128,16 @@ "transition effects are enabled. If you experience such difficulties, set the " "Transition effect preference to None." msgstr "" -"Einige Grafikkarten und Treiber können Probleme mit Überblendeffekten " -"bekommen und sogar abstürzen. Wenn Sie solchen Problemen begegnen, dann " -"setzen Sie die Einstellung Übergangseffekt auf Keinen." +"Einige Grafikkarten und Treiber können Probleme mit Überblendeffekten " +"bekommen und sogar abstürzen. Wenn Sie solchen Problemen begegnen, dann " +"setzen Sie die Einstellung Übergangseffekt auf Keinen." #: C/slideshow.page:23(p) msgid "" "You can advance manually to the next image by pressing Down Arrow, " "Right Arrow, Page Down or Space." msgstr "" -"Sie können manuell zum nächsten Bild durch Drücken von Pfeiltaste " +"Sie können manuell zum nächsten Bild durch Drücken von Pfeiltaste " "runter, Rechtspfeil, Bild ab oder der " "Leertaste gelangen." @@ -146,13 +146,13 @@ "You can go back to the previous image by pressing Up Arrow, " "Left Arrow or Page Up." msgstr "" -"Sie können zum vorigen Bild durch Drücken von Pfeiltaste hoch, " +"Sie können zum vorigen Bild durch Drücken von Pfeiltaste hoch, " "Linkspfeil oder Bild auf gelangen." #: C/slideshow.page:30(p) msgid "You can pause or un-pause the slideshow by pressing p." msgstr "" -"Sie können die Diaschau durch Drücken von p anhalten oder " +"Sie können die Diaschau durch Drücken von p anhalten oder " "fortsetzen." #: C/slideshow.page:32(p) @@ -197,7 +197,7 @@ "Auf den meisten Systemen wird gThumb automatisch den Import-Dialog " "öffnen, sobald eine Digitalkamera mit dem Rechner verbunden wird oder eine " "Speicherkarte mit Fotos in einen Kartenleser gesteckt wird. Die geschieht, " -"weil es als Handler für die MIME-Typen x-content/image-dcf und x-content/" +"weil es als Handler für die MIME-Typen x-content/image-dcf und x-content/" "image-picturecd registriert ist." #: C/import.page:16(p) @@ -205,8 +205,8 @@ "To manually launch the import dialog, use FileImport " "FromRemovable Device." msgstr "" -"Um den Import-Dialog manuell zu starten, wählen Sie DateiImportieren vonTragbares Gerät." +"Um den Import-Dialog manuell zu starten, wählen Sie DateiImportieren vonTragbares Gerät." #: C/import.page:20(title) msgid "The Import Dialog" @@ -220,11 +220,11 @@ "and drag the mouse over the desired photos.) If no photos are explicitly " "selected, all will be imported." msgstr "" -"Der Importdialog zeigt Vorschaubilder der auf dem gewählten Gerät " -"vorliegenden Fotos. Der Benutzer kann ein oder mehrere Fotos mit den üblichen " +"Der Importdialog zeigt Vorschaubilder der auf dem gewählten Gerät " +"vorliegenden Fotos. Der Benutzer kann ein oder mehrere Fotos mit den üblichen " "Tastatur- und Maustechniken importieren (wie z.B. Strg+Mausklick zum " -"Hinzufügen eines Fotos zur Auswahl, Einfassen von Fotos mit gedrückter linker " -"Maustaste etc.). Wenn explizit keine Fotos ausgewählt sind, so werden alle " +"Hinzufügen eines Fotos zur Auswahl, Einfassen von Fotos mit gedrückter linker " +"Maustaste etc.). Wenn explizit keine Fotos ausgewählt sind, so werden alle " "importiert." #: C/import.page:30(p) @@ -233,25 +233,25 @@ "Tags control below the thumbnail window. Click the drop-down " "control to see the predefined tags." msgstr "" -"Schlagwörter können bei Bedarf mit importierten Fotos mit Hilfe des " -"Auswahlfeldes Schlagwörter unter dem Vorschau-Fenster verknüpft " +"Schlagwörter können bei Bedarf mit importierten Fotos mit Hilfe des " +"Auswahlfeldes Schlagwörter unter dem Vorschau-Fenster verknüpft " "werden. Klicken Sie auf den entsprechenden Knopf mit Pfeil nach unten, um die " -"voreingestellten Schlagwörter einzusehen." +"voreingestellten Schlagwörter einzusehen." #: C/import.page:34(p) msgid "" "An event name may also be optionally associated with the photos. This event " "name can be used to generate an automatic subfolder name (possibly " -"incorporating a date) as described below. For example, if the base destinator " -"folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the Event field, you can configure generation of automatic subfolders like \"/" -"photos/2010-07-31, Wedding-Jennifer\"." +"incorporating a date) as described below. For example, if the base " +"destination folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the " +"Event field, you can configure generation of automatic subfolders " +"like \"/photos/2010-07-31, Wedding-Jennifer\"." msgstr "" -"Ein Name für ein Ereignis kann ebenfalls optional mit den Fotos verknüpft " +"Ein Name für ein Ereignis kann ebenfalls optional mit den Fotos verknüpft " "werden. Dieser Ereignisname kann zum automatischen Erstellen eines " "Unterordnernamens (ggfs. mit einem Datum im Namen) wie unten beschrieben " -"genutzt werden. Wenn zum Beispiel der Zielordner »Fotos« wäre und Sie " -"»Hochzeit Jennifer« in das Textfeld Ereignis eingeben, dann können " +"genutzt werden. Wenn zum Beispiel der Zielordner »Fotos« wäre und Sie " +"»Hochzeit Jennifer« in das Textfeld Ereignis eingeben, dann können " "Sie die automatische Erstellung von Unterordnern etwa mit dem Namen »/" "Fotos/31.7.2010, Hochzeit Jennifer« einstellen." @@ -268,11 +268,11 @@ "Destination folder). To generate automatic subfolders, select " "Automatic subfolder." msgstr "" -"Wie zuvor erwähnt können Unterordner für importierte Fotos automatisch auf " +"Wie zuvor erwähnt, können Unterordner für importierte Fotos automatisch auf " "Basis von Ereignisnamen oder Kalenderdatum erstellt werden. Dies wird durch " "einen Klick auf den Zielordnernamen im Dialog zum Importieren festgelegt. " -"Dadurch wird ein zweiter Dialog geöffnet, in dem der Basisordner (der " -"Speicherort) für die importierten Fotos gewählt wird. Wählen Sie " +"Dadurch wird ein zweiter Dialog geöffnet, in dem der Basisordner (der " +"Speicherort) für die importierten Fotos gewählt wird. Wählen Sie " "Automatischer Unterordner, um automatisch Unterordner erstellen zu " "lassen." @@ -288,13 +288,13 @@ "subfolders under them, or all subfolders can be at the same level in the " "filesystem, with the year and name both the folder name." msgstr "" -"Sie können entweder das Dateidatum oder das aktuelle Datum als Basis für den Namen des Unterordners verwenden (Das DateidatumDateidatum oder das aktuelle Datum als Basis für den Namen des Unterordners verwenden (Das Dateidatum untersucht die Metadaten der Datei zur Bestimmung des Aufnahmedatums). " -"Eine Reihe von üblichen Datumsformaten steht zur Auswahl (zum Beispiel " +"Eine Reihe von üblichen Datumsformaten steht zur Auswahl (zum Beispiel " "Jahr-Monat). Das Ankreuzfeld als einzelner Unterordner " "legt fest, ob eine tiefe oder flache Ordner-Hierarchie angelegt wird. Zum " -"Beispiel kann es für die Einstellung Jahr-Monat einen Unterordner " +"Beispiel kann es für die Einstellung Jahr-Monat einen Unterordner " "mit der Jahreszahl und einen weiteren innerhalb mit dem Monat geben, oder es " "kann nur einen mit Monat und Jahreszahl im Ordnernamen geben." @@ -307,7 +307,7 @@ "main import dialog." msgstr "" "Es ist nicht zwingend, die vordefinierten Datumsformate zu verwenden. Wenn " -"Sie Eigenes Format wählen, können Sie voreingestellte " +"Sie Eigenes Format wählen, können Sie voreingestellte " "Datumsformatangaben verwenden. Klicken Sie auf das Hilfesymbol rechts im " "Eingabefeld für das Datumsformat, um eine Liste der Formatangaben einzusehen. " "»%E« ist eine spezielle Angabe, die den Ereignisnamen aus dem " @@ -316,7 +316,7 @@ #: C/import.page:67(p) msgid "See for more date format codes." msgstr "" -"Lesen Sie auch für weitere " +"Lesen Sie auch für weitere " "Datumsformatangaben." #: C/import.page:69(p) @@ -327,7 +327,7 @@ msgstr "" "Wenn Sie automatische Benennung der Unterordner verwenden, dann zeigt das " "Feld Speicherort im Import-Dialog den automatisch erzeugten Anteil " -"des Ordnernamens in rot. Für auf Datum basierende Formate wird eventuell ein " +"des Ordnernamens in rot. Für auf Datum basierende Formate wird eventuell ein " "Scheinteil in rot dargestellt." #: C/import.page:74(title) @@ -356,8 +356,8 @@ "To remove or rearrange bookmarks in a different order use the " "BookmarksEdit Bookmarks command." msgstr "" -"Wählen Sie LesezeichenLesezeichen bearbeiten, um Lesezeichen zu löschen oder neu zu sortieren." +"Wählen Sie LesezeichenLesezeichen bearbeiten, um Lesezeichen zu löschen oder neu zu sortieren." #: C/bookmarks.page:16(p) msgid "" @@ -367,7 +367,7 @@ msgstr "" "LesezeichenSystemlesezeichen bietet " "Zugriff auf die Systemlesezeichen, welche in Nautilus oder dem " -"Dateiwähler-Dialog festgelegt wurden, welcher von den meisten Gnome-" +"Dateiwähler-Dialog festgelegt wurden, welcher von den meisten GNOME-" "Anwendungen eingesetzt wird." #: C/wallpaper.page:6(title) @@ -383,11 +383,11 @@ "to the background settings (positioning, stretching, tiling, et cetera.)." msgstr "" "Um ein Bild als Arbeitsflächenhintergrund festzulegen, klicken Sie mit der " -"rechten Maustaste auf das Bild und wählen Sie Als " -"Arbeitsflächenhintergrund verwenden aus dem Einblend-Menü. Der " -"Arbeitsflächenhintergrund wird sich daraufhin ändern und der Dialog zum " -"Erscheinungsbild von GNOME wird geöffnet. Sie können mit diesem Dialog " -"Anpassungen an den Einstellungen für das Hintergrundbild (Position, " +"rechten Maustaste auf das Bild und wählen Sie Als " +"Arbeitsflächenhintergrund verwenden aus dem Einblend-Menü. Der " +"Arbeitsflächenhintergrund wird sich daraufhin ändern und der Dialog zum " +"Erscheinungsbild von GNOME wird geöffnet. Sie können mit diesem Dialog " +"Anpassungen an den Einstellungen für das Hintergrundbild (Position, " "Streckung, Kacheln usw.) vornehmen." #: C/sharing-social.page:6(title) @@ -401,7 +401,7 @@ "Flickr, Picasa, and Photobucket are enabled." msgstr "" "gThumb verfügt über eine Reihe von Erweiterungen zum Übertragen von Fotos zu " -"Webseiten verschiedener »soziale Netzwerke«. Als Voreinstellung sind die " +"Webseiten verschiedener »sozialer Netzwerke«. Als Voreinstellung sind die " "Übertragungen zu Facebook, Flickr, Picasa und Photobucket aktiviert." #: C/sharing-social.page:13(p) @@ -484,7 +484,7 @@ "The optical disk writing process will then commence, or the ISO file will be " "written, completing the process." msgstr "" -"Der nächste Dialog legt das Zielmedium oder den Namen des ISO-Abbildes fest. " +"Der nächste Dialog legt das Zielmedium oder den Namen des ISO-Abbildes fest. " "Klicken Sie anschließend auf Abbild erstellen, um den Vorgang zu " "starten. Der optische Schreibvorgang beginnt bzw. wird dann die ISO-Datei " "geschrieben." @@ -495,7 +495,7 @@ #: C/shortcuts.page:10(title) msgid "Viewing and hiding parts of the user interface" -msgstr "Anzeigen und verbergen von Teilen der grafischen Oberflächen" +msgstr "Anzeigen und verbergen von Teilen der grafischen Oberflächen" #: C/shortcuts.page:14(p) C/shortcuts.page:91(p) C/shortcuts.page:270(p) #: C/shortcuts.page:495(p) @@ -566,7 +566,7 @@ #: C/shortcuts.page:87(title) msgid "Editing shortcuts for the browser and viewer" -msgstr "Tastenkombinationen für Bildbetrachter und Browser bearbeiten" +msgstr "Tastenkombinationen für Bildbetrachter und Browser bearbeiten" #: C/shortcuts.page:100(key) msgid "e" @@ -575,7 +575,7 @@ #: C/shortcuts.page:104(p) msgid "Edit the image. Opens the viewer and shows the editing tools." msgstr "" -"Das Bild bearbeiten. Es wird der Betrachter geöffnet und die " +"Das Bild bearbeiten. Es wird der Betrachter geöffnet und die " "Bearbeitungswerkzeuge angezeigt." #: C/shortcuts.page:110(key) @@ -584,7 +584,7 @@ #: C/shortcuts.page:114(p) msgid "Open the image with the GNU Image Manipulation Program (GIMP)." -msgstr "Das Bild mit dem GNU Image Manipulation Program (GIMP) öffnen." +msgstr "Das Bild mit dem GNU Image Manipulation Program (GIMP) öffnen." #: C/shortcuts.page:120(key) msgid "F2" @@ -609,7 +609,7 @@ #: C/shortcuts.page:144(p) msgid "Rotate right, losslessly if possible. The file is saved automatically." msgstr "" -"Im Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird " +"Im Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird " "automatisch gespeichert." #: C/shortcuts.page:150(key) @@ -619,7 +619,7 @@ #: C/shortcuts.page:154(p) msgid "Rotate left, losslessly if possible. The file is saved automatically." msgstr "" -"Gegen den Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird " +"Gegen den Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird " "automatisch gespeichert." #: C/shortcuts.page:160(key) C/shortcuts.page:170(key) @@ -641,7 +641,7 @@ #: C/shortcuts.page:182(title) msgid "Editing shortcuts for the viewer mode only" -msgstr "Tastenkombinationen nur für den Ansichtsmodus bearbeiten" +msgstr "Tastenkombinationen nur für den Ansichtsmodus bearbeiten" #: C/shortcuts.page:186(p) msgid "Keyboard Shortcut (Case Sensitive)" @@ -717,7 +717,7 @@ #: C/shortcuts.page:288(p) msgid "Backspace or Page Up" -msgstr "Löschtaste oder Bild auf" +msgstr "Löschtaste oder Bild auf" #: C/shortcuts.page:293(p) msgid "View the previous image." @@ -846,7 +846,7 @@ #: C/shortcuts.page:471(p) msgid "Go forward (after going back to a folder)." -msgstr "Vorwärts gehen (nach vorhergehendem rückwärts gehen)" +msgstr "Vorwärts gehen (nach vorhergehendem rückwärts gehen)" #: C/shortcuts.page:479(key) msgid "Up" @@ -909,7 +909,7 @@ "To print the current image in the viewer mode, use FilePrint or Ctrlp." msgstr "" -"Um das aktuelle Bild im Ansichtsmodus zu drucken, wählen Sie bitte " +"Um das aktuelle Bild im Ansichtsmodus zu drucken, wählen Sie bitte " "DateiDrucken oder Strgp." @@ -929,14 +929,14 @@ "print dialog." msgstr "" "Der zu verwendende Drucker kann im Reiter Allgemein im Druckdialog " -"ausgewählt werden." +"ausgewählt werden." #: C/printing.page:21(p) msgid "" "The type of paper to use can be selected from the Page Setup tab." msgstr "" "Der zu verwendende Papiertyp kann im Reiter Seite einrichten " -"ausgewählt werden." +"ausgewählt werden." #: C/printing.page:24(p) msgid "" @@ -988,7 +988,7 @@ "Sie können festlegen, welche Dateitypen in der Browseransicht angezeigt " "werden sollen, indem Sie den Dialog AnsichtFilter verwenden. Per Voreinstellung werden alle Medien-Dateien (wie " -"Bilder, Filme und Audio) angezeigt, aber dies kann nach Ihren Wünschen " +"Bilder, Filme und Audio) angezeigt, aber dies kann nach Ihren Wünschen " "angepasst werden." #: C/filtering.page:15(title) @@ -1011,8 +1011,8 @@ "view:" msgstr "" "Durch Aktivieren von Dateiname unter Andere Filter wird " -"die Möglichkeit des Filterns nach Dateinamen der Filterleiste unten in der " -"Browseransicht hinzugefügt:" +"die Möglichkeit des Filterns nach Dateinamen der Filterleiste unten in der " +"Browseransicht hinzugefügt:" #: C/filtering.page:28(title) msgid "Browser Filter Bar" @@ -1024,7 +1024,7 @@ "files with \"gen\" in the filename. The matching is case-insensitive." msgstr "" "In der Abbildung oben ist der Dateinamen-Filter so konfiguriert, dass nur " -"Dateien angezeigt werden, deren Name »gen« enthält. Die Suche berücksichtigt " +"Dateien angezeigt werden, deren Name »gen« enthält. Die Suche berücksichtigt " "nicht Groß-/Kleinschreibung." #: C/sorting.page:7(title) @@ -1062,7 +1062,7 @@ "Moving the mouse will activate a popup control panel briefly. This can be " "used to navigate to the next or previous image, or change zoom levels." msgstr "" -"Durch verschieben der Maus wird kurzzeitig eine Bedienleiste angezeigt. Diese " +"Durch Verschieben der Maus wird kurzzeitig eine Bedienleiste angezeigt. Diese " "können Sie zum Blättern zum nächsten oder vorigen Bild verwenden oder die " "Vergrößerungsstufe einstellen." @@ -1071,7 +1071,7 @@ "You can also advance to the next image by pressing PageDown or " "Space." msgstr "" -"Sie können auch manuell zum nächsten Bild durch Drücken von Bild abBild ab oder der Leertaste gelangen." #: C/fullscreen.page:21(p) @@ -1079,7 +1079,7 @@ "You can go back to the previous image by pressing PageUp or " "Backspace." msgstr "" -"Sie können zurück zum vorigen Bild durch Drücken von Bild auf oder " +"Sie können zurück zum vorigen Bild durch Drücken von Bild auf oder " "der Leertaste gelangen." #: C/fullscreen.page:24(p) @@ -1184,10 +1184,10 @@ "are implemented as extensions and are supplied with the standard " "distribution. Users may write (and share) additional extensions." msgstr "" -"gThumb besitzt ein System für Plugins von Erweiterungen. Einige " +"gThumb besitzt ein System für Plugins von Erweiterungen. Einige " "grundlegende Funktionsmerkmale sind als Erweiterungen implementiert und " -"werden mit Standard-Distributionen ausgeliefert. Benutzer können weitere " -"Erweiterungen erstellen (und der Allgemeinheit zur Verfügung stellen)." +"werden mit Standard-Distributionen ausgeliefert. Benutzer können weitere " +"Erweiterungen erstellen (und der Allgemeinheit zur Verfügung stellen)." #: C/extensions.page:12(p) msgid "" @@ -1208,7 +1208,7 @@ msgstr "" "Dieses Handbuch ist unter der Annahme geschrieben worden, dass grundlegende " "Erweiterungen aktiviert sind. Falls ein Funktionsmerkmal zu fehlen scheint, " -"so prüfen Sie bitte, welche Erweiterungen tatsächlich aktiviert sind." +"so prüfen Sie bitte, welche Erweiterungen tatsächlich aktiviert sind." #: C/extensions.page:20(p) msgid "" @@ -1217,8 +1217,8 @@ "development information. An example extension is provided in the source code, " "which you can base your own extension on." msgstr "" -"Wenn Sie eigene Erweiterungen erstellen möchten, so besuchen Sie bitte http://live.gnome.org/gthumb für " +"Wenn Sie eigene Erweiterungen erstellen möchten, so besuchen Sie bitte http://live.gnome.org/gthumb für " "weitere Informationen zum Entwickeln. Eine Beispiel-Erweiterung ist im " "Quellcode der Software enthalten, auf die Sie Ihre Erweiterung aufbauen " "können." @@ -1285,7 +1285,7 @@ #: C/edit-resize-crop.page:12(p) msgid "Two tools are provided to resize and crop images." msgstr "" -"Zwei Werkzeuge werden zum Ändern der Größe und Beschneiden mitgeliefert." +"Zwei Werkzeuge werden zum Ändern der Größe und Beschneiden mitgeliefert." #: C/edit-resize-crop.page:15(gui) msgid "Resize" @@ -1335,7 +1335,7 @@ #: C/edit-rotate.page:12(p) msgid "Several tools are provided to manipulate the orientation of images." msgstr "" -"Verschiedene Werkzeuge werden zum Ändern der Orientierung von Bildern " +"Verschiedene Werkzeuge werden zum Ändern der Orientierung von Bildern " "mitgeliefert." #: C/edit-rotate.page:17(gui) diff -Nru gthumb-2.14.3/help/de/edit-resize-crop.page gthumb-3.0.0/help/de/edit-resize-crop.page --- gthumb-2.14.3/help/de/edit-resize-crop.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/edit-resize-crop.page 2012-04-23 19:15:27.000000000 +0000 @@ -7,7 +7,7 @@

Klicken Sie auf den Knopf Datei bearbeiten in der Werkzeugleiste (das Symbol der Malerpalette), um zu den Bearbeitungswerkzeugen zu gelangen.

-

Zwei Werkzeuge werden zum Ändern der Größe und Beschneiden mitgeliefert.

+

Zwei Werkzeuge werden zum Ändern der Größe und Beschneiden mitgeliefert.

<gui>Größe ändern</gui> diff -Nru gthumb-2.14.3/help/de/edit-rotate.page gthumb-3.0.0/help/de/edit-rotate.page --- gthumb-2.14.3/help/de/edit-rotate.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/edit-rotate.page 2012-04-23 19:15:27.000000000 +0000 @@ -7,7 +7,7 @@

Klicken Sie auf den Knopf Datei bearbeiten in der Werkzeugleiste (das Symbol der Malerpalette), um zu den Bearbeitungswerkzeugen zu gelangen.

-

Verschiedene Werkzeuge werden zum Ändern der Orientierung von Bildern mitgeliefert.

+

Verschiedene Werkzeuge werden zum Ändern der Orientierung von Bildern mitgeliefert.

diff -Nru gthumb-2.14.3/help/de/extensions.page gthumb-3.0.0/help/de/extensions.page --- gthumb-2.14.3/help/de/extensions.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/extensions.page 2012-04-23 19:15:27.000000000 +0000 @@ -5,12 +5,12 @@ gThumb erweitern -

gThumb besitzt ein System für Plugins von Erweiterungen. Einige grundlegende Funktionsmerkmale sind als Erweiterungen implementiert und werden mit Standard-Distributionen ausgeliefert. Benutzer können weitere Erweiterungen erstellen (und der Allgemeinheit zur Verfügung stellen).

+

gThumb besitzt ein System für Plugins von Erweiterungen. Einige grundlegende Funktionsmerkmale sind als Erweiterungen implementiert und werden mit Standard-Distributionen ausgeliefert. Benutzer können weitere Erweiterungen erstellen (und der Allgemeinheit zur Verfügung stellen).

Sie können Erweiterungen unter BearbeitenErweiterungen aktivieren und deaktivieren. Einige Erweiterungen bieten Einstellungen, die in diesem Dialog bearbeitet werden können.

-

Dieses Handbuch ist unter der Annahme geschrieben worden, dass grundlegende Erweiterungen aktiviert sind. Falls ein Funktionsmerkmal zu fehlen scheint, so prüfen Sie bitte, welche Erweiterungen tatsächlich aktiviert sind.

+

Dieses Handbuch ist unter der Annahme geschrieben worden, dass grundlegende Erweiterungen aktiviert sind. Falls ein Funktionsmerkmal zu fehlen scheint, so prüfen Sie bitte, welche Erweiterungen tatsächlich aktiviert sind.

-

Wenn Sie eigene Erweiterungen erstellen möchten, so besuchen Sie bitte http://live.gnome.org/gthumb für weitere Informationen zum Entwickeln. Eine Beispiel-Erweiterung ist im Quellcode der Software enthalten, auf die Sie Ihre Erweiterung aufbauen können.

+

Wenn Sie eigene Erweiterungen erstellen möchten, so besuchen Sie bitte http://live.gnome.org/gthumb für weitere Informationen zum Entwickeln. Eine Beispiel-Erweiterung ist im Quellcode der Software enthalten, auf die Sie Ihre Erweiterung aufbauen können.

diff -Nru gthumb-2.14.3/help/de/filtering.page gthumb-3.0.0/help/de/filtering.page --- gthumb-2.14.3/help/de/filtering.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/filtering.page 2012-04-23 19:15:27.000000000 +0000 @@ -6,7 +6,7 @@ Filtern von Dateien -

Sie können festlegen, welche Dateitypen in der Browseransicht angezeigt werden sollen, indem Sie den Dialog AnsichtFilter verwenden. Per Voreinstellung werden alle Medien-Dateien (wie Bilder, Filme und Audio) angezeigt, aber dies kann nach Ihren Wünschen angepasst werden.

+

Sie können festlegen, welche Dateitypen in der Browseransicht angezeigt werden sollen, indem Sie den Dialog AnsichtFilter verwenden. Per Voreinstellung werden alle Medien-Dateien (wie Bilder, Filme und Audio) angezeigt, aber dies kann nach Ihren Wünschen angepasst werden.

Aktivieren von Filtern @@ -15,13 +15,13 @@

Die Abbildung oben zeigt, wie Sie gThumb so konfigurieren, dass nur Medien-Dateien durch Festlegen eines Allgemeinen Filters angezeigt werden.

-

Durch Aktivieren von Dateiname unter Andere Filter wird die Möglichkeit des Filterns nach Dateinamen der Filterleiste unten in der Browseransicht hinzugefügt:

+

Durch Aktivieren von Dateiname unter Andere Filter wird die Möglichkeit des Filterns nach Dateinamen der Filterleiste unten in der Browseransicht hinzugefügt:

Filterleiste in der Browseransicht
-

In der Abbildung oben ist der Dateinamen-Filter so konfiguriert, dass nur Dateien angezeigt werden, deren Name »gen« enthält. Die Suche berücksichtigt nicht Groß-/Kleinschreibung.

+

In der Abbildung oben ist der Dateinamen-Filter so konfiguriert, dass nur Dateien angezeigt werden, deren Name »gen« enthält. Die Suche berücksichtigt nicht Groß-/Kleinschreibung.

diff -Nru gthumb-2.14.3/help/de/fullscreen.page gthumb-3.0.0/help/de/fullscreen.page --- gthumb-2.14.3/help/de/fullscreen.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/fullscreen.page 2012-04-23 19:15:27.000000000 +0000 @@ -9,11 +9,11 @@

Durch Drücken von f im Browser- oder Betrachtermodus wird das aktuelle Bild im Vollbildmodus angezeigt. Im Browsermodus gelangen Sie außerdem durch Drücken der mittleren Maustaste in den Vollbildmodus.

-

Durch verschieben der Maus wird kurzzeitig eine Bedienleiste angezeigt. Diese können Sie zum Blättern zum nächsten oder vorigen Bild verwenden oder die Vergrößerungsstufe einstellen.

+

Durch Verschieben der Maus wird kurzzeitig eine Bedienleiste angezeigt. Diese können Sie zum Blättern zum nächsten oder vorigen Bild verwenden oder die Vergrößerungsstufe einstellen.

-

Sie können auch manuell zum nächsten Bild durch Drücken von Bild ab oder der Leertaste gelangen.

+

Sie können auch manuell zum nächsten Bild durch Drücken von Bild ab oder der Leertaste gelangen.

-

Sie können zurück zum vorigen Bild durch Drücken von Bild auf oder der Leertaste gelangen.

+

Sie können zurück zum vorigen Bild durch Drücken von Bild auf oder der Leertaste gelangen.

Damit können Sie eine manuell gesteuerte Diaschau verwirklichen.

diff -Nru gthumb-2.14.3/help/de/import.page gthumb-3.0.0/help/de/import.page --- gthumb-2.14.3/help/de/import.page 2012-03-25 19:24:47.000000000 +0000 +++ gthumb-3.0.0/help/de/import.page 2012-04-23 19:15:27.000000000 +0000 @@ -7,35 +7,35 @@ Importieren von einer Digitalkamera -

Auf den meisten Systemen wird gThumb automatisch den Import-Dialog öffnen, sobald eine Digitalkamera mit dem Rechner verbunden wird oder eine Speicherkarte mit Fotos in einen Kartenleser gesteckt wird. Die geschieht, weil es als Handler für die MIME-Typen x-content/image-dcf und x-content/image-picturecd registriert ist.

+

Auf den meisten Systemen wird gThumb automatisch den Import-Dialog öffnen, sobald eine Digitalkamera mit dem Rechner verbunden wird oder eine Speicherkarte mit Fotos in einen Kartenleser gesteckt wird. Die geschieht, weil es als Handler für die MIME-Typen x-content/image-dcf und x-content/image-picturecd registriert ist.

-

Um den Import-Dialog manuell zu starten, wählen Sie DateiImportieren vonTragbares Gerät.

+

Um den Import-Dialog manuell zu starten, wählen Sie DateiImportieren vonTragbares Gerät.

Der Importdialog
-

Der Importdialog zeigt Vorschaubilder der auf dem gewählten Gerät vorliegenden Fotos. Der Benutzer kann ein oder mehrere Fotos mit den üblichen Tastatur- und Maustechniken importieren (wie z.B. Strg+Mausklick zum Hinzufügen eines Fotos zur Auswahl, Einfassen von Fotos mit gedrückter linker Maustaste etc.). Wenn explizit keine Fotos ausgewählt sind, so werden alle importiert.

+

Der Importdialog zeigt Vorschaubilder der auf dem gewählten Gerät vorliegenden Fotos. Der Benutzer kann ein oder mehrere Fotos mit den üblichen Tastatur- und Maustechniken importieren (wie z.B. Strg+Mausklick zum Hinzufügen eines Fotos zur Auswahl, Einfassen von Fotos mit gedrückter linker Maustaste etc.). Wenn explizit keine Fotos ausgewählt sind, so werden alle importiert.

-

Schlagwörter können bei Bedarf mit importierten Fotos mit Hilfe des Auswahlfeldes Schlagwörter unter dem Vorschau-Fenster verknüpft werden. Klicken Sie auf den entsprechenden Knopf mit Pfeil nach unten, um die voreingestellten Schlagwörter einzusehen.

+

Schlagwörter können bei Bedarf mit importierten Fotos mit Hilfe des Auswahlfeldes Schlagwörter unter dem Vorschau-Fenster verknüpft werden. Klicken Sie auf den entsprechenden Knopf mit Pfeil nach unten, um die voreingestellten Schlagwörter einzusehen.

-

Ein Name für ein Ereignis kann ebenfalls optional mit den Fotos verknüpft werden. Dieser Ereignisname kann zum automatischen Erstellen eines Unterordnernamens (ggfs. mit einem Datum im Namen) wie unten beschrieben genutzt werden. Wenn zum Beispiel der Zielordner »Fotos« wäre und Sie »Hochzeit Jennifer« in das Textfeld Ereignis eingeben, dann können Sie die automatische Erstellung von Unterordnern etwa mit dem Namen »/Fotos/31.7.2010, Hochzeit Jennifer« einstellen.

+

Ein Name für ein Ereignis kann ebenfalls optional mit den Fotos verknüpft werden. Dieser Ereignisname kann zum automatischen Erstellen eines Unterordnernamens (ggfs. mit einem Datum im Namen) wie unten beschrieben genutzt werden. Wenn zum Beispiel der Zielordner »Fotos« wäre und Sie »Hochzeit Jennifer« in das Textfeld Ereignis eingeben, dann können Sie die automatische Erstellung von Unterordnern etwa mit dem Namen »/Fotos/31.7.2010, Hochzeit Jennifer« einstellen.

Normale, auf Datum basierende Unterordner
-

Wie zuvor erwähnt können Unterordner für importierte Fotos automatisch auf Basis von Ereignisnamen oder Kalenderdatum erstellt werden. Dies wird durch einen Klick auf den Zielordnernamen im Dialog zum Importieren festgelegt. Dadurch wird ein zweiter Dialog geöffnet, in dem der Basisordner (der Speicherort) für die importierten Fotos gewählt wird. Wählen Sie Automatischer Unterordner, um automatisch Unterordner erstellen zu lassen.

+

Wie zuvor erwähnt, können Unterordner für importierte Fotos automatisch auf Basis von Ereignisnamen oder Kalenderdatum erstellt werden. Dies wird durch einen Klick auf den Zielordnernamen im Dialog zum Importieren festgelegt. Dadurch wird ein zweiter Dialog geöffnet, in dem der Basisordner (der Speicherort) für die importierten Fotos gewählt wird. Wählen Sie Automatischer Unterordner, um automatisch Unterordner erstellen zu lassen.

-

Sie können entweder das Dateidatum oder das aktuelle Datum als Basis für den Namen des Unterordners verwenden (Das Dateidatum untersucht die Metadaten der Datei zur Bestimmung des Aufnahmedatums). Eine Reihe von üblichen Datumsformaten steht zur Auswahl (zum Beispiel Jahr-Monat). Das Ankreuzfeld als einzelner Unterordner legt fest, ob eine tiefe oder flache Ordner-Hierarchie angelegt wird. Zum Beispiel kann es für die Einstellung Jahr-Monat einen Unterordner mit der Jahreszahl und einen weiteren innerhalb mit dem Monat geben, oder es kann nur einen mit Monat und Jahreszahl im Ordnernamen geben.

+

Sie können entweder das Dateidatum oder das aktuelle Datum als Basis für den Namen des Unterordners verwenden (Das Dateidatum untersucht die Metadaten der Datei zur Bestimmung des Aufnahmedatums). Eine Reihe von üblichen Datumsformaten steht zur Auswahl (zum Beispiel Jahr-Monat). Das Ankreuzfeld als einzelner Unterordner legt fest, ob eine tiefe oder flache Ordner-Hierarchie angelegt wird. Zum Beispiel kann es für die Einstellung Jahr-Monat einen Unterordner mit der Jahreszahl und einen weiteren innerhalb mit dem Monat geben, oder es kann nur einen mit Monat und Jahreszahl im Ordnernamen geben.

-

Es ist nicht zwingend, die vordefinierten Datumsformate zu verwenden. Wenn Sie Eigenes Format wählen, können Sie voreingestellte Datumsformatangaben verwenden. Klicken Sie auf das Hilfesymbol rechts im Eingabefeld für das Datumsformat, um eine Liste der Formatangaben einzusehen. »%E« ist eine spezielle Angabe, die den Ereignisnamen aus dem Import-Dialog einbindet.

+

Es ist nicht zwingend, die vordefinierten Datumsformate zu verwenden. Wenn Sie Eigenes Format wählen, können Sie voreingestellte Datumsformatangaben verwenden. Klicken Sie auf das Hilfesymbol rechts im Eingabefeld für das Datumsformat, um eine Liste der Formatangaben einzusehen. »%E« ist eine spezielle Angabe, die den Ereignisnamen aus dem Import-Dialog einbindet.

-

Lesen Sie auch für weitere Datumsformatangaben.

+

Lesen Sie auch für weitere Datumsformatangaben.

-

Wenn Sie automatische Benennung der Unterordner verwenden, dann zeigt das Feld Speicherort im Import-Dialog den automatisch erzeugten Anteil des Ordnernamens in rot. Für auf Datum basierende Formate wird eventuell ein Scheinteil in rot dargestellt.

+

Wenn Sie automatische Benennung der Unterordner verwenden, dann zeigt das Feld Speicherort im Import-Dialog den automatisch erzeugten Anteil des Ordnernamens in rot. Für auf Datum basierende Formate wird eventuell ein Scheinteil in rot dargestellt.

Verwendung benutzerdefinierter Formate diff -Nru gthumb-2.14.3/help/de/index.page gthumb-3.0.0/help/de/index.page --- gthumb-2.14.3/help/de/index.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/index.page 2012-04-23 19:15:27.000000000 +0000 @@ -17,7 +17,7 @@ - <app>gThumb</app>-Hilfe + gThumb Help
Willkommen diff -Nru gthumb-2.14.3/help/de/printing.page gthumb-3.0.0/help/de/printing.page --- gthumb-2.14.3/help/de/printing.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/printing.page 2012-04-23 19:15:27.000000000 +0000 @@ -6,13 +6,13 @@ Bilder drucken -

Um das aktuelle Bild im Ansichtsmodus zu drucken, wählen Sie bitte DateiDrucken oder Strgp.

+

Um das aktuelle Bild im Ansichtsmodus zu drucken, wählen Sie bitte DateiDrucken oder Strgp.

Um eines oder mehrere Bilder im Browsermodus zu drucken, wählen Sie die Bilder im Browser aus und wählen Sie DateiDrucken oder drücken Sie Strgp.

-

Der zu verwendende Drucker kann im Reiter Allgemein im Druckdialog ausgewählt werden.

+

Der zu verwendende Drucker kann im Reiter Allgemein im Druckdialog ausgewählt werden.

-

Der zu verwendende Papiertyp kann im Reiter Seite einrichten ausgewählt werden.

+

Der zu verwendende Papiertyp kann im Reiter Seite einrichten ausgewählt werden.

Der Reiter Layout bietet einige zusätzliche gThumb-spezifische Optionen. Sie können hier die Anzahl der Bilder pro Seite festlegen. Außerdem finden Sie hier einen Vorschaubereich. Sie können Bildunterschriften hinzufügen, die aus einer Auswahl aufgelisteter Dateiattribute bezogen werden können, wie dem Dateinamen, dem Aufnahmedatum, der Belichtungszeit der Kamera und mehr. Jedes Bild kann mit den Optionen in diesem Reiter innerhalb des druckbaren Bereiches neu positioniert werden.

diff -Nru gthumb-2.14.3/help/de/sharing-disc.page gthumb-3.0.0/help/de/sharing-disc.page --- gthumb-2.14.3/help/de/sharing-disc.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/sharing-disc.page 2012-04-23 19:15:27.000000000 +0000 @@ -6,5 +6,5 @@ Erzeugen einer CD/DVD oder eines ISO-Abbildes

Um eine Reihe von Dateien auf ein optisches Medium (CD oder DVD) zu schreiben oder um ein ISO-Abbild zu erstellen, verwenden Sie bitte den Menüpunkt DateiExportieren nachOptisches Medium.

Sie erhalten die Wahl zwischen dem Schreiben der aktuell ausgewählten Dateien, des gesamten aktuellen Ordners oder des gesamten Ordners einschließlich Unterordner. Klicken Sie auf OK, sobald Sie Ihre Auswahl getroffen haben.

-

Der nächste Dialog legt das Zielmedium oder den Namen des ISO-Abbildes fest. Klicken Sie anschließend auf Abbild erstellen, um den Vorgang zu starten. Der optische Schreibvorgang beginnt bzw. wird dann die ISO-Datei geschrieben.

+

Der nächste Dialog legt das Zielmedium oder den Namen des ISO-Abbildes fest. Klicken Sie anschließend auf Abbild erstellen, um den Vorgang zu starten. Der optische Schreibvorgang beginnt bzw. wird dann die ISO-Datei geschrieben.

diff -Nru gthumb-2.14.3/help/de/sharing-social.page gthumb-3.0.0/help/de/sharing-social.page --- gthumb-2.14.3/help/de/sharing-social.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/sharing-social.page 2012-04-23 19:15:27.000000000 +0000 @@ -4,7 +4,7 @@ Übertragen zu Bilderdiensten im Web -

gThumb verfügt über eine Reihe von Erweiterungen zum Übertragen von Fotos zu Webseiten verschiedener »soziale Netzwerke«. Als Voreinstellung sind die Übertragungen zu Facebook, Flickr, Picasa und Photobucket aktiviert.

+

gThumb verfügt über eine Reihe von Erweiterungen zum Übertragen von Fotos zu Webseiten verschiedener »sozialer Netzwerke«. Als Voreinstellung sind die Übertragungen zu Facebook, Flickr, Picasa und Photobucket aktiviert.

Um eine Reihe von Fotos hochzuladen, wählen Sie die Bilder in der Browseransicht aus und klicken Sie auf den Knopf Freigeben in der Werkzeugleiste. Wählen Sie die entsprechende Webseite im erscheinenden Menü aus.

Sie werden um die Angabe zusätzlicher Informationen gebeten, abhängig vom Ziel der Übertragung, wie beispielsweise ein Albumname. Außerdem werden Sie nach dem Benutzernamen und dem Passwort gefragt. Es könnte erforderlich sein, dass gThumb einen Webbrowser öffnet, in welchem Sie die notwendigen Schritte zur Legitimierung vollziehen können. Sobald dies erledigt ist, kehren Sie zu gThumb zurück und setzen Sie die Übertragung fort.

Falls die erwarteten Webseiten im Menü Freigeben nicht angezeigt werden, prüfen Sie, ob die entsprechende Export-Erweiterung in BearbeitenErweiterungen aktiviert ist.

diff -Nru gthumb-2.14.3/help/de/shortcuts.page gthumb-3.0.0/help/de/shortcuts.page --- gthumb-2.14.3/help/de/shortcuts.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/shortcuts.page 2012-04-23 19:15:27.000000000 +0000 @@ -7,7 +7,7 @@ Tastenkombinationen
- Anzeigen und verbergen von Teilen der grafischen Oberflächen + Anzeigen und verbergen von Teilen der grafischen Oberflächen
@@ -81,7 +81,7 @@
- Tastenkombinationen für Bildbetrachter und Browser bearbeiten + Tastenkombinationen für Bildbetrachter und Browser bearbeiten @@ -108,7 +108,7 @@

@@ -136,7 +136,7 @@

@@ -146,7 +146,7 @@

@@ -174,7 +174,7 @@
- Tastenkombinationen nur für den Ansichtsmodus bearbeiten + Tastenkombinationen nur für den Ansichtsmodus bearbeiten
@@ -98,7 +98,7 @@

-

Das Bild bearbeiten. Es wird der Betrachter geöffnet und die Bearbeitungswerkzeuge angezeigt.

+

Das Bild bearbeiten. Es wird der Betrachter geöffnet und die Bearbeitungswerkzeuge angezeigt.

-

Das Bild mit dem GNU Image Manipulation Program (GIMP) öffnen.

+

Das Bild mit dem GNU Image Manipulation Program (GIMP) öffnen.

-

Im Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird automatisch gespeichert.

+

Im Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird automatisch gespeichert.

-

Gegen den Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird automatisch gespeichert.

+

Gegen den Uhrzeigersinn nach Möglichkeit verlustfrei drehen. Die Datei wird automatisch gespeichert.

diff -Nru gthumb-2.14.3/help/de/slideshow.page gthumb-3.0.0/help/de/slideshow.page --- gthumb-2.14.3/help/de/slideshow.page 2012-03-25 19:24:47.000000000 +0000 +++ gthumb-3.0.0/help/de/slideshow.page 2012-04-23 19:15:27.000000000 +0000 @@ -8,15 +8,15 @@

Eine Diaschau der derzeit ausgewählten Bilder kann im Bildbetrachter mit F5 gestartet werden, durch Drücken des Diaschau-Knopfes in der Werkzeugleiste oder über den Menüpunkt AnsichtDiaschau. Wenn keine Bilder ausgewählt sind, so werden alle Bilder im Ordner einbezogen.

-

Die Überblendeffekte und die Anzeigedauer jedes Bildes können im Dialog BearbeitenEinstellungenDiaschau angepasst werden.

+

Die Überblendeffekte und die Anzeigedauer jedes Bildes können im Dialog BearbeitenEinstellungenDiaschau angepasst werden.

-

Einige Grafikkarten und Treiber können Probleme mit Überblendeffekten bekommen und sogar abstürzen. Wenn Sie solchen Problemen begegnen, dann setzen Sie die Einstellung Übergangseffekt auf Keinen.

+

Einige Grafikkarten und Treiber können Probleme mit Überblendeffekten bekommen und sogar abstürzen. Wenn Sie solchen Problemen begegnen, dann setzen Sie die Einstellung Übergangseffekt auf Keinen.

-

Sie können manuell zum nächsten Bild durch Drücken von Pfeiltaste runter, Rechtspfeil, Bild ab oder der Leertaste gelangen.

+

Sie können manuell zum nächsten Bild durch Drücken von Pfeiltaste runter, Rechtspfeil, Bild ab oder der Leertaste gelangen.

-

Sie können zum vorigen Bild durch Drücken von Pfeiltaste hoch, Linkspfeil oder Bild auf gelangen.

+

Sie können zum vorigen Bild durch Drücken von Pfeiltaste hoch, Linkspfeil oder Bild auf gelangen.

-

Sie können die Diaschau durch Drücken von p anhalten oder fortsetzen.

+

Sie können die Diaschau durch Drücken von p anhalten oder fortsetzen.

Um die Diaschau zu verlassen, drücken Sie Esc oder F5.

diff -Nru gthumb-2.14.3/help/de/thumbnails.page gthumb-3.0.0/help/de/thumbnails.page --- gthumb-2.14.3/help/de/thumbnails.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/thumbnails.page 2012-04-23 19:15:27.000000000 +0000 @@ -7,7 +7,7 @@

Das Browsrfenster zeigt normalerweise die Vorschauen der Bilder und Filme im gewählten Ordner an. Außerdem werden allgemeine Symbole für sonstige Dateien angezeigt, zum Beispiel für Audio-Dateien.

-

Sie können festlegen, welche Dateitypen in der Browseransicht angezeigt werden sollen, indem Sie den Dialog AnsichtFilter verwenden. Per Voreinstellung werden alle Medien-Dateien (wie Bilder, Filme und Audio) angezeigt, aber dies kann nach Ihren Wünschen angepasst werden.

+

Sie können festlegen, welche Dateitypen in der Browseransicht angezeigt werden sollen, indem Sie den Dialog AnsichtFilter verwenden. Per Voreinstellung werden alle Medien-Dateien (wie Bilder, Filme und Audio) angezeigt, aber dies kann nach Ihren Wünschen angepasst werden.

Die Vorschaubilder können auf verschiedenen Wegen erzeugt werden. gThumb schaut zuerst nach vorhandenen Vorschaubildern im Zwischenspeicher des Systems.

diff -Nru gthumb-2.14.3/help/de/wallpaper.page gthumb-3.0.0/help/de/wallpaper.page --- gthumb-2.14.3/help/de/wallpaper.page 2012-03-25 19:24:46.000000000 +0000 +++ gthumb-3.0.0/help/de/wallpaper.page 2012-04-23 19:15:27.000000000 +0000 @@ -4,5 +4,5 @@ Bildschirmhintergrund -

Um ein Bild als Arbeitsflächenhintergrund festzulegen, klicken Sie mit der rechten Maustaste auf das Bild und wählen Sie Als Arbeitsflächenhintergrund verwenden aus dem Einblend-Menü. Der Arbeitsflächenhintergrund wird sich daraufhin ändern und der Dialog zum Erscheinungsbild von GNOME wird geöffnet. Sie können mit diesem Dialog Anpassungen an den Einstellungen für das Hintergrundbild (Position, Streckung, Kacheln usw.) vornehmen.

+

Um ein Bild als Arbeitsflächenhintergrund festzulegen, klicken Sie mit der rechten Maustaste auf das Bild und wählen Sie Als Arbeitsflächenhintergrund verwenden aus dem Einblend-Menü. Der Arbeitsflächenhintergrund wird sich daraufhin ändern und der Dialog zum Erscheinungsbild von GNOME wird geöffnet. Sie können mit diesem Dialog Anpassungen an den Einstellungen für das Hintergrundbild (Position, Streckung, Kacheln usw.) vornehmen.

diff -Nru gthumb-2.14.3/help/el/import.page gthumb-3.0.0/help/el/import.page --- gthumb-2.14.3/help/el/import.page 2012-03-25 19:24:47.000000000 +0000 +++ gthumb-3.0.0/help/el/import.page 2012-04-23 19:15:27.000000000 +0000 @@ -34,7 +34,7 @@

An event name may also be optionally associated with the photos. This event name can be used to generate an automatic subfolder name (possibly incorporating a date) as described below. For example, - if the base destinator folder is "/photos", and you enter + if the base destination folder is "/photos", and you enter "Wedding-Jennifer" in the Event field, you can configure generation of automatic subfolders like "/photos/2010-07-31, Wedding-Jennifer".

diff -Nru gthumb-2.14.3/help/el/index.page gthumb-3.0.0/help/el/index.page --- gthumb-2.14.3/help/el/index.page 2012-03-25 19:24:47.000000000 +0000 +++ gthumb-3.0.0/help/el/index.page 2012-04-23 19:15:27.000000000 +0000 @@ -17,7 +17,7 @@ - <app>gThumb</app>Help + gThumb Help
Welcome diff -Nru gthumb-2.14.3/help/es/es.po gthumb-3.0.0/help/es/es.po --- gthumb-2.14.3/help/es/es.po 2012-03-25 19:24:49.000000000 +0000 +++ gthumb-3.0.0/help/es/es.po 2012-04-23 19:15:29.000000000 +0000 @@ -2,14 +2,14 @@ # Spanish translation for gthumb manual # # Jorge González , 2007, 2010. -# Daniel Mustieles , 2008, 2009, 2010, 2011. +# Daniel Mustieles , 2008, 2009, 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: gthumb.userguide.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-31 18:28+0000\n" -"PO-Revision-Date: 2011-02-21 15:19+0100\n" +"POT-Creation-Date: 2012-03-04 17:55+0000\n" +"PO-Revision-Date: 2012-03-04 20:31+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -246,7 +246,7 @@ "An event name may also be optionally associated with the photos. This event " "name can be used to generate an automatic subfolder name (possibly " "incorporating a date) as described below. For example, if the base " -"destinator folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the " +"destination folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the " "Event field, you can configure generation of automatic subfolders " "like \"/photos/2010-07-31, Wedding-Jennifer\"." msgstr "" @@ -296,10 +296,10 @@ "para determinar cuando se tomó la foto). Hay una variedad de formatos " "estándar de fecha disponibles (año-mes por ejemplo). La casilla " "como una sola subcarpeta controla si se hace una jerarquía " -"«profunda» o «poco profunda» (por ejemplo, con año-mes, puede tener " -"subcarpetas con el año y subcarpetas con el mes dentro de ellas, o todas las " -"subcarpetas puede estar al mismo nivel en el sistema de archivos, con el año " -"y el nombre, ambos como nombre de la carpeta)." +"«profunda» o «poco profunda» (por ejemplo, con año-mes, puede " +"tener subcarpetas con el año y subcarpetas con el mes dentro de ellas, o " +"todas las subcarpetas puede estar al mismo nivel en el sistema de archivos, " +"con el año y el nombre, ambos como nombre de la carpeta)." #: C/import.page:61(p) msgid "" @@ -1577,9 +1577,9 @@ msgstr "" "Este símbolo se reemplazará con el enumerador de la imagen original. Por " "ejemplo, si el nombre original del archivo era IMG_9876.JPG, esto extrae la " -"parte «9876». Si el nombre del archivo tiene más de un grupo de dígitos en su " -"interior (por ejemplo, IMG_123_456.JPG) sólo se utiliza el primero de ellos " -"(«123» en este ejemplo)." +"parte «9876». Si el nombre del archivo tiene más de un grupo de dígitos en " +"su interior (por ejemplo, IMG_123_456.JPG) sólo se utiliza el primero de " +"ellos («123» en este ejemplo)." #: C/rename-series.page:85(key) msgid "%M{format}" @@ -1594,8 +1594,8 @@ msgstr "" "Este símbolo se reemplazará con la fecha de modificación del archivo. El " "formato de esta fecha (y opcionalmente de la hora) se puede especificar " -"añadiendo un código estándar de formato entre corchetes. Por ejemplo, «%M{%Y-%" -"m-%d, %T}» se reemplazará con una fecha y una hora similar a «2010-04-01, " +"añadiendo un código estándar de formato entre corchetes. Por ejemplo, «%M{%Y-" +"%m-%d, %T}» se reemplazará con una fecha y una hora similar a «2010-04-01, " "15:02:01»." #: C/rename-series.page:99(key) @@ -1607,15 +1607,15 @@ "This symbol will be replaced with the date that the photo was original taken " "(normally determined from the EXIF datestamps embedded inside the photo). " "The formatting of this date (and optionally time) can be specified by adding " -"a standard formatting code in curly braces. For example, \"%D{%Y-%m-%d, %T}" -"\" would be replaced with a date and time like \"2010-04-01, 15:02:01\"." +"a standard formatting code in curly braces. For example, \"%D{%Y-%m-%d, " +"%T}\" would be replaced with a date and time like \"2010-04-01, 15:02:01\"." msgstr "" "Este símbolo se reemplazará con la fecha original en que se tomó la foto " "(normalmente determinada por las marcas de tiempo EXIF empotradas en la " "foto). El formato de esta fecha (y, opcionalmente, de la hora) se puede " "especificar añadiendo un código estándar de formateo entre corchetes. Por " -"ejemplo, «%D{%Y-%m-%d, %T}» se reemplazará con una fecha y una hora similares " -"a «2010-04-01, 15:02:01»." +"ejemplo, «%D{%Y-%m-%d, %T}» se reemplazará con una fecha y una hora " +"similares a «2010-04-01, 15:02:01»." #: C/rename-series.page:115(key) msgid "%A{identifier}" @@ -1628,8 +1628,8 @@ "with a size like \"320 x 240\"." msgstr "" "Este símbolo se reemplazará con los datos especificados por el " -"identificador. Por ejemplo, «%A{ general::dimensions }» se reemplazará con un " -"tamaño similar a «320 x 240»." +"identificador. Por ejemplo, «%A{ general::dimensions }» se reemplazará con " +"un tamaño similar a «320 x 240»." #: C/rename-series.page:127(p) msgid "" @@ -2442,8 +2442,8 @@ #: C/strftime.page:289(p) msgid "" "The week number of the current year as a decimal number, range 00 to 53, " -"starting with the first Sunday as the first day of week 01. See also %V and %" -"W." +"starting with the first Sunday as the first day of week 01. See also %V and " +"%W." msgstr "" "El número de semana del año actual como un número decimal, rango de 00 a 53, " "empezando con el primer domingo como primer día de la semana 01. Vea también " @@ -2457,8 +2457,8 @@ msgid "" "The ISO 8601:1988 week number of the current year as a decimal number, range " "01 to 53, where week 1 is the first week that has at least 4 days in the " -"current year, and with Monday as the first day of the week. See also %U and %" -"W." +"current year, and with Monday as the first day of the week. See also %U and " +"%W." msgstr "" "El número de semana ISO 8601:1988 del año actual como un número decimal, " "rango de 01 a 53, donde la semana 1 es la primera semana que tenga al menos " @@ -2552,9 +2552,9 @@ "specifier character by the E or O modifier to indicate that an alternative " "format should be used. If the alternative format or specification does not " "exist for the current locale, the behaviour will be as if the unmodified " -"conversion specification were used. The Single Unix Specification mentions %" -"Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %" -"OV, %Ow, %OW, %Oy, where the effect of the O modifier is to use alternative " +"conversion specification were used. The Single Unix Specification mentions " +"%Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, " +"%OV, %Ow, %OW, %Oy, where the effect of the O modifier is to use alternative " "numeric symbols (say, roman numerals), and that of the E modifier is to use " "a locale-dependent alternative representation." msgstr "" @@ -2563,8 +2563,8 @@ "que se debe utilizar un formato alternativo. Si el formato alternativo no " "existe para a configuración regional actual, el comportamiento será igual " "que si se hubiese usado la especificación de conversión sin modificar. La " -"especificación única de Unix menciona %Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, %" -"Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %OV, %Ow, %OW, %Oy, donde el " +"especificación única de Unix menciona %Ec, %EC, %Ex, %EX, %Ey, %EY, %Od, " +"%Oe, %OH, %OI, %Om, %OM, %OS, %Ou, %OU, %OV, %Ow, %OW, %Oy, donde el " "modificador O es para utilizar símbolos numéricos alternativos (números " "romanos), y que el modificador E es para utilizar una representación " "alternativa dependiente de la configuración regional." @@ -2728,8 +2728,9 @@ msgstr "mjc@avtechpulse.com" #: C/index.page:20(title) -msgid "gThumbHelp" -msgstr "Ayuda de gThumb" +#| msgid "gThumb" +msgid "gThumb Help" +msgstr "Ayuda de gThumb" #: C/index.page:23(title) msgid "Welcome" @@ -2802,6 +2803,9 @@ "Daniel Mustieles , 2008-2010\n" "Jorge González , 2007-2008" +#~ msgid "gThumbHelp" +#~ msgstr "Ayuda de gThumb" + #~ msgid "" #~ "This work is licensed under a Creative Commons Attribution-Share Alike 3.0 " @@ -3108,9 +3112,6 @@ #~ "gThumb es un visor de imágenes y examinador " #~ "para el entorno GNOME" -#~ msgid "gThumb" -#~ msgstr "gThumb" - #~ msgid "image viewer" #~ msgstr "visor de imágenes" @@ -3335,8 +3336,8 @@ #~ msgid "" #~ "To create a new folder, perform the following steps: " #~ msgstr "" -#~ "Para crear una carpeta nueva, ejecute los siguientes pasos: " +#~ "Para crear una carpeta nueva, ejecute los siguientes pasos: " +#~ "" #~ msgid "To Open a Folder" #~ msgstr "Abrir una carpeta" @@ -4524,8 +4525,8 @@ #~ "gThumb searches for images that have \"holiday " #~ "in Rome\" OR \"my birthday\" in the comment." #~ msgstr "" -#~ "gThumb busca imágenes que contengan «vacaciones " -#~ "en Roma» O «mi cumpleaños» en el comentario." +#~ "gThumb busca imágenes que contengan " +#~ "«vacaciones en Roma» O «mi cumpleaños» en el comentario." #~ msgid "A list of phrases the place field of the comment must contain." #~ msgstr "" @@ -4607,8 +4608,8 @@ #~ "gThumb searches for images with \"family\" and/" #~ "or \"me\" in the keywords list." #~ msgstr "" -#~ "gThumb busca imágenes que contengan «familia» y/" -#~ "o «yo» en la lista de palabras clave." +#~ "gThumb busca imágenes que contengan «familia» " +#~ "y/o «yo» en la lista de palabras clave." #~ msgid "If you use more than one criteria images must respect all of them." #~ msgstr "Si usa más de un criterio las imágenes deben respetarlos todos." @@ -5376,13 +5377,13 @@ #~ "texto a continuación de la casilla Agrupar en subcarpetas. Esta cadena puede contener una combinación de texto y/o " #~ "códigos de fechas. Cualquier código de fechas soportado por la función de " -#~ "C estándar strftime está soportada. Por ejemplo, si introduce «Vacaciones %" -#~ "B», el «%B» se reemplazará por el nombre completo del mes, de acuerdo a la " -#~ "localización actual («Vacaciones septiembre», por ejemplo). La fecha está " -#~ "basada en la fecha en que se tomó la foto. Esta fecha se obtiene de los " -#~ "datos Exif de la foto, si están disponibles. Si no, se utiliza la hora de " -#~ "modificación del archivo en su lugar. Éste es un resumen de los códigos " -#~ "de formato válidos." +#~ "C estándar strftime está soportada. Por ejemplo, si introduce «Vacaciones " +#~ "%B», el «%B» se reemplazará por el nombre completo del mes, de acuerdo a " +#~ "la localización actual («Vacaciones septiembre», por ejemplo). La fecha " +#~ "está basada en la fecha en que se tomó la foto. Esta fecha se obtiene de " +#~ "los datos Exif de la foto, si están disponibles. Si no, se utiliza la " +#~ "hora de modificación del archivo en su lugar. Éste es un resumen de los " +#~ "códigos de formato válidos." #~ msgid "Code" #~ msgstr "Código" @@ -5595,8 +5596,8 @@ #~ "metadata, the file modification date will be used. Ordinary text can be " #~ "mixed with the date codes. If the format code starts with a \"#\" sign, " #~ "then the text will not be replaced, but the value will be remembered for " -#~ "date prompts (see below). Example: mkdir -p %p/{%A photos}; cp %" -#~ "f %p/{%A photos}/ This script will create a subfolder prefixed " +#~ "date prompts (see below). Example: mkdir -p %p/{%A photos}; cp " +#~ "%f %p/{%A photos}/ This script will create a subfolder prefixed " #~ "with the weekday name (like \"/home/user/Sunday photos\") and copy photos " #~ "to it. Refer to your system's documentation for a list of strftime format " #~ "codes that you can use." @@ -5609,13 +5610,14 @@ #~ "están disponibles (por ejemplo, la etiqueta Exif DateTime). Si la foto no " #~ "tiene metadatos empotrados, se utilizará la fecha de modificación del " #~ "archivo. El texto ordinario se puede mezclar con códigos de fecha. Si el " -#~ "código de formato comienza por un signo «#», entonces no se reemplazará el " -#~ "texto, pero el valor será recordado para posteriores consultas de la " +#~ "código de formato comienza por un signo «#», entonces no se reemplazará " +#~ "el texto, pero el valor será recordado para posteriores consultas de la " #~ "fecha (ver a continuación). Ejemplo: mkdir -p %p/{Fotos del %A}; " #~ "cp %f %p/{Fotos del %A}/. Este script creará una subcarpeta " #~ "prefijada con el nombre del día de la semana (como \"/home/usuario/Fotos " #~ "del domingo\") y copiará allí las fotos. Consulte la documentación de su " -#~ "sistema para una lista de los códigos de formato «strftime» que puede usar." +#~ "sistema para una lista de los códigos de formato «strftime» que puede " +#~ "usar." #~ msgid "{TEXT}" #~ msgstr "{TEXTO}" @@ -5628,16 +5630,16 @@ #~ "\"#\" sign at the beginning of the prompt name to prevent the " #~ "replacement. This can be used to store a prompted value to insert later " #~ "on. (To treat a bracket-enclosed block of text literally, precede the " -#~ "opening bracket with a backslash.) Examples: mkdir -p %p/{%Y-%m-%" -#~ "d_}{COMMENT}; cp %f %p/{%Y-%m-%d_}{COMMENT}/ This script will " +#~ "opening bracket with a backslash.) Examples: mkdir -p %p/{%Y-%m-" +#~ "%d_}{COMMENT}; cp %f %p/{%Y-%m-%d_}{COMMENT}/ This script will " #~ "create a subfolder prefixed with the date of the picture and a user " -#~ "comment (like \"/home/user/2007-05-04_MyBirthday\" or \"/home/user/2007-" -#~ "03-17_St. Patrick's Day\") and copy photos to it. mkdir -p %p/{#%" -#~ "B}{FOLDER}; cp %f %p/{FOLDER}/ This script will create a series " -#~ "of subfolders based on the month the picture was taken, but they will be " -#~ "named according to the user's comments on the date. So if you enter the " -#~ "word 'Ides' for March, all the photos taken in March will be copied to \"/" -#~ "home/user/photos/Ides/\"." +#~ "comment (like \"/home/user/2007-05-04_MyBirthday\" or \"/home/" +#~ "user/2007-03-17_St. Patrick's Day\") and copy photos to it. " +#~ "mkdir -p %p/{#%B}{FOLDER}; cp %f %p/{FOLDER}/ This " +#~ "script will create a series of subfolders based on the month the picture " +#~ "was taken, but they will be named according to the user's comments on the " +#~ "date. So if you enter the word 'Ides' for March, all the photos taken in " +#~ "March will be copied to \"/home/user/photos/Ides/\"." #~ msgstr "" #~ "Una pregunta al usuario que depende de la cadena de formato de fecha " #~ "anterior. Esta consulta se usará una vez para cada resultado de la fecha " @@ -5781,8 +5783,8 @@ #~ "unless the name of the prompt is \"password\" or \"PASSWORD\"." #~ msgstr "" #~ "gThumb guarda las respuestas más recientes apuntadas por el usuario en la " -#~ "base de datos de gconf, salvo que el nombre de la solicitud sea «password» " -#~ "o «PASSWORD»." +#~ "base de datos de gconf, salvo que el nombre de la solicitud sea " +#~ "«password» o «PASSWORD»." #~ msgid "" #~ "To configure gThumb, open the " @@ -6716,11 +6718,11 @@ #~ "you a preview of the image. Moving the mouse you will move the image to " #~ "the desired position." #~ msgstr "" -#~ "Otra forma de mover imágenes es con el botón de navegación: ubicado en la esquina inferior derecha de la ventana del visor cuando " -#~ "la imagen no se ajusta a la ventana. Si pulsa y suelta este botón se " -#~ "mostrará una vista previa de la imagen. Al mover y soltar el ratón moverá " -#~ "la imagen a la posición deseada." +#~ "Otra forma de mover imágenes es con el botón de navegación: " +#~ " ubicado en la esquina inferior derecha de la ventana del " +#~ "visor cuando la imagen no se ajusta a la ventana. Si pulsa y suelta este " +#~ "botón se mostrará una vista previa de la imagen. Al mover y soltar el " +#~ "ratón moverá la imagen a la posición deseada." #~ msgid "To View the Image Properties" #~ msgstr "Ver las propiedades de la imagen" diff -Nru gthumb-2.14.3/help/es/index.page gthumb-3.0.0/help/es/index.page --- gthumb-2.14.3/help/es/index.page 2012-03-25 19:24:47.000000000 +0000 +++ gthumb-3.0.0/help/es/index.page 2012-04-23 19:15:28.000000000 +0000 @@ -17,7 +17,7 @@ - Ayuda de <app>gThumb</app> + Ayuda de gThumb
Bienvenido diff -Nru gthumb-2.14.3/help/eu/import.page gthumb-3.0.0/help/eu/import.page --- gthumb-2.14.3/help/eu/import.page 2012-03-25 19:24:47.000000000 +0000 +++ gthumb-3.0.0/help/eu/import.page 2012-04-23 19:15:28.000000000 +0000 @@ -20,7 +20,12 @@

Etiketak asozia daitezke inportatutako argazkiekin, koadro txikien leihoaren azpiko Etiketak kontrolaren bidez. Egin klik goitibeherako kontrolean, aurrez definitutako etiketak ikusteko.

-

Gertaera-izen bat ere asozia diezaiekezu argazkiei. Gertaera-izen hori erabil daiteke azpikarpeta-izen automatikoa sortzeko (data duena, esate baterako), behean deskribatzen den bezala. Esate baterako, oinarrizko helburu-karpeta "/argazkiak" bada, eta "Edurneren ezkontza" sartzen baduzu Gertaera eremuan, azpikarpeta automatikoak sortzea konfigura dezakezu, "/argazkiak/2010-07-31, Edurneren ezkontza".

+

An event name may also be optionally associated with the photos. + This event name can be used to generate an automatic subfolder name + (possibly incorporating a date) as described below. For example, + if the base destination folder is "/photos", and you enter + "Wedding-Jennifer" in the Event field, you can configure + generation of automatic subfolders like "/photos/2010-07-31, Wedding-Jennifer".

Datan oinarritutako azpikarpeta estandarrak diff -Nru gthumb-2.14.3/help/eu/index.page gthumb-3.0.0/help/eu/index.page --- gthumb-2.14.3/help/eu/index.page 2012-03-25 19:24:47.000000000 +0000 +++ gthumb-3.0.0/help/eu/index.page 2012-04-23 19:15:28.000000000 +0000 @@ -17,7 +17,7 @@ - <app>gThumb</app>-i buruzko laguntza + gThumb Help
Ongi etorri diff -Nru gthumb-2.14.3/help/fr/fr.po gthumb-3.0.0/help/fr/fr.po --- gthumb-2.14.3/help/fr/fr.po 2012-03-25 19:24:49.000000000 +0000 +++ gthumb-3.0.0/help/fr/fr.po 2012-04-23 19:15:29.000000000 +0000 @@ -11,9 +11,9 @@ msgstr "" "Project-Id-Version: gthumb.help\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-15 17:34+0000\n" -"PO-Revision-Date: 2011-10-22 22:06+0200\n" -"Last-Translator: Claude Paroz \n" +"POT-Creation-Date: 2011-10-23 17:16+0000\n" +"PO-Revision-Date: 2012-02-12 16:18+0100 \n" +"Last-Translator: Bruno Brouard \n" "Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,7 +27,8 @@ #: C/file-copy-move.page:8(p) msgid "There are three ways to copy or move files in gThumb." msgstr "" -"Il y a trois façons de copier ou de déplacer des fichiers dans gThumb." +"Il y a trois façons de copier ou de déplacer des fichiers dans gThumb." #: C/file-copy-move.page:12(title) msgid "Cut and Paste" @@ -43,13 +44,14 @@ "gui>Paste, or press CtrlV, to complete the file transfer." msgstr "" -"Pour copier un fichier dans le navigateur, choisissez Édition" -"Copier ou appuyez sur CtrlC." -" Pour déplacer un fichier, choisissez Édition" -"Couper ou appuyez sur CtrlX. " -"Placez-vous ensuite dans le dossier de destination dans l'arborescence. Choisissez " -"ÉditionColler ou appuyez sur Ctrl" -"V pour terminer le transfert du fichier." +"Pour copier un fichier dans le navigateur, choisissez ÉditionCopier ou appuyez sur CtrlC. Pour déplacer un fichier, choisissez ÉditionCouper ou appuyez sur CtrlX. Placez-vous ensuite dans le dossier de destination dans " +"l'arborescence. Choisissez ÉditionColler ou appuyez sur CtrlV pour " +"terminer le transfert du fichier." #: C/file-copy-move.page:26(title) msgid "Drag and Drop" @@ -90,12 +92,12 @@ "the destination folder after the file transfer is complete." msgstr "" "Choisissez les fichiers à transférer, faites un clic droit sur la sélection " -"puis choisissez Copier vers… ou " -"Déplacer vers…. Cela ouvre une boîte de dialogue de sélection " -"de dossier qui permet de choisir le dossier de destination. Au bas de cette " -"boîte de dialogue, vous pouvez activer l'option Afficher la " -"destination si vous souhaitez aller dans le dossier de " -"destination après la fin du transfert de fichier." +"puis choisissez Copier vers… ou " +"Déplacer vers…. Cela ouvre une boîte de dialogue " +"de sélection de dossier qui permet de choisir le dossier de destination. Au " +"bas de cette boîte de dialogue, vous pouvez activer l'option " +"Afficher la destination si vous souhaitez aller " +"dans le dossier de destination après la fin du transfert de fichier." #: C/slideshow.page:7(title) msgid "Automatic Slideshow" @@ -248,7 +250,7 @@ "An event name may also be optionally associated with the photos. This event " "name can be used to generate an automatic subfolder name (possibly " "incorporating a date) as described below. For example, if the base " -"destinator folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the " +"destination folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the " "Event field, you can configure generation of automatic subfolders " "like \"/photos/2010-07-31, Wedding-Jennifer\"." msgstr "" @@ -405,8 +407,8 @@ "various \"social media\" web sites. By default, uploaders for Facebook, " "Flickr, Picasa, and Photobucket are enabled." msgstr "" -"gThumb possède un certain nombre d'extensions pour envoyer des photos " -"sur divers sites Web de réseaux sociaux. Par défaut, les extensions pour " +"gThumb possède un certain nombre d'extensions pour envoyer des photos sur " +"divers sites Web de réseaux sociaux. Par défaut, les extensions pour " "Facebook, Flickr, Picasa et Photobucket sont activés." #: C/sharing-social.page:13(p) @@ -415,9 +417,9 @@ "click the Share button in the toolbar. Select the appropriate web " "site from the menu that appears." msgstr "" -"Pour envoyer une série de photos, choisissez les images dans le navigateur et " -"cliquez sur le bouton Partager de la barre d'outils. Choisissez le " -"site Web souhaité dans le menu qui apparaît." +"Pour envoyer une série de photos, choisissez les images dans le navigateur " +"et cliquez sur le bouton Partager de la barre d'outils. " +"Choisissez le site Web souhaité dans le menu qui apparaît." #: C/sharing-social.page:17(p) msgid "" @@ -428,11 +430,12 @@ "completed the required authentication steps in the browser, return to gThumb " "and continue the upload." msgstr "" -"Il se peut que vous deviez renseigner des informations supplémentaires spécifiques " -"au site de destination, comme par exemple un nom d'album ou vos nom d'utilisateur et " -"mot de passe pour se connecter au site. Il peut arriver que gThumb doive ouvrir un " -"navigateur Web pour que vous puissiez effectuer la phase d'authentification. Lorsque " -"celle-ci est terminée, revenez dans gThumb pour continuer l'envoi des photos." +"Il se peut que vous deviez renseigner des informations supplémentaires " +"spécifiques au site de destination, comme par exemple un nom d'album ou vos " +"nom d'utilisateur et mot de passe pour se connecter au site. Il peut arriver " +"que gThumb doive ouvrir un navigateur Web pour que vous puissiez effectuer " +"la phase d'authentification. Lorsque celle-ci est terminée, revenez dans " +"gThumb pour continuer l'envoi des photos." #: C/sharing-social.page:26(p) msgid "" @@ -441,8 +444,8 @@ "EditExtensions." msgstr "" "Si le site souhaité ne se trouve pas dans le menu Partager, " -"vérifiez que l'extension correspondante est bien activée dans " -"ÉditionExtensions." +"vérifiez que l'extension correspondante est bien activée dans " +"ÉditionExtensions." #: C/sharing-social.page:31(p) msgid "" @@ -452,7 +455,8 @@ msgstr "" "Pour certains sites, gThumb est aussi capable de télécharger les photos du " "site dans gThumb. Examinez le menu FichierImporter " -"depuis pour connaître les options de téléchargement disponibles." +"depuis pour connaître les options de téléchargement " +"disponibles." #: C/sharing-disc.page:6(title) msgid "Creating a CD/DVD/ISO" diff -Nru gthumb-2.14.3/help/fr/index.page gthumb-3.0.0/help/fr/index.page --- gthumb-2.14.3/help/fr/index.page 2012-03-25 19:24:47.000000000 +0000 +++ gthumb-3.0.0/help/fr/index.page 2012-04-23 19:15:28.000000000 +0000 @@ -17,7 +17,7 @@ - Manuel de <app>gThumb</app> + gThumb Help
Bienvenue diff -Nru gthumb-2.14.3/help/Makefile.in gthumb-3.0.0/help/Makefile.in --- gthumb-2.14.3/help/Makefile.in 2012-03-25 18:34:16.000000000 +0000 +++ gthumb-3.0.0/help/Makefile.in 2012-04-23 18:09:52.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -39,6 +39,23 @@ ################################################################################ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -80,6 +97,11 @@ am__v_at_0 = @ 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 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ @@ -125,10 +147,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -136,6 +156,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -175,6 +196,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -223,8 +246,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -255,6 +276,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ diff -Nru gthumb-2.14.3/help/oc/import.page gthumb-3.0.0/help/oc/import.page --- gthumb-2.14.3/help/oc/import.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/oc/import.page 2012-04-23 19:15:28.000000000 +0000 @@ -34,7 +34,7 @@

An event name may also be optionally associated with the photos. This event name can be used to generate an automatic subfolder name (possibly incorporating a date) as described below. For example, - if the base destinator folder is "/photos", and you enter + if the base destination folder is "/photos", and you enter "Wedding-Jennifer" in the Event field, you can configure generation of automatic subfolders like "/photos/2010-07-31, Wedding-Jennifer".

diff -Nru gthumb-2.14.3/help/oc/index.page gthumb-3.0.0/help/oc/index.page --- gthumb-2.14.3/help/oc/index.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/oc/index.page 2012-04-23 19:15:28.000000000 +0000 @@ -17,7 +17,7 @@ - <app>gThumb</app>Help + gThumb Help
Welcome diff -Nru gthumb-2.14.3/help/sl/batch-change-date.page gthumb-3.0.0/help/sl/batch-change-date.page --- gthumb-2.14.3/help/sl/batch-change-date.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/batch-change-date.page 2012-04-23 19:15:28.000000000 +0000 @@ -5,10 +5,7 @@ Spreminjanje datumov -

To change the file modification times, the comment dates, or the - Exif DateTimeOriginal tags of multiple files, select the files in the - browser view. Then click the Tools button on the main toolbar, - and select ToolsChange Date.

+

Za spremembo časov sprememb datotek, datumov opomb ali oznake Exif DatumČasIzvora več datotek, izberite datoteke v pogledu brskalnika. Nato kliknite na gumb Orodja v glavni orodni vrstici iz izberite OrodjaSpremeni datum.

Izberite želene možnosti datuma in kliknite Izvedi za dokončanje opravila.

diff -Nru gthumb-2.14.3/help/sl/edit-redeye.page gthumb-3.0.0/help/sl/edit-redeye.page --- gthumb-2.14.3/help/sl/edit-redeye.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/edit-redeye.page 2012-04-23 19:15:28.000000000 +0000 @@ -6,7 +6,7 @@ Odstranitev rdečih oči

Za dostop do orodij urejanja odprite sliko in nato kliknite na gumb orodne vrstice Uredi datoteko (ikona palete).

-

gThumb zagotavlja orodje odstranjevanja rdečih oči. Za odstranitev rdečega očesa postavite miškin kazalec nad rdeče oko in kliknite nanj. gThumb bo poskusil odstraniti rdeče področje in ga zamenjati s sivim področjem bolj naravnega videza. V primeru, da rezultati niso videti pravilno, pritisnite Ubežno tipko in kliknite na predmet Razveljavi.

+

gThumb zagotavlja orodje odstranjevanja rdečih oči. Za odstranitev rdečega očesa postavite miškin kazalec nad rdeče oko in kliknite nanj. gThumb bo poskusil odstraniti rdeče področje in ga zamenjati s sivim področjem bolj naravnega videza. V primeru, da rezultati niso videti pravilno, pritisnite Esc in kliknite na predmet Razveljavi.

To orodje deluje najboljše, ko je med rdečim očesom in bližnjim področjem obraza visok kontrast. Ne deluje dobro za "oranžno oko", ki ga je včasih mogoče videti na fotografijah otrok ali če ima koža v bližini rdeč pridih. To orodje bi lahko uporabilo izboljšave - če ste kruto pametni, ljubite algebro matrik in odprtokodne programe, link href="http://live.gnome.org/gthumb/development">pošljite popravek!

diff -Nru gthumb-2.14.3/help/sl/edit-save-undo-redo.page gthumb-3.0.0/help/sl/edit-save-undo-redo.page --- gthumb-2.14.3/help/sl/edit-save-undo-redo.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/edit-save-undo-redo.page 2012-04-23 19:15:28.000000000 +0000 @@ -11,9 +11,6 @@

Spremenjeno sliko je mogoče shraniti s pritiskom na Shrani. Za shranjevanje spremenjene slike na novo mesto in puščanje nespremenjene izvorne slike uporabite Shrani kot.

-

If you exit the editing mode (by pressing Esc or the - View the Folders toolbar button), or navigate away from - the current image, you will be prompted to save or discard your - changes.

+

V primeru, da končate način urejanja (s pritiskom Esc ali gumba orodne vrstice Ogled map) ali krmarite vstran od trenutne slike, boste bili pozvani k shranjevanju ali zavrzitvi svojih sprememb.

diff -Nru gthumb-2.14.3/help/sl/file-copy-move.page gthumb-3.0.0/help/sl/file-copy-move.page --- gthumb-2.14.3/help/sl/file-copy-move.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/file-copy-move.page 2012-04-23 19:15:28.000000000 +0000 @@ -3,46 +3,26 @@ - Copying and Moving Files + Kopiranje in premik datotek -

There are three ways to copy or move files in gThumb.

+

Obstajajo trije načini za kopiranje ali premik datotek v programu gThumb.

- Cut and Paste -

To copy a file in the browser view, use - EditCopy, or press - CtrlC. To move a file, use - EditCut, or press - CtrlX. Then navigate to the - destination folder using the folder tree. Use - EditPaste, or press - CtrlV, to complete the file - transfer.

+ Izrez in lepljenje +

Za kopiranje datoteke v pogledu brskalnika uporabite UrediKopiraj ali pritisnite CtrlC. Za premik datoteke uporabite UrediIzreži ali pritisnite CtrlX. Nato krmarite v ciljno mapo z uporabo drevesa map. Uporabite UrediPrilepi ali pritisnite CtrlV za dokončanje prenosa datotek.

- Drag and Drop -

To copy a file to another folder, simply drag the file - (with a sustained left-mouse click) to the destination folder visible in - the folder tree. To move a file, hold down the Shift key while - dragging.

-

You can also use the middle mouse button to drag files. In this case, - gThumb will ask you if you wish to copy the files, move the files, or - cancel the operation.

+ Povleci in spusti +

Za kopiranje datoteke v drugo mapo povlecite datoteko (z zadržanim levim miškinim klikom) v ciljno mapo, ki je vidna v drevesu map. Za premik datoteke držite tipko Shift medtem ko vlečete.

+

Za vlečenje datotek lahko uporabite srednji miškin klik. V tem primeru vas bo gThumb vprašal, če želite datoteke kopirati, premakniti ali preklicati opravilo.

- File Copy / Move Dialog -

Select the files to be transferred, right-click on the selection, - and choose Copy to... or - Move to.... - This will open a folder-selection dialog, where you can choose the - destination folder. At the bottom of the dialog, you can enable - the View the destination option if you - want to go to the destination folder after the file transfer is - complete.

+ Pogovorno okno kopiranja/premikanja +

Izberite datoteke za prenos, desno kliknite izbiro in izberite Kopiraj na ... ali Premakni na .... To bo odprlo pogovorno okno izbire mape, kjer lahko izberete ciljno mapo. Na dnu pogovornega okna lahko omogočite možnost Ogled cilja, če želite po končanem prenosu iti v ciljno mapo.

diff -Nru gthumb-2.14.3/help/sl/fullscreen.page gthumb-3.0.0/help/sl/fullscreen.page --- gthumb-2.14.3/help/sl/fullscreen.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/fullscreen.page 2012-04-23 19:15:28.000000000 +0000 @@ -15,8 +15,8 @@

Nazaj k prejšnji sliki greste lahko s klikom na gumb Stran gor ali Vra.

-

To je mogoče uporabiti za podporo ročno nadzorovane diapredstavitve.

+

To je mogoče uporabiti za podporo ročno nadzorovane predstavitve.

-

Za končanje celozaslonskega načina pritisnite f ali Ubežno tipko.

+

Za končanje celozaslonskega načina pritisnite f ali Esc.

diff -Nru gthumb-2.14.3/help/sl/import.page gthumb-3.0.0/help/sl/import.page --- gthumb-2.14.3/help/sl/import.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/import.page 2012-04-23 19:15:28.000000000 +0000 @@ -20,7 +20,7 @@

Oznake je mogoče izbirno povezati z uvoženimi fotografijami z uporabo nadzornika Oznake pod oknom sličic. Kliknite spustni nadzornik za ogled pred-določenih oznak.

-

Izbirno je s fotografijami mogoče povezati ime dogodka. Ime dogodka je mogoče uporabiti za ustvarjanje samodejnega imena podmape (ki lahko vključuje datum) kot je opisano spodaj. Na primer, če je osnovna cilja mapa "/fotografije" in v polje Dogodki vnesete "Poroka-Brigita" lahko nastavite ustvarjanje samodejnih podmap kot "fotografije/2010-07-31, Poroka-Brigita".

+

Izbirno je s fotografijami mogoče povezati ime dogodka. Ime dogodka je mogoče uporabiti za ustvarjanje samodejnega imena podmape (ki lahko vključuje datum) kot je opisano spodaj. Na primer, če je osnovna cilja mapa "/fotografije" in v polje Dogodki vnesete "Poroka-Brigita" lahko nastavite ustvarjanje samodejnih podmap kot "fotografije/2012-09-15, Poroka-Brigita".

Običajne podmape osnovane na datumu diff -Nru gthumb-2.14.3/help/sl/index.page gthumb-3.0.0/help/sl/index.page --- gthumb-2.14.3/help/sl/index.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/index.page 2012-04-23 19:15:28.000000000 +0000 @@ -17,7 +17,7 @@ - <app>gThumb</app>Pomoč + Pomoč gThumb
Dobrodošli diff -Nru gthumb-2.14.3/help/sl/introduction.page gthumb-3.0.0/help/sl/introduction.page --- gthumb-2.14.3/help/sl/introduction.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/introduction.page 2012-04-23 19:15:28.000000000 +0000 @@ -11,7 +11,7 @@

Vključene je nekaj podpore za vrste slik RAW, posebno če je na vašem sistemu nameščen program dcraw.

-

gThumb vam omogoča ne le ogled datotek slik, amapk tudi druge zmožnosti kot je dodajanje opomb slikam, organizacijo slik v kataloge, tiskanje slik, diapredstavitve, nastavitev ozadja vašega namizja in več.

+

gThumb vam omogoča ne le ogled datotek slik, amapk tudi druge zmožnosti kot je dodajanje opomb slikam, organizacijo slik v kataloge, tiskanje slik, predstavitve, nastavitev ozadja vašega namizja in več.

gThumb vključuje orodje za uvoz fotografij iz priklopljenih fotoaparatov in bralnikov spominskih kartic.

diff -Nru gthumb-2.14.3/help/sl/printing.page gthumb-3.0.0/help/sl/printing.page --- gthumb-2.14.3/help/sl/printing.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/printing.page 2012-04-23 19:15:28.000000000 +0000 @@ -8,10 +8,7 @@

Za tiskanje trenutne slike v načinu pregledovalnika uporabite DatotekaNatisni ali Ctrlp.

-

To print one or more images from the browser mode, - select the desired images and then use - FilePrint or - Ctrlp.

+

Za tiskanje več slik v načinu pregledovalnika izberite želene slike in nato uporabite DatotekaNatisni ali Ctrlp.

Tiskalnik lahko izberete v zavihku Splošno pogovornega okna tiskanja.

diff -Nru gthumb-2.14.3/help/sl/sharing-disc.page gthumb-3.0.0/help/sl/sharing-disc.page --- gthumb-2.14.3/help/sl/sharing-disc.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/sharing-disc.page 2012-04-23 19:15:28.000000000 +0000 @@ -4,12 +4,7 @@ Ustvarjanje CD-jev/DVD-jev/ISO-jev -

- To write a series of files to an optical disk (CD or DVD), or to create - an ISO disk image file, use the File - Export ToOptical Disc - menu item. -

+

Za zapis datotek na optični disk (CD ali DVD) ali za ustvarjanje datoteke odtisa diska ISO uporabite predmet menija DatotekaIzvozi vOptični disk.

Ponujena vam bo izbira med zapisom trenutno izbranih datotek, celotne trenutne mape ali celotne trenutne mape in njenih podmap. Ko boste izbrali primerno možnost, kliknite V redu.

V naslednjem pogovornem oknu boste lahko izbrali cilj disk ali datoteko ISO za shranjevanje. Ko boste pripravljeni za dokončanje opravila, kliknite Ustvari odtis. Nato se bo začelo opravilo zapisovanja optičnega diska ali pa bo zapisana datoteka ISO.

diff -Nru gthumb-2.14.3/help/sl/sharing-social.page gthumb-3.0.0/help/sl/sharing-social.page --- gthumb-2.14.3/help/sl/sharing-social.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/sharing-social.page 2012-04-23 19:15:28.000000000 +0000 @@ -3,34 +3,10 @@ - Uploading to Photo-Sharing Web Sites -

- gThumb is provided with a number of extensions for uploading - photos to various "social media" web sites. By default, - uploaders for Facebook, Flickr, Picasa, and Photobucket - are enabled. -

-

To upload a series of photos, select the images in the - browser view, and click the Share button in the toolbar. - Select the appropriate web site from the menu that appears. -

-

- You may be prompted for additional information specific to the - destination site, like an album name. You may also be prompted - for your user name and password for the site. It may be necessary - for gThumb to open a web browser, where you complete the required - authentication steps. Once you have completed the required - authentication steps in the browser, return to gThumb and - continue the upload. -

-

- If you do not see the expected upload sites in the Share - menu, check that the appropriate exporter extensions are enabled - in EditExtensions. -

-

- For some sites, gThumb also supports downloading photos from the - site into gThumb. See the FileImport From - menu for the available download options. -

+ Pošiljanje na spletišča za deljenje fotografij +

gThumb zagotavlja številne razširitve za pošiljanje fotografij na različna spletišča "družabnih medijev". Privzeto je omogočeno pošiljanje na Facebook, Flickr, Picasa in Photobucket.

+

Za pošiljanje zaporedja fotografij izberite slike v pogledu brskalnika in kliknite na gumb Souporaba v orodni vrstici. Izberite ustrezno spletišče iz menija, ki se pojavi.

+

Pozvani boste k vnosu dodatnih podatkov določenih za ciljno stran kot je ime albuma. Morda boste pozvani tudi k vnosu uporabniškega imena in gesla za spletišča. Morda bo gThumb moral odpreti spletni brskalnik, kjer boste dokončali zahtevane korake overitve. Ko ste korake overitve dokončali v brskalniku, se vrnite v gThumb in nadaljujte s pošiljanjem.

+

Če pričakovanih spletišč pošiljanja ne vidite v meniju Souporaba, preverite da so ustrezne razširitve izvoza omogočene v UrediRazširitve.

+

Za nekatera spletišča gThumb podpira tudi prejemanje fotografij s spletišča v gThumb. Oglejte si meni DatotekaUvozi iz za razpoložljive možnosti prejema.

diff -Nru gthumb-2.14.3/help/sl/shortcuts.page gthumb-3.0.0/help/sl/shortcuts.page --- gthumb-2.14.3/help/sl/shortcuts.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/shortcuts.page 2012-04-23 19:15:28.000000000 +0000 @@ -270,9 +270,7 @@
@@ -278,7 +278,7 @@
-

Löschtaste oder Bild auf

+

Löschtaste oder Bild auf

Das vorhergehende Bild zeigen.

@@ -448,7 +448,7 @@

-

Vorwärts gehen (nach vorhergehendem rückwärts gehen)

+

Vorwärts gehen (nach vorhergehendem rückwärts gehen)

-

- Space or - Page Down

+

Preslednicaali Stran navzdol

Ogled naslednje slike.

@@ -280,9 +278,7 @@
-

- Backspace or - Page Up

+

Povratna stipkaali Stran navzgor

Ogled predhodne slike.

@@ -323,9 +319,7 @@
-

- + or - =

+

+ ali =

Približa.

@@ -343,10 +337,7 @@
-

- 1 or - z or - / (numeric keypad)

+

1 ali z ali / (številčna tipkovnica)

Dejanska velikost.

@@ -354,9 +345,7 @@
-

- x or - * (numeric keypad)

+

x or * (Številčna tipkovnica)

Približa do prileganja (le oddalji, ne poveča)

@@ -479,7 +468,7 @@
- Nadzor diapredstavitve + Nadzor predstavitve @@ -506,7 +495,7 @@

@@ -516,7 +505,7 @@

diff -Nru gthumb-2.14.3/help/sl/slideshow.page gthumb-3.0.0/help/sl/slideshow.page --- gthumb-2.14.3/help/sl/slideshow.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/slideshow.page 2012-04-23 19:15:28.000000000 +0000 @@ -4,11 +4,11 @@ - Samodejna diapredstavitev + Samodejna predstavitev -

Diapredstavitev trenutno izbranih slik je mogoče začeti iz brskalnika slik s pritiskom na F5, s klikom na ikono diapredstavitve v orodni vrstici ali s klikom na PogledDiapredstavitev. V primeru da ni izbrana nobena slika, bodo vključene vse slike v mapi.

+

predstavitev trenutno izbranih slik je mogoče začeti iz brskalnika slik s pritiskom na F5, s klikom na ikono predstavitve v orodni vrstici ali s klikom na PogledPredstavitev. V primeru da ni izbrana nobena slika, bodo vključene vse slike v mapi.

-

Učinki prehodov in čas prikaza vsake slike je mogoče spremeniti v pogovornemoknu UrediMožnostiDiapredstavitev.

+

Učinki prehodov in čas prikaza vsake slike je mogoče spremeniti v pogovornemoknu UrediMožnostiPredstavitev.

Nekatere grafične kartice in gonilniki lahko imajo težave (se sesujejo), če so učinki prehodov omogočeni. V kolikor imate takšne težave, nastavite možnost Učinek prehodov na Brez.

@@ -16,8 +16,8 @@

Nazaj k prejšnji sliki greste lahko s pritiskom na Puščica navzgor, Leva puščica ali Stran navzgor.

-

Premor ali nadaljevanje diapredstavitve lahko dosežete s pritiskom na tipko p.

+

Premor ali nadaljevanje predstavitve lahko dosežete s pritiskom na tipko p.

-

Za končanje diapredstavitve pritisnite Ubežno tipko ali F5.

+

Za končanje predstavitve pritisnite Esc ali F5.

diff -Nru gthumb-2.14.3/help/sl/sl.po gthumb-3.0.0/help/sl/sl.po --- gthumb-2.14.3/help/sl/sl.po 2012-03-25 19:24:49.000000000 +0000 +++ gthumb-3.0.0/help/sl/sl.po 2012-04-23 19:15:29.000000000 +0000 @@ -2,15 +2,16 @@ # Copyright (C) 2002-2007 Free Software Foundation, Inc. # This file is distributed under the same license as the gthumb-help package. # -# Andrej Žnidaršič , 2010. +# Andrej Žnidaršič , 2010-2012. # msgid "" msgstr "" "Project-Id-Version: gthumb manual\n" -"POT-Creation-Date: 2010-09-26 16:07+0000\n" +"POT-Creation-Date: 2012-04-08 08:50+0000\n" "PO-Revision-Date: \n" -"Last-Translator: Matej Urbančič \n" +"Last-Translator: Andrej Žnidaršič \n" "Language-Team: Slovenian GNOME Translation Team \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,17 +20,53 @@ "X-Poedit-Language: Slovenian\n" "X-Poedit-SourceCharset: utf-8\n" +#: C/file-copy-move.page:6(title) +msgid "Copying and Moving Files" +msgstr "Kopiranje in premik datotek" + +#: C/file-copy-move.page:8(p) +msgid "There are three ways to copy or move files in gThumb." +msgstr "Obstajajo trije načini za kopiranje ali premik datotek v programu gThumb." + +#: C/file-copy-move.page:12(title) +msgid "Cut and Paste" +msgstr "Izrez in lepljenje" + +#: C/file-copy-move.page:13(p) +msgid "To copy a file in the browser view, use EditCopy, or press CtrlC. To move a file, use EditCut, or press CtrlX. Then navigate to the destination folder using the folder tree. Use EditPaste, or press CtrlV, to complete the file transfer." +msgstr "Za kopiranje datoteke v pogledu brskalnika uporabite UrediKopiraj ali pritisnite CtrlC. Za premik datoteke uporabite UrediIzreži ali pritisnite CtrlX. Nato krmarite v ciljno mapo z uporabo drevesa map. Uporabite UrediPrilepi ali pritisnite CtrlV za dokončanje prenosa datotek." + +#: C/file-copy-move.page:26(title) +msgid "Drag and Drop" +msgstr "Povleci in spusti" + +#: C/file-copy-move.page:27(p) +msgid "To copy a file to another folder, simply drag the file (with a sustained left-mouse click) to the destination folder visible in the folder tree. To move a file, hold down the Shift key while dragging." +msgstr "Za kopiranje datoteke v drugo mapo povlecite datoteko (z zadržanim levim miškinim klikom) v ciljno mapo, ki je vidna v drevesu map. Za premik datoteke držite tipko Shift medtem ko vlečete." + +#: C/file-copy-move.page:31(p) +msgid "You can also use the middle mouse button to drag files. In this case, gThumb will ask you if you wish to copy the files, move the files, or cancel the operation." +msgstr "Za vlečenje datotek lahko uporabite srednji miškin klik. V tem primeru vas bo gThumb vprašal, če želite datoteke kopirati, premakniti ali preklicati opravilo." + +#: C/file-copy-move.page:37(title) +msgid "File Copy / Move Dialog" +msgstr "Pogovorno okno kopiranja/premikanja" + +#: C/file-copy-move.page:38(p) +msgid "Select the files to be transferred, right-click on the selection, and choose Copy to... or Move to.... This will open a folder-selection dialog, where you can choose the destination folder. At the bottom of the dialog, you can enable the View the destination option if you want to go to the destination folder after the file transfer is complete." +msgstr "Izberite datoteke za prenos, desno kliknite izbiro in izberite Kopiraj na ... ali Premakni na .... To bo odprlo pogovorno okno izbire mape, kjer lahko izberete ciljno mapo. Na dnu pogovornega okna lahko omogočite možnost Ogled cilja, če želite po končanem prenosu iti v ciljno mapo." + #: C/slideshow.page:7(title) msgid "Automatic Slideshow" -msgstr "Samodejna diapredstavitev" +msgstr "Samodejna predstavitev" #: C/slideshow.page:9(p) msgid "A slideshow of the currently selected images can be started from the image browser by pressing F5, by clicking the slideshow toolbar icon, or by clicking ViewSlideshow. If no images are selected, all images in the folder will be included." -msgstr "Diapredstavitev trenutno izbranih slik je mogoče začeti iz brskalnika slik s pritiskom na F5, s klikom na ikono diapredstavitve v orodni vrstici ali s klikom na PogledDiapredstavitev. V primeru da ni izbrana nobena slika, bodo vključene vse slike v mapi. " +msgstr "predstavitev trenutno izbranih slik je mogoče začeti iz brskalnika slik s pritiskom na F5, s klikom na ikono predstavitve v orodni vrstici ali s klikom na PogledPredstavitev. V primeru da ni izbrana nobena slika, bodo vključene vse slike v mapi. " #: C/slideshow.page:15(p) msgid "The transition effects and the time each image is shown can be modified from the EditPreferencesSlideshow dialog." -msgstr "Učinki prehodov in čas prikaza vsake slike je mogoče spremeniti v pogovornemoknu UrediMožnostiDiapredstavitev." +msgstr "Učinki prehodov in čas prikaza vsake slike je mogoče spremeniti v pogovornemoknu UrediMožnostiPredstavitev." #: C/slideshow.page:19(p) msgid "Some graphics cards and drivers may experience problems (crashes) if transition effects are enabled. If you experience such difficulties, set the Transition effect preference to None." @@ -40,20 +77,16 @@ msgstr "Na naslednjo sliko lahko napredujete ročno s pritiskom na Puščica navzdol, Puščica navzgor, Stran navzdol ali Preslednica. " #: C/slideshow.page:27(p) -#| msgid "" -#| "You can go back to the previous image by clicking the " -#| "Previous button, or by pressing Backspace or Page Up." msgid "You can go back to the previous image by pressing Up Arrow, Left Arrow or Page Up." msgstr "Nazaj k prejšnji sliki greste lahko s pritiskom na Puščica navzgor, Leva puščica ali Stran navzgor. " #: C/slideshow.page:30(p) msgid "You can pause or un-pause the slideshow by pressing p." -msgstr "Premor ali nadaljevanje diapredstavitve lahko dosežete s pritiskom na tipko p." +msgstr "Premor ali nadaljevanje predstavitve lahko dosežete s pritiskom na tipko p." #: C/slideshow.page:32(p) msgid "To exit the slideshow, press Escape or F5." -msgstr "Za končanje diapredstavitve pritisnite Ubežno tipko ali F5." +msgstr "Za končanje predstavitve pritisnite Esc ali F5." #. When image changes, this message will be marked fuzzy or untranslated for you. #. It doesn't matter what you translate it to: it's not used at all. @@ -74,7 +107,6 @@ msgstr "@@image: 'figures/import-pref-custom-format.png'; md5=989ca536c873ec926a4a71c876004b9f" #: C/import.page:8(title) -#| msgid "To Import Photos from a Digital Camera" msgid "Importing From a Camera" msgstr "Uvažanje fotografij z digitalnega fotoaparata" @@ -99,8 +131,8 @@ msgstr "Oznake je mogoče izbirno povezati z uvoženimi fotografijami z uporabo nadzornika Oznake pod oknom sličic. Kliknite spustni nadzornik za ogled pred-določenih oznak." #: C/import.page:34(p) -msgid "An event name may also be optionally associated with the photos. This event name can be used to generate an automatic subfolder name (possibly incorporating a date) as described below. For example, if the base destinator folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the Event field, you can configure generation of automatic subfolders like \"/photos/2010-07-31, Wedding-Jennifer\"." -msgstr "Izbirno je s fotografijami mogoče povezati ime dogodka. Ime dogodka je mogoče uporabiti za ustvarjanje samodejnega imena podmape (ki lahko vključuje datum) kot je opisano spodaj. Na primer, če je osnovna cilja mapa \"/fotografije\" in v polje Dogodki vnesete \"Poroka-Brigita\" lahko nastavite ustvarjanje samodejnih podmap kot \"fotografije/2010-07-31, Poroka-Brigita\"." +msgid "An event name may also be optionally associated with the photos. This event name can be used to generate an automatic subfolder name (possibly incorporating a date) as described below. For example, if the base destination folder is \"/photos\", and you enter \"Wedding-Jennifer\" in the Event field, you can configure generation of automatic subfolders like \"/photos/2010-07-31, Wedding-Jennifer\"." +msgstr "Izbirno je s fotografijami mogoče povezati ime dogodka. Ime dogodka je mogoče uporabiti za ustvarjanje samodejnega imena podmape (ki lahko vključuje datum) kot je opisano spodaj. Na primer, če je osnovna cilja mapa \"/fotografije\" in v polje Dogodki vnesete \"Poroka-Brigita\" lahko nastavite ustvarjanje samodejnih podmap kot \"fotografije/2012-09-15, Poroka-Brigita\"." #: C/import.page:42(title) msgid "Standard Date-Based Subfolders" @@ -135,15 +167,6 @@ msgstr "Uporaba zaznamkov" #: C/bookmarks.page:8(p) -#| msgid "" -#| "Frequently used folders can be added to the bookmark list for rapid " -#| "access. Just go to the folder you want to add to the bookmarks and press " -#| "CtrlD or use the command BookmarksAdd Bookmark. To remove " -#| "or rearrange bookmarks in a different order use the " -#| "BookmarksEdit Bookmarks command." msgid "Frequently-used folders can be added to the bookmark list for rapid access. To add the current folder to the bookmark list, press CtrlD or use the command BookmarksAdd Bookmark." msgstr "Pogosto uporabljene mape lahko dodate na seznam zaznamkov za hiter dostop. Za dodajanje trenutne mape na seznam zaznamkov pritisnite CtrlD ali uporabite ukaz ZaznamkiDodaj zaznamek." @@ -156,20 +179,43 @@ msgstr "ZaznamkiSistemski zaznamki zagotavlja dostop do sistemskih zaznamkov, ki so bili določeni v NautilusuSet as Desktop Background from the pop-up menu. The desktop background will change, and the Gnome Appearance Preferences dialog will appear. You can use this dialog to make adjustments to the background settings (positioning, stretching, tiling, et cetera.)." -msgstr "Za nastavitev slike kot tapete namizja sistema, desno kliknite na slik o in v pojavnem meniju izberite Nastavi kot ozadje namizja. Ozadje namizja se bo spremenilo in pojavilo se bo pogovorno okno Možnosti videza Gnome. To pogovorno okno lahko uporabite za prilagoditve nastavitev ozadja (položaj, raztezanje, razpostavljanje, itd. )." +msgstr "Za nastavitev slike kot ozadja namizja sistema, desno kliknite na sliko in v pojavnem meniju izberite Nastavi kot ozadje namizja. Ozadje namizja se bo spremenilo in pojavilo se bo pogovorno okno Možnosti videza Gnome. To pogovorno okno lahko uporabite za prilagoditve nastavitev ozadja (položaj, raztezanje, razpostavljanje, itd. )." + +#: C/sharing-social.page:6(title) +msgid "Uploading to Photo-Sharing Web Sites" +msgstr "Pošiljanje na spletišča za deljenje fotografij" + +#: C/sharing-social.page:7(p) +msgid "gThumb is provided with a number of extensions for uploading photos to various \"social media\" web sites. By default, uploaders for Facebook, Flickr, Picasa, and Photobucket are enabled." +msgstr "gThumb zagotavlja številne razširitve za pošiljanje fotografij na različna spletišča \"družabnih medijev\". Privzeto je omogočeno pošiljanje na Facebook, Flickr, Picasa in Photobucket." + +#: C/sharing-social.page:13(p) +msgid "To upload a series of photos, select the images in the browser view, and click the Share button in the toolbar. Select the appropriate web site from the menu that appears." +msgstr "Za pošiljanje zaporedja fotografij izberite slike v pogledu brskalnika in kliknite na gumb Souporaba v orodni vrstici. Izberite ustrezno spletišče iz menija, ki se pojavi." + +#: C/sharing-social.page:17(p) +msgid "You may be prompted for additional information specific to the destination site, like an album name. You may also be prompted for your user name and password for the site. It may be necessary for gThumb to open a web browser, where you complete the required authentication steps. Once you have completed the required authentication steps in the browser, return to gThumb and continue the upload." +msgstr "Pozvani boste k vnosu dodatnih podatkov določenih za ciljno stran kot je ime albuma. Morda boste pozvani tudi k vnosu uporabniškega imena in gesla za spletišča. Morda bo gThumb moral odpreti spletni brskalnik, kjer boste dokončali zahtevane korake overitve. Ko ste korake overitve dokončali v brskalniku, se vrnite v gThumb in nadaljujte s pošiljanjem. " + +#: C/sharing-social.page:26(p) +msgid "If you do not see the expected upload sites in the Share menu, check that the appropriate exporter extensions are enabled in EditExtensions." +msgstr "Če pričakovanih spletišč pošiljanja ne vidite v meniju Souporaba, preverite da so ustrezne razširitve izvoza omogočene v UrediRazširitve." + +#: C/sharing-social.page:31(p) +msgid "For some sites, gThumb also supports downloading photos from the site into gThumb. See the FileImport From menu for the available download options." +msgstr "Za nekatera spletišča gThumb podpira tudi prejemanje fotografij s spletišča v gThumb. Oglejte si meni DatotekaUvozi iz za razpoložljive možnosti prejema." #: C/sharing-disc.page:6(title) msgid "Creating a CD/DVD/ISO" msgstr "Ustvarjanje CD-jev/DVD-jev/ISO-jev" #: C/sharing-disc.page:7(p) -msgid "To write a series of files to an optical disk (CD or DVD), or to create an ISO disk image file, use the File Export ToOptical Disc menu item." +msgid "To write a series of files to an optical disk (CD or DVD), or to create an ISO disk image file, use the FileExport ToOptical Disc menu item." msgstr "Za zapis datotek na optični disk (CD ali DVD) ali za ustvarjanje datoteke odtisa diska ISO uporabite predmet menija DatotekaIzvozi vOptični disk." #: C/sharing-disc.page:13(p) @@ -181,7 +227,6 @@ msgstr "V naslednjem pogovornem oknu boste lahko izbrali cilj disk ali datoteko ISO za shranjevanje. Ko boste pripravljeni za dokončanje opravila, kliknite Ustvari odtis. Nato se bo začelo opravilo zapisovanja optičnega diska ali pa bo zapisana datoteka ISO." #: C/shortcuts.page:7(title) -#| msgid "Keyboard Shortcut" msgid "Keyboard Shortcuts" msgstr "Tipkovne bližnjice" @@ -234,7 +279,6 @@ msgstr "F11 ali f" #: C/shortcuts.page:58(p) -#| msgid "Exit the fullscreen mode." msgid "Toggles the fullscreen mode." msgstr "Preklopi celozaslonski način." @@ -257,7 +301,6 @@ msgstr "Esc" #: C/shortcuts.page:78(p) -#| msgid "Exit the fullscreen mode." msgid "Closes the viewer or fullscreen mode." msgstr "Zapre pregledovalnik ali celozaslonski način." @@ -286,19 +329,14 @@ msgstr "F2" #: C/shortcuts.page:124(p) -#| msgid "Resize the image." msgid "Rename the image." msgstr "Preimenujte sliko." #: C/shortcuts.page:129(p) -#| msgid "" -#| "+ or =" msgid "c or Ctrlm" msgstr "c ali Ctrlm" #: C/shortcuts.page:134(p) -#| msgid "Add a comment to the selected images." msgid "Add comments or metadata to an image." msgstr "Doda opombe ali metapodatke sliki." @@ -324,7 +362,6 @@ msgstr "Izbriši" #: C/shortcuts.page:164(p) -#| msgid "the number of the selected images and their size." msgid "Move the selected files to the Trash." msgstr "Premakne izbrane datoteke v smeti." @@ -335,7 +372,6 @@ msgstr "Dvigalka" #: C/shortcuts.page:174(p) -#| msgid "Delete the selected images." msgid "Delete the selected files permanently." msgstr "Trajno izbriše izbrane slike." @@ -344,17 +380,14 @@ msgstr "Urejanje bližnjic le za način pregledovalnika" #: C/shortcuts.page:186(p) -#| msgid "Keyboard Shortcut" msgid "Keyboard Shortcut (Case Sensitive)" msgstr "Tipkovne bližnjice (občutljive na velikost črk)" #: C/shortcuts.page:195(key) -#| msgid "%h" msgid "h" msgstr "h" #: C/shortcuts.page:199(p) -#| msgid "Enhance" msgid "Enhance colors." msgstr "Izboljša barve." @@ -363,7 +396,6 @@ msgstr "l" #: C/shortcuts.page:209(p) -#| msgid "Flip the image." msgid "Flip image." msgstr "Obrne sliko." @@ -372,7 +404,6 @@ msgstr "m" #: C/shortcuts.page:219(p) -#| msgid "Mirror the image." msgid "Mirror image." msgstr "Zrcali sliko." @@ -381,47 +412,39 @@ msgstr "r" #: C/shortcuts.page:229(p) -#| msgid "Rotate Right" msgid "Rotate right." msgstr "Vrtenje desno." #: C/shortcuts.page:235(key) -#| msgid "%R" msgid "R" msgstr "R" #: C/shortcuts.page:239(p) -#| msgid "Rotate Left" msgid "Rotate left." msgstr "Vrtenje levo." #: C/shortcuts.page:245(key) -#| msgid "%C" msgid "C" msgstr "C" #: C/shortcuts.page:249(p) -#| msgid "Crop the image." msgid "Crop image." msgstr "Obreže sliko." #: C/shortcuts.page:255(key) -#| msgid "%S" msgid "S" msgstr "S" #: C/shortcuts.page:259(p) -#| msgid "Resize the image." msgid "Resize image." msgstr "Spremenite velikost slike." #: C/shortcuts.page:266(title) -#| msgid "Other keyboard shortcuts." msgid "Viewer shortcuts" msgstr "Bližnjice pregledovalnika" #: C/shortcuts.page:278(p) -msgid "Spaceor Page Down" +msgid "Space or Page Down" msgstr "Preslednicaali Stran navzdol" #: C/shortcuts.page:283(p) @@ -429,7 +452,7 @@ msgstr "Ogled naslednje slike." #: C/shortcuts.page:288(p) -msgid "Backspaceor Page Up" +msgid "Backspace or Page Up" msgstr "Povratna stipkaali Stran navzgor" #: C/shortcuts.page:293(p) @@ -463,8 +486,8 @@ msgstr "Doda trenutno mesto med zaznamke." #: C/shortcuts.page:331(p) -msgid "+or =" -msgstr "+ali =" +msgid "+ or =" +msgstr "+ ali =" #: C/shortcuts.page:336(p) msgid "Zoom in." @@ -479,10 +502,7 @@ msgstr "Oddalji." #: C/shortcuts.page:351(p) -#| msgid "" -#| "x or * (numeric " -#| "keypad)" -msgid "1or zor / (numeric keypad)" +msgid "1 or z or / (numeric keypad)" msgstr "1 ali z ali / (številčna tipkovnica)" #: C/shortcuts.page:357(p) @@ -490,11 +510,8 @@ msgstr "Dejanska velikost." #: C/shortcuts.page:362(p) -#| msgid "" -#| "x or * (numeric " -#| "keypad)" -msgid "xor * (numeric keypad)" -msgstr "x ali * (številčna tipkovnica)" +msgid "x or * (numeric keypad)" +msgstr "x or * (Številčna tipkovnica)" #: C/shortcuts.page:367(p) msgid "Zoom to fit (scales down only, does not magnify)" @@ -522,7 +539,6 @@ msgstr "Hitrejše drsanje po sliki." #: C/shortcuts.page:410(title) -#| msgid "Browser Tab" msgid "Browser Navigation" msgstr "Krmarjenje brskalnika" @@ -557,12 +573,10 @@ msgstr "Alt" #: C/shortcuts.page:457(key) -#| msgid "Arrows" msgid "Left Arrow" msgstr "Leva puščica" #: C/shortcuts.page:461(p) -#| msgid "Go to the previously visited folder." msgid "Go back to the previously viewed folder." msgstr "Gre v predhodno videno mapo." @@ -575,7 +589,6 @@ msgstr "Pojdi naprej (po koraku nazaj v mapo)." #: C/shortcuts.page:479(key) -#| msgid "p" msgid "Up" msgstr "Navzgor" @@ -584,40 +597,34 @@ msgstr "Gre eno raven navzgor." #: C/shortcuts.page:491(title) -#| msgid "Show comments" msgid "Slideshow controls" -msgstr "Nadzor diapredstavitve" +msgstr "Nadzor predstavitve" #: C/shortcuts.page:504(key) msgid "F5" msgstr "F5" #: C/shortcuts.page:508(p) -#| msgid "Start/Stop the slideshow." msgid "Start a slideshow." -msgstr "Začne diapredstavitev." +msgstr "Začne predstavitev." #: C/shortcuts.page:514(key) -#| msgid "Place" msgid "Space" msgstr "Presledek" #: C/shortcuts.page:518(p) -#| msgid "Pause/Resume a slideshow." msgid "Pause/Unpause the slideshow." -msgstr "Premor ali nadaljevanje diapredstavitve." +msgstr "Premor ali nadaljevanje predstavitve." #: C/shortcuts.page:528(p) -#| msgid "Start/Stop the slideshow." msgid "Close the slideshow." -msgstr "Zapre diapredstavitev." +msgstr "Zapre predstavitev." #: C/shortcuts.page:533(p) msgid "Down Arrow or Right Arrow or Page Down" msgstr "Pušlčica navzdol ali Puščica desno ali Stran navzdol" #: C/shortcuts.page:538(p) -#| msgid "View the next image." msgid "Load the next image." msgstr "Naloži naslednjo sliko." @@ -626,12 +633,10 @@ msgstr "Puščica navzgor ali Puščica levo ali Stran navzgor" #: C/shortcuts.page:548(p) -#| msgid "View the previous image." msgid "Load the previous image." msgstr "Naloži predhodno sliko." #: C/printing.page:7(title) -#| msgid "Finding Images" msgid "Printing Images" msgstr "Tiskanje slik" @@ -640,7 +645,7 @@ msgstr "Za tiskanje trenutne slike v načinu pregledovalnika uporabite DatotekaNatisni ali Ctrlp." #: C/printing.page:13(p) -msgid "To print on or more images from the browser mode, select the desired images and then use FilePrint or Ctrlp." +msgid "To print one or more images from the browser mode, select the desired images and then use FilePrint or Ctrlp." msgstr "Za tiskanje več slik v načinu pregledovalnika izberite želene slike in nato uporabite DatotekaNatisni ali Ctrlp." #: C/printing.page:18(p) @@ -693,7 +698,6 @@ msgstr "Z omogočitvijo Ime datoteke v Drugi filtri je v vrstico filtra na dnu pogleda brskalnika dodana zmožnost filtriranja z imenom datoteke:" #: C/filtering.page:28(title) -#| msgid "Filter Bar" msgid "Browser Filter Bar" msgstr "Vrstica filtra brskalnika" @@ -702,16 +706,14 @@ msgstr "Na zgornji sliki je bil filter imen datotek nastavljen le za prikaz datotek z \"gen\" v imenu datoteke. Ujemanje ni občutljivo na velikost črk." #: C/sorting.page:7(title) -#| msgid "Browsing Folders" msgid "Sorting Files" msgstr "Razvrščanje datotek " #: C/sorting.page:9(p) -msgid "Use the ViewSort By menu to select the desird file-sorting method for the browser view. Files can be sorted on the basis of their name, the file size, the file modification date, or the date the photo was taken." +msgid "Use the ViewSort By menu to select the desired file-sorting method for the browser view. Files can be sorted on the basis of their name, the file size, the file modification date, or the date the photo was taken." msgstr "Za izbiro želenega načina razvrščanja datotek v pogledu brskalnika uporabite meni PogledRazvrsti po. Datoteke je mogoče razvrstiti po njihovemu imenu, velikosti datotek, datumu spremembe datotek ali dneva zajema fotografije." #: C/fullscreen.page:8(title) -#| msgid "Available in Fullscreen Mode" msgid "Manual Fullscreen Mode" msgstr "Ročni celozaslonski način" @@ -724,28 +726,20 @@ msgstr "Premikanje miške bo za kratek čas omogočilo nadzorno ploščo pojavnih oken. Uporabiti jo je mogoče za krmarjenje do naslednje ali predhodne slike ali spremembo ravni približanja." #: C/fullscreen.page:18(p) -#| msgid "" -#| "You can advance to the next image by clicking the Next button, or by pressing Space or Page " -#| "Down." msgid "You can also advance to the next image by pressing PageDown or Space." msgstr "K naslednji sliki greste lahko s pritiskom na Preslednico ali Stran dol" #: C/fullscreen.page:21(p) -#| msgid "" -#| "You can go back to the previous image by clicking the " -#| "Previous button, or by pressing Backspace or Page Up." msgid "You can go back to the previous image by pressing PageUp or Backspace." msgstr "Nazaj k prejšnji sliki greste lahko s klikom na gumb Stran gor ali Vračalko. " #: C/fullscreen.page:24(p) msgid "This can be used to implement a manually-controlled slideshow." -msgstr "To je mogoče uporabiti za podporo ročno nadzorovane diapredstavitve." +msgstr "To je mogoče uporabiti za podporo ročno nadzorovane predstavitve." #: C/fullscreen.page:27(p) msgid "To exit the fullscreen mode, press f or Escape." -msgstr "Za končanje celozaslonskega načina pritisnite f ali Ubežno tipko." +msgstr "Za končanje celozaslonskega načina pritisnite f ali Esc." #. When image changes, this message will be marked fuzzy or untranslated for you. #. It doesn't matter what you translate it to: it's not used at all. @@ -755,34 +749,22 @@ msgstr "@@image: 'figures/thumbnail-pane.png'; md5=af28541956094195dac6bc0e11624d64" #: C/viewer.page:6(title) -#| msgid "Opening Images" msgid "Opening an Image" msgstr "Odpiranje slik" #: C/viewer.page:8(p) -#| msgid "" -#| "The browser view shows the images in the current folder or catalog. " -#| "Single-clicking an image will enable the Information Sidebar for that " -#| "image. Double-clicking an image will open it in the viewer mode. Double-" -#| "clicking with the middle mouse button will load the image in fullscreen " -#| "viewer mode." msgid "The browser view shows the images in the current folder or catalog (see ). Double-clicking an image (or pressing Return) in the browser will open it in the viewer mode." msgstr "Pogled brskalnika pokaže slike v trenutni mapi ali katalogu (oglejte si ). Dvoklik na sliko (ali pritisk na Vnosno tipko) jo bo odprl v načinu pregledovalnika." #: C/viewer.page:13(p) -#| msgid "" -#| "Pressing Escape will exit the viewer mode, and return " -#| "the user to the browser mode. A toolbar button (View the " -#| "folders) is also provided for this purpose." msgid "Pressing Escape will exit the viewer mode, and return the user to the browser mode. A toolbar button (View the folders) is also provided for this purpose." -msgstr "Pritisk na Ubežno tipko bo končal način pregledovalnika in vrnil uporabnika v način brskalnika. Gumb orodne vrstice (Ogled map) je na voljo za ta namen." +msgstr "Pritisk na Esc bo končal način pregledovalnika in vrnil uporabnika v način brskalnika. Gumb orodne vrstice (Ogled map) je na voljo za ta namen." #: C/viewer.page:17(p) msgid "A may be displayed in the viewer mode, if desired." msgstr "V načinu pregledovalnika je mogoče prikazati ." #: C/viewer.page:21(title) -#| msgid "View/Hide the thumbnails." msgid "Viewer Mode with Thumbnail Pane" msgstr "Način pregledovanja s pladnjem sličic." @@ -834,7 +816,6 @@ msgstr "@@image: 'figures/palette.png'; md5=32835e7d77efd9833244ca80a4adb48e" #: C/edit-redeye.page:6(title) -#| msgid "Redeye Removal" msgid "Red Eye Removal" msgstr "Odstranitev rdečih oči" @@ -848,7 +829,7 @@ #: C/edit-redeye.page:11(p) msgid "gThumb provides a Red Eye Removal tool. To remove a red eye, position the mouse pointer over the red eye and click on it. gThumb will attempt to remove the red region and replace it with a more natural-looking gray region. If the results do not look correct, press Escape and click on the Undo item." -msgstr "gThumb zagotavlja orodje odstranjevanja rdečih oči. Za odstranitev rdečega očesa postavite miškin kazalec nad rdeče oko in kliknite nanj. gThumb bo poskusil odstraniti rdeče področje in ga zamenjati s sivim področjem bolj naravnega videza. V primeru, da rezultati niso videti pravilno, pritisnite Ubežno tipko in kliknite na predmet Razveljavi." +msgstr "gThumb zagotavlja orodje odstranjevanja rdečih oči. Za odstranitev rdečega očesa postavite miškin kazalec nad rdeče oko in kliknite nanj. gThumb bo poskusil odstraniti rdeče področje in ga zamenjati s sivim področjem bolj naravnega videza. V primeru, da rezultati niso videti pravilno, pritisnite Esc in kliknite na predmet Razveljavi." #: C/edit-redeye.page:18(p) msgid "This tool works best when there is a high color contrast between the red eye and the surrounding facial area. It does not work well for \"orange eye\" sometimes seen in photos of children, or if the surrounding skin has a reddish tinge. This tool could use improvement - if you are fiendishly clever, love matrix algebra and open source software, please submit a patch!" @@ -911,7 +892,6 @@ msgstr "Vrtenje desno" #: C/edit-rotate.page:28(p) -#| msgid "Rotate the image 90 degrees clockwise." msgid "This rotates the image clockwise." msgstr "Zavrti sliko za v smeri urinega kazalca." @@ -920,7 +900,6 @@ msgstr "Vrtenje levo" #: C/edit-rotate.page:32(p) -#| msgid "Rotate the image 90 degrees counter-clockwise." msgid "This rotates the image counter-clockwise." msgstr "Zavrti sliko za v nasprotni smeri urinega kazalca." @@ -937,7 +916,6 @@ msgstr "Za upravljanje barv v slikah je na voljo več orodij." #: C/edit-colors.page:17(gui) -#| msgid "Enhance" msgid "Enhance Colors" msgstr "Izboljšaj barve" @@ -954,7 +932,6 @@ msgstr "To orodje zagotavlja ročne prilagoditve barve. Mogoče je prilagoditi gamo, svetlost, kontrast, nasičenje in ravnotežje sinje/rdeče, škrlatne/zelene in rumene/modre barve." #: C/edit-colors.page:29(gui) -#| msgid "Equalize Histogram" msgid "Equalize" msgstr "Izenači histogram" @@ -991,18 +968,14 @@ msgstr "Spremenjeno sliko je mogoče shraniti s pritiskom na Shrani. Za shranjevanje spremenjene slike na novo mesto in puščanje nespremenjene izvorne slike uporabite Shrani kot." #: C/edit-save-undo-redo.page:20(p) -msgid "If you exit the editing mode (by pressing Escor the View the Folders toolbar button), or navigate away from the current image, you will be prompted to save or discard your changes." -msgstr "V primeru, da končate način urejanje (s pritiskom Ubežne tipke ali gumba orodne vrstice Ogled map) ali krmarite vstran od trenutne slike, boste bili pozvani k shranjevanju svojih sprememb. " +msgid "If you exit the editing mode (by pressing Esc or the View the Folders toolbar button), or navigate away from the current image, you will be prompted to save or discard your changes." +msgstr "V primeru, da končate način urejanja (s pritiskom Esc ali gumba orodne vrstice Ogled map) ali krmarite vstran od trenutne slike, boste bili pozvani k shranjevanju ali zavrzitvi svojih sprememb. " #: C/rename-series.page:8(title) msgid "Renaming Files" msgstr "Preimenovanje datotek" #: C/rename-series.page:10(p) -#| msgid "" -#| "To rename one or more images using a name template, choose " -#| "EditRename." msgid "To rename one or more images using a name template, select the files in the browser and choose EditRename, or press F2." msgstr "Za preimenovanje ene ali več slik z uporabo predloge imen izberite UrediPreimenuj." @@ -1028,9 +1001,6 @@ msgstr "%F" #: C/rename-series.page:52(p) -#| msgid "" -#| "This symbol will be replaced with the image original name, excluding the " -#| "extension." msgid "This symbol will be replaced with the file's original name, excluding the original extension." msgstr "Ta simbol bo bil zamenjan z izvirnim imenom datoteke brez pripone." @@ -1040,8 +1010,6 @@ msgstr "%E" #: C/rename-series.page:63(p) -#| msgid "" -#| "This symbol will be replaced with the image original filename extension." msgid "This symbol will be replaced with the file's original filename extension." msgstr "Ta simbol bo bil zamenjan s pripono izvirnega imena slikovne datoteke." @@ -1086,7 +1054,6 @@ msgstr "Seznam na dnu pogovornega okna prikazuje kako bodo preimenovana imena datotek." #: C/rename-series.page:133(p) -#| msgid "To rename the images click on Rename." msgid "To rename the images click on Rename." msgstr "Za preimenovanje slik kliknite na Preimenuj." @@ -1103,8 +1070,8 @@ msgstr "Ko je bila slika odprta v pregledovalniku gThumb, ima uporabnik možnost omogočenja ali onemogočenja pladnja sličic, ki druge slike v mapi prikazuje kot sličice. Zmožnost je mogoče preklopiti z ukazom PogledPladenj sličic ali s pritiskom na F8." #: C/thumbnail-pane.page:14(p) -msgid "The thumbnail pane may be positioned along the bottom of the main image, or along the side. This is controlled by the settings in EditPreferencesBrowserThumbnails in Viewer." -msgstr "Pladenj sličic je mogoče postaviti na dno ali na stran glavne slike. To je mogoče spremeniti v nastavitvah v UrediMožnostiBrskalnikSličice v pregledovalniku." +msgid "The thumbnail pane may be positioned along the bottom of the main image, or along the side. This is controlled by the settings in EditPreferencesGeneralThumbnails in Viewer." +msgstr "Pladenj sličic je mogoče postaviti na dno ali na stran glavne slike. To je mogoče spremeniti v nastavitvah v UrediMožnostiSplošnoSličice v pregledovalniku." #: C/thumbnail-pane.page:19(title) msgid "Thumbnail Pane, Along Bottom of Main Image" @@ -1151,12 +1118,11 @@ msgstr "TODO:tukaj je treba napisati dodatno dokumentacijo." #: C/batch-change-date.page:6(title) -#| msgid "To Change Images Date" msgid "Changing Dates" msgstr "Spreminjanje datumov" #: C/batch-change-date.page:8(p) -msgid "To change the the file modification times, the comment dates, or the Exif DateTimeOriginal tags of multiple files, select the files in the browser view. Then click the Tools button on the main toolbar, and select ToolsChange Date." +msgid "To change the file modification times, the comment dates, or the Exif DateTimeOriginal tags of multiple files, select the files in the browser view. Then click the Tools button on the main toolbar, and select ToolsChange Date." msgstr "Za spremembo časov sprememb datotek, datumov opomb ali oznake Exif DatumČasIzvora več datotek, izberite datoteke v pogledu brskalnika. Nato kliknite na gumb Orodja v glavni orodni vrstici iz izberite OrodjaSpremeni datum." #: C/batch-change-date.page:13(p) @@ -1164,7 +1130,6 @@ msgstr "Izberite želene možnosti datuma in kliknite Izvedi za dokončanje opravila." #: C/batch-resize.page:6(title) -#| msgid "Opening Images" msgid "Resizing Images" msgstr "Spreminjanje velikosti slik" @@ -1177,15 +1142,10 @@ msgstr "Izberite želene največje mere izhoda ali želeno velikost v odstotkih in ciljno mapo. Kliknite Izvedi za dokončanje opravila." #: C/batch-convert-format.page:6(title) -#| msgid "To Convert the Image Format" msgid "Converting File Formats" msgstr "Pretvarjanje vrste slik" #: C/batch-convert-format.page:8(p) -#| msgid "" -#| "To convert the image format, select the images you want to convert and " -#| "choose ToolsConvert Format." msgid "To convert one or more images into a new file format, select the images in the browser view. Then click the Tools button on the main toolbar, and select ToolsConvert Format." msgstr "Za pretvorbo ene ali več slik v drugo vrsto izberite slike, ki jih želite pretvoriti in izberite gumb Orodja in izberite OrodjaPretvori vrsto datoteke." @@ -1212,13 +1172,10 @@ msgstr "@@image: 'figures/main-win.png'; md5=93cf84bd05a153ab61951ae12bbe3f26" #: C/browser.page:6(title) -#| msgid "Browsing Folders" msgid "Browsing Your Files" msgstr "Brskanje po vaših datotekah " #: C/browser.page:8(p) -#| msgid "" -#| "You can start gThumb in the following ways:" msgid "When you start gThumb the following window is displayed:" msgstr "Ob zagonu gThumb je prikazano naslednje okno:" @@ -1235,9 +1192,6 @@ msgstr "Menijska vrstica" #: C/browser.page:21(p) -#| msgid "" -#| "The menus on the menubar contain all of the commands that you can use in " -#| "gThumb" msgid "The menus on the menubar contain all of the commands that you can use in gThumb" msgstr "Meniji v menijski vrstici vsebujejo vse ukaze, ki jih lahko uporabite v gThumb-u" @@ -1286,7 +1240,6 @@ msgstr "Vrstica stanja" #: C/browser.page:58(p) -#| msgid "On the statusbar you can read: " msgid "On the statusbar you can read:" msgstr "V vrstici stanja lahko preberete:" @@ -1319,25 +1272,14 @@ msgstr "Orodje za filtriranje slik je tik pod pogledom brskalnika. Mogoče ga je uporabiti za filtriranje prikazanih slik. Pogled brskalnika je mogoče omejiti na datoteke določene velikosti, datuma, vzorca imena ali drugih značilnosti." #: C/introduction.page:6(title) -#| msgid "gThumb" msgid "About gThumb" msgstr "O gThumb" #: C/introduction.page:8(p) -#| msgid "" -#| "gThumb is an image viewer and browser written " -#| "for the GNOME environment. It lets you browse your hard disk, showing you " -#| "thumbnails of image files and view single images of many different " -#| "formats." msgid "gThumb is an image viewer and browser written for the GNOME environment. It lets you browse your hard disk, showing you thumbnails of image files and view single images of many different formats." msgstr "gThumb je pregledovalnik in brskalnik slik napisan za okolje GNOME. Omogoča vam brskanje po vašem trdem disku, prikaz sličic datotek slik in ogled posameznih slik veliko različnih vrst." #: C/introduction.page:13(p) -#| msgid "" -#| "gThumb supports the most common graphics formats, including JPEG, GIF, " -#| "TIF, and PNG. gThumb will also display other less common image types if " -#| "the supporting libraries are installed, including TGA, ICO, BMP, XPM, and " -#| "others." msgid "gThumb supports the most common graphics formats, including JPEG, GIF, TIF, and PNG. gThumb will also display other less common image types if the supporting libraries are installed, including TGA, ICO, BMP, XPM, and others." msgstr "gThumb podpira najbolj pogoste vrste grafičnih datotek vključno z JPEG, GIF, TIF in PNG. gThumb bo prikazal tudi druge manj pogoste vrste slik, če so nameščene podporne knjižnice, vključno z TGA, ICO, BMP, XPM in drugimi." @@ -1346,41 +1288,22 @@ msgstr "Vključene je nekaj podpore za vrste slik RAW, posebno če je na vašem sistemu nameščen program dcraw." #: C/introduction.page:21(p) -#| msgid "" -#| "gThumb not only lets you view image files but " -#| "has many other features such as adding comments to images, organizing " -#| "images into catalogs, printing images, slideshows, setting your desktop " -#| "background, and more." msgid "gThumb not only lets you view image files but has many other features such as adding comments to images, organizing images into catalogs, printing images, slideshows, setting your desktop background, and more." -msgstr "gThumb vam omogoča ne le ogled datotek slik, amapk tudi druge zmožnosti kot je dodajanje opomb slikam, organizacijo slik v kataloge, tiskanje slik, diapredstavitve, nastavitev ozadja vašega namizja in več." +msgstr "gThumb vam omogoča ne le ogled datotek slik, amapk tudi druge zmožnosti kot je dodajanje opomb slikam, organizacijo slik v kataloge, tiskanje slik, predstavitve, nastavitev ozadja vašega namizja in več." #: C/introduction.page:26(p) -#| msgid "" -#| "gThumb includes a tool to import photos from " -#| "attached cameras and memory card readers." msgid "gThumb includes a tool to import photos from attached cameras and memory card readers." msgstr "gThumb vključuje orodje za uvoz fotografij iz priklopljenih fotoaparatov in bralnikov spominskih kartic." #: C/introduction.page:29(p) -#| msgid "" -#| "gThumb can read EXIF, XMP, and IPTC metadata " -#| "that is commonly embedded in files." msgid "gThumb can read EXIF, XMP, and IPTC metadata that is commonly embedded in files." msgstr "gThumb lahko bere metapodatke EXIF, XMP in IPTC, ki so pogosto vstavljeni v datoteke." #: C/introduction.page:32(p) -#| msgid "" -#| "gThumb provides a systems of extensions (or " -#| "plug-ins), to allow users to extend the functionality of " -#| "gThumb." msgid "gThumb provides a systems of extensions (or plug-ins), to allow users to extend the functionality of gThumb." msgstr "gThumb zagotavlja sisteme razširitev (ali vstavkov), ki uporabnikom omogoča razširitev zmožnosti gThumb-a." #: C/introduction.page:34(p) -#| msgid "" -#| "More information about these extensions, and about gThumb generally, is " -#| "available at http://live." -#| "gnome.org/gthumb." msgid "More information about these extensions, and about gThumb generally, is available at http://live.gnome.org/gthumb." msgstr "Več podrobnosti o teh razširitvah in o gThumb-u na splošno je na voljo na http://live.gnome.org/gthumb." @@ -1864,15 +1787,14 @@ msgstr "mjc@avtechpulse.com" #: C/index.page:20(title) -msgid "gThumbHelp" -msgstr "gThumbPomoč" +msgid "gThumb Help" +msgstr "Pomoč gThumb" #: C/index.page:23(title) msgid "Welcome" msgstr "Dobrodošli" #: C/index.page:27(title) -#| msgid "To View an Image Comment" msgid "File Management" msgstr "Upravljanje datotek" @@ -1885,7 +1807,6 @@ msgstr " Za izboljšanje posameznih fotografij so na voljo številna orodja za urejanje. Do trenutka shranjevanja fotografije sta na voljo možnosti uveljavi in razveljavi. Za dostop do orodij urejanja odprite sliko in nato kliknite na gumb orodne vrstice Uredi datoteko (ikona palete) ali pritisnite e." #: C/index.page:42(title) -#| msgid "Advanced Tools" msgid "Batch Tools" msgstr "Paketna orodja" @@ -1894,7 +1815,6 @@ msgstr "Paketna orodja omogočajo spremembo več slik hkrati. Spremembe so zapisane nemudoma in jih ni mogoče razveljaviti." #: C/index.page:49(title) -#| msgid "Slide Shows" msgid "Slideshows" msgstr "Diapredstavitve" @@ -1907,17 +1827,14 @@ msgstr "Souporaba" #: C/index.page:61(title) -#| msgid "Organize Button" msgid "Organizing" msgstr "Organizacija" #: C/index.page:65(title) -#| msgid "Other" msgid "Other Tools" msgstr "Druga orodja" #: C/index.page:69(title) -#| msgid "Preferences" msgid "Reference" msgstr "Referenca" @@ -1928,20 +1845,28 @@ #~ msgid "gThumb Manual V2.11.2" #~ msgstr "gThumb priročnik različica .11.2" + #~ msgid "2001" #~ msgstr "2001" + #~ msgid "2002" #~ msgstr "2002" + #~ msgid "2003" #~ msgstr "2003" + #~ msgid "2004" #~ msgstr "2004" + #~ msgid "2006" #~ msgstr "2006" + #~ msgid "2010" #~ msgstr "2010" + #~ msgid "GNOME Documentation Project" #~ msgstr "Projekt dokumentacije GNOME" + #~ msgid "" #~ "Permission is granted to copy, distribute and/or modify this document " #~ "under the terms of the GNU Free Documentation License (GFDL), Version 1.1 " @@ -1956,6 +1881,7 @@ #~ "Foundation brez stalnih odsekov, besedila naslovnice in zadnje strani. " #~ "Kopijo GFDL lahko najdete na tej povezavi ali v COPYING-DOCS distribuiranim s tem priročnikom." + #~ msgid "" #~ "This manual is part of a collection of GNOME manuals distributed under " #~ "the GFDL. If you want to distribute this manual separately from the " @@ -1966,6 +1892,7 @@ #~ "primeru da želite ta priročnik distribuirati ločeno od zbirke, lahko to " #~ "storite z dodajanjem kopije licence priročnika, kot je opisano v odseku 6 " #~ "licence." + #~ msgid "" #~ "Many of the names used by companies to distinguish their products and " #~ "services are claimed as trademarks. Where those names appear in any GNOME " @@ -1978,94 +1905,127 @@ #~ "pojavijo v katerikoli dokumentaciji GNOME in člani dokumentacijskega " #~ "projekta GNOME vedo za njih, so imena v velikih črkah ali pa se začnejo z " #~ "velikimi črkami." + #~ msgid "" #~ "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE " #~ "TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER " #~ "UNDERSTANDING THAT: " #~ msgstr "" #~ "DOKUMENT IN SPREMENJENE RAZLIČICE DOKUMENTA SO ZAGOTOVLJENE POD POGOJI " -#~ "GNU FREE DOCUMENTATION LICENSE Z NADALJNJIM RAZUMEVANJEM DA: " +#~ "GNU FREE DOCUMENTATION LICENSE Z NADALJNJIM RAZUMEVANJEM DA: " +#~ "" + #~ msgid "Paolo" #~ msgstr "Paolo" + #~ msgid "Bacchilega" #~ msgstr "Bacchilega" + #~ msgid "paolo.bacchilega@libero.it" #~ msgstr "paolo.bacchilega@libero.it" + #~ msgid "Alexander" #~ msgstr "Alexander" + #~ msgid "Kirillov" #~ msgstr "Kirillov" + #~ msgid "kirillov@math.sunysb.edu" #~ msgstr "kirillov@math.sunysb.edu" + #~ msgid "2.11.2" #~ msgstr "2.11.2" + #~ msgid "February 2010" #~ msgstr "Februar 2010" + #~ msgid "This is manual describes version 2.11.2 of gThumb" #~ msgstr "Ta priročnik opisuje gThumb različico 2.11.2" + #~ msgid "" #~ "gThumb is an image viewer and browser for the " #~ "GNOME environment" #~ msgstr "" #~ "gThumb je pregledovalnik in brskalnik slik za " #~ "okolje GNOME" + #~ msgid "image viewer" #~ msgstr "pregledovalnik slik" + #~ msgid "viewer" #~ msgstr "pregledovalnik" + #~ msgid "Introduction" #~ msgstr "Uvod" + #~ msgid "Getting Started" #~ msgstr "Prvi koraki" + #~ msgid "" #~ "This section provides information on how to start gThumb, and describes the main window interface." #~ msgstr "" #~ "Ta odsek vsebuje podatke o zagonu gThumb-a in " #~ "opisuje vmesnik glavnega okna." + #~ msgid "To Start gThumb" #~ msgstr "Za zagon gThumb" + #~ msgid "Applications menu" #~ msgstr "meni Programi" + #~ msgid "" #~ "Choose GraphicsgThumb." #~ msgstr "" #~ "Izberite GrafikagThumb." + #~ msgid "Command line" #~ msgstr "Ukazna vrstica" + #~ msgid "Type gthumb, then press Return." #~ msgstr "" #~ "Vtipkajte gthumb in pritisnite Vnosno tipko." + #~ msgid "" #~ "If you start gThumb from the command line you " #~ "can specify the following options:" #~ msgstr "" #~ "V primeru, da gThumb zaženete iz ukazne " #~ "vrstice lahko navedete naslednje možnosti:" + #~ msgid "Command" #~ msgstr "Ukaz" + #~ msgid "Explanation" #~ msgstr "Pojasnilo" + #~ msgid "folder" #~ msgstr "mapa" + #~ msgid "gthumb " #~ msgstr "gthumb " + #~ msgid "Start gThumb in the specified folder" #~ msgstr "Zagon gThumb-a v določeni mapi" + #~ msgid "name.jpg" #~ msgstr "ime.jpg" + #~ msgid "View the image name.jpg." #~ msgstr "Ogled slike ime.jpg." + #~ msgid "*.jpg" #~ msgstr "*.jpg" + #~ msgid "View all the images with a .jpg extension." #~ msgstr "Ogled vseh slik s pripono .jpg." + #~ msgid "When You Start gThumb" #~ msgstr "Ko začnete gThumb" + #~ msgid "" #~ "When you start gThumb the following window is " #~ "displayed: The gThumbgThumb je prikazano naslednje okno: " #~ " Okno gThumb vsebuje naslednje sestavne dele: " + #~ msgid "" #~ "Browser options can be found in the of the Preferences dialog." #~ msgstr "" #~ "Možnosti brskalnika je mogoče najti v ali pogovornemu oknu Možnosti." + #~ msgid "" #~ "Keyboard shortcuts to browse folders are described in ." #~ msgstr "" #~ "Tipkovne bližnjice za brskanje map so opisane v ." + #~ msgid "To Change Folders" #~ msgstr "Za spremembo map" + #~ msgid "" #~ "The folder tree is the main method of navigating the filesystem. Single-" #~ "clicking on a folder will load its images in the browser view. Double-" @@ -2098,6 +2062,7 @@ #~ "Drevo map je glaven način krmarjenja po datotečnemu sistemu. Klik na mapo " #~ "bo naložil vsebujoče slike v pogledu brskalnika. Dvoklik na mapo ali klik " #~ "na razširitveno puščico bo v drevesu naštel tudi podmape. " + #~ msgid "" #~ "The drop-down box above the folder-tree provides quick access to the " #~ "folders above the current folder, up to the root folder. It also provides " @@ -2110,6 +2075,7 @@ #~ "ključnih mest, vključno z domačo mapo, korensko mapo datotečnega sistema " #~ "in katerimikoli priklopljenimi odstranljivimi napravami (kot so spominske " #~ "kartice in fotoaparati)." + #~ msgid "" #~ "Other navigation commands are located in the Go menu. This menu also provides a history of recent " @@ -2117,8 +2083,10 @@ #~ msgstr "" #~ "Drugi ukazi krmarjenja so v meniju Pojdi. Ta meni vsebuje tudi zgodovino nedavnih map. " + #~ msgid "To Sort Images" #~ msgstr "Za razvrstitev slik" + #~ msgid "" #~ "To sort images in a different order use the ViewSort By menu item." @@ -2126,12 +2094,14 @@ #~ "Za razvrstitev slik v drugemu vrstnemu redu uporabite predmet menija " #~ "PogledRazvrsti po." + #~ msgid "" #~ "To reload the current folder or catalog, use CtrlR." #~ msgstr "" #~ "Za ponovno nalaganje trenutne mape ali kataloga uporabite CtrlR." + #~ msgid "" #~ "To disable or re-enable the thumbnails in the browser view, use CtrlT." @@ -2139,12 +2109,16 @@ #~ "Za onemogočenje ali ponovno omogočitev sličic v pogledu brskalnika " #~ "uporabite CtrlT." + #~ msgid "To Add a Folder to the Bookmarks" #~ msgstr "Za dodajanje mape med zaznamke" + #~ msgid "Working with Folders" #~ msgstr "Delo z mapami" + #~ msgid "WARNING" #~ msgstr "OPOZORILO" + #~ msgid "" #~ "It's highly suggested to move and copy image folders with " #~ "gThumb. This is because if you move or copy " @@ -2157,6 +2131,7 @@ #~ "map z gThumb opombe slik ostanejo pripete k " #~ "slikam. V primeru premika ali kopiranja map z upravljalnikom datotek ali " #~ "drugimi programi boste izgubili svoje opombe." + #~ msgid "" #~ "gThumb allows you to manipulate folders using " #~ "the folder tree. See to learn " @@ -2165,55 +2140,73 @@ #~ "gThumb vam omogoča upravljanje z mapami z " #~ "uporabo drevesa map. Oglejte si " #~ "za podatke o osnovni uporabi drevesa map. " + #~ msgid "To Create a Folder" #~ msgstr "Za ustvarjanje mape" + #~ msgid "Using the folder tree, navigate to the parent folder." #~ msgstr "Z uporabo drevesa map krmarite do nadrejene mape." + #~ msgid "Right-click the parent folder in the folder tree." #~ msgstr "Desno kliknite nadrejeno mapo v drevesu map." + #~ msgid "" #~ "Select Create Folder from the pop-up menu." #~ msgstr "V pojavnem meniju izberite Ustvari mapo." + #~ msgid "Enter the new folder name." #~ msgstr "Vnesite ime nove mape." + #~ msgid "" #~ "Click on Create. gThumb " #~ "creates a new folder." #~ msgstr "" #~ "Kliknite na Ustvari. gThumb ustvari novo mapo." + #~ msgid "" #~ "To create a new folder, perform the following steps: " #~ msgstr "" #~ "Za ustvarjanje nove mape izvedite naslednje korake: " + #~ msgid "To Open a Folder" #~ msgstr "Za odpiranje mape" + #~ msgid "Using the folder tree, navigate to the folder." #~ msgstr "Z uporabo drevesa map krmarite do mape." + #~ msgid "Right-click the folder in the folder tree." #~ msgstr "Desno kliknite mapo v drevesu map." + #~ msgid "" #~ "Select Open with the File Manager from the pop-" #~ "up menu." #~ msgstr "" #~ "V pojavnem meniju izberite Odpri z upravljalnikom datotek." + #~ msgid "" #~ "To open a folder with the file manager, perform the following steps: " #~ "" #~ msgstr "" #~ "Za odpiranje mape z upravljalnikom datotek izvedite naslednje korake: " #~ "" + #~ msgid "To Rename a Folder" #~ msgstr "Za preimenovanje mape" + #~ msgid "Select Rename from the pop-up menu." #~ msgstr "V pojavnem meniju izberite Preimenuj." + #~ msgid "Enter the new folder name in area provided in the folder tree." #~ msgstr "Vnesite novo ime mape v področje v drevesu map." + #~ msgid "To rename a folder, perform the following steps: " #~ msgstr "Za preimenovanje mape izvedite naslednje korake: " + #~ msgid "To Delete a Folder" #~ msgstr "Za izbris mape" + #~ msgid "" #~ "Select either Move to Trash or " #~ "Delete from the pop-up menu. Files can be " @@ -2225,69 +2218,88 @@ #~ "ali Izbriši. Datoteke lahko obnovite iz smeti, " #~ "če uporabite Premakni v smeti. Datotek ni " #~ "mogoče obnoviti, če uporabite Izbriši." + #~ msgid "To delete a folder, perform the following steps: " #~ msgstr "Za izbris mape izvedite naslednje korake: " + #~ msgid "To Copy a Folder" #~ msgstr "Za kopiranje mape" + #~ msgid "Using the folder tree, navigate to the folder you wish to copy." #~ msgstr "Z uporabo drevesa map krmarite do mape, ki jo želite kopirati." + #~ msgid "Select Copy from the pop-up menu." #~ msgstr "V pojavnem meniju izberite Kopiraj." + #~ msgid "Using the folder tree, navigate to the destination parent folder." #~ msgstr "Z uporabo drevesa map krmarite v ciljno nadrejeno mapo." + #~ msgid "Right-click the destination parent folder in the folder tree." #~ msgstr "Desno kliknite v ciljno nadrejeno mapo v drevesu map." + #~ msgid "" #~ "Select Paste into Folder from the pop-up menu." #~ msgstr "" #~ "V pojavnem meniju izberite Prilepi v mapo." + #~ msgid "" #~ "To copy a folder to a different location, perform the following steps: " #~ "" #~ msgstr "" -#~ "Za kopiranje mape na drugo mesto izvedite naslednje korake: " +#~ "Za kopiranje mape na drugo mesto izvedite naslednje korake: " +#~ "" + #~ msgid "To Move a Folder" #~ msgstr "Za premik mape" + #~ msgid "Select Cut from the pop-up menu." #~ msgstr "V pojavnem meniju izberite Izreži." + #~ msgid "" #~ "To move a folder to a different location, perform the following steps: " #~ "" #~ msgstr "" #~ "Za premik mape na drugo mesto izvedite naslednje korake: " + #~ msgid "" #~ "Keyboard shortcuts to view images are described in ." #~ msgstr "" #~ "Tipkovne bližnjice za ogled slik so opisane v ." + #~ msgid "To Open an Image" #~ msgstr "Za odpiranje slike" + #~ msgid "" #~ "The browser view shows the images in the current folder or catalog (see " #~ ")." #~ msgstr "" #~ "Pogled brskalnika pokaže slike v trenutni mapi ali katalogu (oglejte si " #~ "see )." + #~ msgid "" #~ "Single-clicking an image will enable the Information Sidebar for that " #~ "image." #~ msgstr "Klik na sliko bo omogočil stransko vrstico podrobnosti za to sliko." + #~ msgid "" #~ "Double-clicking an image (or pressing Return) will open " #~ "it in the viewer mode." #~ msgstr "" #~ "Dvoklik na sliko (ali pritisk Vnosne tipke) jo bo odprl " #~ "v načinu pregledovalnika." + #~ msgid "" #~ "Double-clicking with the middle mouse button (or pressing f) will load the image in fullscreen viewer mode." #~ msgstr "" #~ "Dvoklik s srednjim miškinim gumbom (ali pritisk na f) bo " #~ "naložil sliko v načinu celozaslonskega pregledovalnika. " + #~ msgid "Opening a Different Image" #~ msgstr "Odpiranje druge slike" + #~ msgid "" #~ "Once in image has been opened in viewer mode, the image is displayed in " #~ "the main body of the window. A thumbnail pane may be optionally displayed " @@ -2298,29 +2310,36 @@ #~ "telesu okna. Pladenj sličic je mogoče izbirno prikazati poleg dna okna " #~ "(PogledPladenj sličic)." + #~ msgid "" #~ "You can go also click on thumbnails in the thumbnail pane to open a " #~ "different image." #~ msgstr "" #~ "Za odpiranje druge slike lahko tudi kliknete na sličice v pladnju sličic." + #~ msgid "Working with Images" #~ msgstr "Delo s slikami" + #~ msgid "To Modify an Image" #~ msgstr "Za spremembo slike" + #~ msgid "" #~ "The current image can be modified in many ways. The commands used to " #~ "modify an image are located in the Image menu." #~ msgstr "" #~ "Trenutno sliko je mogoče spremeniti na veliko načinov. Ukazi za spremembo " #~ "slike so v meniju Slika." + #~ msgid "Enhance the image adjusting the color levels." #~ msgstr "Izboljša sliko s prilagoditvijo barvnih ravni." + #~ msgid "Change the image size performing a zoom in or out." #~ msgstr "Spremeni velikost slike s približevanjem ali oddaljevanjem." + #~ msgid "Transform" #~ msgstr "Preoblikovanje" + #~ msgid "" #~ "Create a mirror image by reflecting the image scanlines in the vertical " #~ "direction." #~ msgstr "Ustvari zrcalno sliko z odbojem vrstic točk slike v navpični smeri." - diff -Nru gthumb-2.14.3/help/sl/sorting.page gthumb-3.0.0/help/sl/sorting.page --- gthumb-2.14.3/help/sl/sorting.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/sorting.page 2012-04-23 19:15:28.000000000 +0000 @@ -6,9 +6,6 @@ Razvrščanje datotek -

Use the ViewSort By menu to - select the desired file-sorting method for the browser view. - Files can be sorted on the basis of their name, the file size, - the file modification date, or the date the photo was taken.

+

Za izbiro želenega načina razvrščanja datotek v pogledu brskalnika uporabite meni PogledRazvrsti po. Datoteke je mogoče razvrstiti po njihovemu imenu, velikosti datotek, datumu spremembe datotek ali dneva zajema fotografije.

diff -Nru gthumb-2.14.3/help/sl/thumbnail-pane.page gthumb-3.0.0/help/sl/thumbnail-pane.page --- gthumb-2.14.3/help/sl/thumbnail-pane.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/thumbnail-pane.page 2012-04-23 19:15:28.000000000 +0000 @@ -7,9 +7,7 @@

Ko je bila slika odprta v pregledovalniku gThumb, ima uporabnik možnost omogočenja ali onemogočenja pladnja sličic, ki druge slike v mapi prikazuje kot sličice. Zmožnost je mogoče preklopiti z ukazom PogledPladenj sličic ali s pritiskom na F8.

-

The thumbnail pane may be positioned along the bottom of the - main image, or along the side. This is controlled by the settings - in EditPreferencesGeneralThumbnails in Viewer.

+

Pladenj sličic je mogoče postaviti na dno ali na stran glavne slike. To je mogoče spremeniti v nastavitvah v UrediMožnostiSplošnoSličice v pregledovalniku.

Pladenj sličic, na dnu glavne slike diff -Nru gthumb-2.14.3/help/sl/viewer.page gthumb-3.0.0/help/sl/viewer.page --- gthumb-2.14.3/help/sl/viewer.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/viewer.page 2012-04-23 19:15:28.000000000 +0000 @@ -7,7 +7,7 @@

Pogled brskalnika pokaže slike v trenutni mapi ali katalogu (oglejte si ). Dvoklik na sliko (ali pritisk na Vnosno tipko) jo bo odprl v načinu pregledovalnika.

-

Pritisk na Ubežno tipko bo končal način pregledovalnika in vrnil uporabnika v način brskalnika. Gumb orodne vrstice (Ogled map) je na voljo za ta namen.

+

Pritisk na Esc bo končal način pregledovalnika in vrnil uporabnika v način brskalnika. Gumb orodne vrstice (Ogled map) je na voljo za ta namen.

V načinu pregledovalnika je mogoče prikazati .

diff -Nru gthumb-2.14.3/help/sl/wallpaper.page gthumb-3.0.0/help/sl/wallpaper.page --- gthumb-2.14.3/help/sl/wallpaper.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sl/wallpaper.page 2012-04-23 19:15:28.000000000 +0000 @@ -3,6 +3,6 @@ - Tapeta namizja -

Za nastavitev slike kot tapete namizja sistema, desno kliknite na slik o in v pojavnem meniju izberite Nastavi kot ozadje namizja. Ozadje namizja se bo spremenilo in pojavilo se bo pogovorno okno Možnosti videza Gnome. To pogovorno okno lahko uporabite za prilagoditve nastavitev ozadja (položaj, raztezanje, razpostavljanje, itd. ).

+ Slika ozadja namizja +

Za nastavitev slike kot ozadja namizja sistema, desno kliknite na sliko in v pojavnem meniju izberite Nastavi kot ozadje namizja. Ozadje namizja se bo spremenilo in pojavilo se bo pogovorno okno Možnosti videza Gnome. To pogovorno okno lahko uporabite za prilagoditve nastavitev ozadja (položaj, raztezanje, razpostavljanje, itd. ).

diff -Nru gthumb-2.14.3/help/sv/import.page gthumb-3.0.0/help/sv/import.page --- gthumb-2.14.3/help/sv/import.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sv/import.page 2012-04-23 19:15:29.000000000 +0000 @@ -34,7 +34,7 @@

An event name may also be optionally associated with the photos. This event name can be used to generate an automatic subfolder name (possibly incorporating a date) as described below. For example, - if the base destinator folder is "/photos", and you enter + if the base destination folder is "/photos", and you enter "Wedding-Jennifer" in the Event field, you can configure generation of automatic subfolders like "/photos/2010-07-31, Wedding-Jennifer".

diff -Nru gthumb-2.14.3/help/sv/index.page gthumb-3.0.0/help/sv/index.page --- gthumb-2.14.3/help/sv/index.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/sv/index.page 2012-04-23 19:15:28.000000000 +0000 @@ -17,7 +17,7 @@ - <app>gThumb</app>Help + gThumb Help
Welcome diff -Nru gthumb-2.14.3/help/zh_CN/import.page gthumb-3.0.0/help/zh_CN/import.page --- gthumb-2.14.3/help/zh_CN/import.page 2012-03-25 19:24:49.000000000 +0000 +++ gthumb-3.0.0/help/zh_CN/import.page 2012-04-23 19:15:29.000000000 +0000 @@ -34,7 +34,7 @@

An event name may also be optionally associated with the photos. This event name can be used to generate an automatic subfolder name (possibly incorporating a date) as described below. For example, - if the base destinator folder is "/photos", and you enter + if the base destination folder is "/photos", and you enter "Wedding-Jennifer" in the Event field, you can configure generation of automatic subfolders like "/photos/2010-07-31, Wedding-Jennifer".

diff -Nru gthumb-2.14.3/help/zh_CN/index.page gthumb-3.0.0/help/zh_CN/index.page --- gthumb-2.14.3/help/zh_CN/index.page 2012-03-25 19:24:48.000000000 +0000 +++ gthumb-3.0.0/help/zh_CN/index.page 2012-04-23 19:15:29.000000000 +0000 @@ -17,7 +17,7 @@ - <app>gThumb</app>Help + gThumb Help
Welcome diff -Nru gthumb-2.14.3/m4/gthumb.m4 gthumb-3.0.0/m4/gthumb.m4 --- gthumb-2.14.3/m4/gthumb.m4 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/m4/gthumb.m4 2012-04-21 09:02:11.000000000 +0000 @@ -78,7 +78,7 @@ GTHUMB_EXTENSION_RULE='%.extension: %.extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' AC_SUBST(GTHUMB_EXTENSION_RULE) -GTHUMB_EXTENSION_IN_RULE='%.extension.in: %.extension.in.in $(extension_LTLIBRARIES) ; sed -e "s|%LIBRARY%|`. ./$(extension_LTLIBRARIES) && echo $$dlname`|" -e "s|%VERSION%|$(VERSION)|" $< > [$]@' +GTHUMB_EXTENSION_IN_RULE='%.extension.in: %.extension.in.in $(extension_LTLIBRARIES) ; sed -e "s|%LIBRARY%|`. ./$(extension_LTLIBRARIES) && echo $$dlname`|" -e "s|%VERSION%|$(VERSION)|" -e "s|%GTHUMB_API_VERSION%|$(GTHUMB_API_VERSION)|" $< > [$]@' AC_SUBST(GTHUMB_EXTENSION_IN_RULE) ]) \ No newline at end of file diff -Nru gthumb-2.14.3/m4/Makefile.in gthumb-3.0.0/m4/Makefile.in --- gthumb-2.14.3/m4/Makefile.in 2012-03-25 18:34:16.000000000 +0000 +++ gthumb-3.0.0/m4/Makefile.in 2012-04-23 18:09:52.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -56,6 +73,11 @@ am__v_at_0 = @ 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 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,10 +152,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -141,6 +161,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -180,6 +201,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -228,8 +251,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -260,6 +281,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -334,8 +356,11 @@ -rm -rf .libs _libs install-m4dataDATA: $(m4data_DATA) @$(NORMAL_INSTALL) - test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)" @list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(m4datadir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(m4datadir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ diff -Nru gthumb-2.14.3/Makefile.am gthumb-3.0.0/Makefile.am --- gthumb-2.14.3/Makefile.am 2011-10-17 08:50:17.000000000 +0000 +++ gthumb-3.0.0/Makefile.am 2012-04-14 18:15:50.000000000 +0000 @@ -47,7 +47,7 @@ $(srcdir)/ChangeLog \ `find "$(srcdir)" -type f -name Makefile.in -print` -GITIGNOREFILES = build .autotools .cdt* .cproject .project .settings/ +GITIGNOREFILES = build .autotools .cdt* .cproject .project .settings/ *.patch DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper diff -Nru gthumb-2.14.3/Makefile.in gthumb-3.0.0/Makefile.in --- gthumb-2.14.3/Makefile.in 2012-03-25 18:34:16.000000000 +0000 +++ gthumb-3.0.0/Makefile.in 2012-04-23 18:09:52.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,6 +15,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -68,6 +85,11 @@ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -160,10 +182,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -171,6 +191,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -210,6 +231,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -258,8 +281,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -290,6 +311,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -366,7 +388,7 @@ $(srcdir)/ChangeLog \ `find "$(srcdir)" -type f -name Makefile.in -print` -GITIGNOREFILES = build .autotools .cdt* .cproject .project .settings/ +GITIGNOREFILES = build .autotools .cdt* .cproject .project .settings/ *.patch CLEANFILES = ChangeLog # Build ChangeLog from GIT history @@ -603,13 +625,10 @@ done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ diff -Nru gthumb-2.14.3/NEWS gthumb-3.0.0/NEWS --- gthumb-2.14.3/NEWS 2012-03-25 10:05:58.000000000 +0000 +++ gthumb-3.0.0/NEWS 2012-04-23 19:06:03.000000000 +0000 @@ -1,78 +1,136 @@ -version 2.14.3 --------------- +version 3.0.0 +------------- Bugs fixed: - * Do not show duplicate entries in the sidebar and bookmarks menu. - (#669367) - * Fixed filtering by embedded title and description. - * Fixed crash when opening the comment dialog. - * Fixed many memory leaks. - * Fixed file renaming in viewer mode. (#670392) - * Fixed some compiler warnings. (#668947) + * Metadata category names WON'T show translated strings (Jiro + Matsuzawa) (#674033) + * Selections: fixed keyboard shortcuts for some keyboard layouts. (#673872) + * Fixed compilation without libjpeg. + * Ignore extensions with a different API version. + * Fixed file navigation with the mouse wheel with Gtk+ 3.4.0 or greater. + * Fixed possible crash when changing location. New or updated application translations: - * Swedish (Daniel Nylander) + * Czech (Marek Černocký) + * Japanese (OKANO Takayoshi) + * Norwegian/Bokmaal (Kjartan Maraas) -version 2.14.2 +version 2.90.3 -------------- + New features and user visible changes: + + * Selections: fixed reordering of files; added command Alt+Shift+n to remove + files from selection n; added a command to open the original folder; show + an emblem when a file is added to a selection. + Bugs fixed: - * Fixed memory leak in 'Adjust Colors'. (#667931) - * Fixed renaming of folders and catalogs. - * Fixed names of the gconf keys for the 'change date' tool. - * Fixed possible crash on startup. + * Require exiv2 version 0.21. since the code uses Exiv2::LogMsg (#673711) + * Removed potentially dangerous strncpy (#672866) + * Fixed possible crash when changing directory quickly. + * Fixed possible crash after closing the context menu in the folder tree. + * Fixed run-time warning when uninhibiting the screensaver. New or updated application translations: - * German (Christian Kirbach) + * Czech (Marek Černocký) + * Español (Daniel Mustieles) + * Lietuvių (Aurimas Černius) + * Polish (Piotr Drąg) + * Slovenian (Matej Urbančič) + + New or updated manual translations: -version 2.14.1 + * Slovenian Translation (Andrej Žnidaršič) + +version 2.90.2 -------------- + New features and user visible changes: + + * Added a Location dialog to enter the path to display. + * Copy/Move dialog: save the list of the last 10 choosed folders. + * Added a tool to import the embedded metadata in the gThumb comment + system. + * Map view: added a scale on the map. + Bugs fixed: - * Fixed infinite reloading of some images when selected in the file - list. - * Fixed export to Photobucket. - * Fixed crash when no file properties view is registered. - * Fixed crash when closing the media viewer very quickly. - * Fixed some memory leaks. + * Thumbnail pane stays empty until directory change. (#672184) + * Always compile the cairo png loader. (#671940) + * Fixed compilation when libtiff is not available. (#671892) + * Fixed error when compiling with gtk+ 3.3.18. (#671451) + * Show "Moving" instead of "Copying" when moving a file. + * Fixed some performance issues when updating thumbnails. + * Fixed many memory leaks. New or updated application translations: - * Czech (Marek Černocký) - * Español; Castellano (Jorge González) - * Japanese (Takeshi AIHANA) - * Polish (Piotr Drąg) - -version 2.14.0 ---------------- + * Slovenian Translation (Matej Urbančič) - Bugs fixed: +version 2.90.1 +-------------- - * Resize images: when resinging a single image update the second dimension - if the ratio is fixed. (#662397) - * Faster image loading if the file is not local (#655471) - * File selection not updated in status bar when using thumbnail side - panel (#660430) + New features and user visible changes: + * Added 'selections' as a more powerful way to select files. Selections are + similar to catalogs but their content is lost after closing the application. + Use Alt-n to add files to selection n, and Control-n to view selection n, + for n in the 1..3 interval. + * High quality zoom for SVG images. Requires librsvg. + * Comment and tags dialogs: allow to save the metadata without closing the + dialog. + * Added option to reuse the active window when opening files from an + external application. + * Allow to hide/show the file properties pane. + * Allow to change the position of the file properties in browser mode. + * Save the image keyworks in the Xmp.dc.subject tag as well. + * Save the Exif.Image.Software tag only if the content was modified. + * Sync the rating with the Xmp.xmp.Rating tag. + * Video viewer: jump to the specified position when clicking on the progress + bar. + * Video viewer: use symbolic icons for the play button and the volume control. + * Make the 'shrink wrap' command work for the video viewer as well. + * Image viewer: hide the horizontal scrollbar in 'fit width' mode. + * Image viewer: implemented the checked transparency. + * Show the Edit button in browser mode as well. + * Moved the location chooser above the file list. + * Preferences: show the slideshow preferences in the viewer tab to save some + horizontal space. + * Use the PICTURES special dir as the default startup location. + + Internal code changes: + + * Ported to Gtk+ 3 + * Ported from GConf to GSettings. Automatically convert the GConf values. + * Ported from libunique to GtkApplication. + * Ported to libchamplain version 0.12. + * Removed use of deprecated functions. + * Use the G_DEFINE_* macros to define GObject classes. + * Added a custom widget to display the thumbnail list instead of GtkIconView. + New or updated application translations: * Czech (Marek Černocký) + * Español (Daniel Mustieles) * Esperanto (Kristjan SCHMIDT) * French (Claude Paroz) - * German (Mario Blättermann) - * Indonesian (Andika Triwidada) - * Japanese (Takeshi AIHANA) + * German (Christian Kirbach) + * Indonesian Translation (Andika Triwidada) + * Italiano (Gianvito Cavasoli) + * Japanese (Jiro Matsuzawa) + * Polish (Piotr Drąg) + * Russian (Yuri Myasoedov) * Slovenian Translation (Matej Urbančič) * Swedish (Daniel Nylander) New or updated manual translations: * Deutsch (Mario Blättermann) + * Español (Daniel Mustieles) * French (Claude Paroz) version 2.13.91 diff -Nru gthumb-2.14.3/po/cs.po gthumb-3.0.0/po/cs.po --- gthumb-2.14.3/po/cs.po 2011-11-03 20:37:12.000000000 +0000 +++ gthumb-3.0.0/po/cs.po 2012-04-11 17:29:19.000000000 +0000 @@ -7,15 +7,15 @@ # Miloslav Trmac , 2003, 2004, 2005, 2006. # Jakub Friedl , 2006, 2007. # Kamil Páral , 2008. -# Marek Černocký , 2010, 2011. +# Marek Černocký , 2010, 2011, 2012. # msgid "" msgstr "" -"Project-Id-Version: gthumb 2.14\n" +"Project-Id-Version: gthumb\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-10-20 07:06+0000\n" -"PO-Revision-Date: 2011-11-02 20:10+0100\n" +"POT-Creation-Date: 2012-03-25 20:21+0000\n" +"PO-Revision-Date: 2012-03-28 12:30+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -24,101 +24,109 @@ "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Soubor není platným souborem .desktop" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Nerozpoznaná verze „%s“ souboru desktop" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "Spouští se %s" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "Aplikace nepřijímá na příkazovém řádku dokumenty" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "Nerozpoznaná volba spuštění: %d" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "Nelze předat URI dokumentů do položky pracovní plochy „Type=Link“" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "Nejde o spustitelnou položku" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "Zakázat připojení ke správě sezení" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "Určuje soubor obsahující uložené nastavení" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "SOUBOR" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "Určuje ID správy sezení" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "ID" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "Volby správy sezení:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "Zobrazit volby správy sezení" -#: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "Prohlížeč obrázků" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "Prohlížejte a organizujte své obrázky" - #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:3 ../data/gthumb-import.desktop.in.in.h:3 -#: ../gthumb/gth-browser.c:523 ../gthumb/gth-main.c:229 -#: ../gthumb/gth-progress-dialog.c:443 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:529 +#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Prohlížeč obrázků" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "Prohlížeč obrázků gThumb" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Prohlížejte a organizujte své obrázky" + #: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "Importovat fotografií z karty vašeho fotoaparátu" +msgid "Import with gThumb" +msgstr "Import pomocí gThumb" #: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "Nástroj pro import fotografií" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "Nástroj pro import fotografií gThumb" -#: ../data/gthumb.schemas.in.h:1 +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Importovat fotografií z karty vašeho fotoaparátu" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "" "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " "to generate thumbnails for all images." @@ -126,86 +134,72 @@ "Pro obrázky překračující tuto velikost (v bajtech) nebudou tvořeny náhledy. " "Použijte 0, pokud chcete generovat náhledy všech obrázků." -#: ../data/gthumb.schemas.in.h:2 -msgid "" -"Possible values are: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." -msgstr "" -"Možné hodnoty jsou: actual_size (skutečná velikost), fit (přizpůsobit), " -"keep_prev (zachovat předchozí), fit_if_larger (přizpůsobit, když je větší), " -"fit_width_if_larger (přizpůsobit šířku, když je větší)." - -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "Možné hodnoty jsou: high (vysoká), low (nízká)." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "" -"Možné hodnoty jsou: light (světlé), midtone (střední tóny), dark (tmavé)." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "Možné hodnoty jsou: list (seznam), thumbnails (náhledy)." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "Možné hodnoty jsou: small (malé), medium (střední), large (velké)." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" +msgstr "Zda změnit velikost okna, aby odpovídalo velikosti obrázku" -#: ../data/gthumb.schemas.in.h:7 -msgid "" -"Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "" -"Možné hodnoty jsou: system (podle systému), text_below (text pod), " -"text_beside (text vedle), text_only (pouze text), icons_only (pouze ikony)." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Otevřít soubory v aktivním okně" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "" "Možné hodnoty jsou: white (bíle), black (černě), checked (kostkovaně), none " "(nijak)." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +msgid "Whether to reset the scrollbars position after changing image" +msgstr "Zda po změně obrázku nastavit pozice posuvníků na začátek" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to always use a black background." msgstr "Zda pokaždé používat černé pozadí." -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" -msgstr "Zda nastavit pozice posuvníků na začátek po změně obrázku" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Možné hodnoty jsou: jpeg, jpg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Možné hodnoty jsou: tiff, tif." + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"Možné hodnoty zahrnují: general::unsorted (obecné, neseřazené), file::name " +"(název souboru), file::size (velikost souboru), file::mtime (čas souboru), " +"exif::photo::datetimeoriginal (čas pořízení fotografie podle exif)" #: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "Rozšíř_ení:" + +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "Další rozšíření…" -#: ../data/ui/extensions-preferences.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:3 msgid "Some extensions are configurable." msgstr "U některých rozšíření můžete měnit nastavení." -#: ../data/ui/extensions-preferences.ui.h:3 -msgid "_Extensions:" -msgstr "Rozšíř_ení:" - #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "_Název filtru:" -#. limit label -#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 -msgid "_Limit to" -msgstr "O_mezit na" - -#: ../data/ui/filter-editor.ui.h:3 +#: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "_Musí platit" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:270 +#: ../gthumb/gth-filter.c:342 +msgid "_Limit to" +msgstr "O_mezit na" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "vybraných podle" @@ -214,69 +208,74 @@ msgid "Mean:" msgstr "Stř. hodnota:" -#: ../data/ui/histogram-info.ui.h:2 +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Sm. odchylka:" + +#: ../data/ui/histogram-info.ui.h:4 msgid "Median:" msgstr "Medián:" +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Pixelů:" + #. After the colon there is a percentile. -#: ../data/ui/histogram-info.ui.h:4 +#: ../data/ui/histogram-info.ui.h:8 msgctxt "Pixels" msgid "Max:" msgstr "Maximum:" #. After the colon there is the percentile of selected pixels. -#: ../data/ui/histogram-info.ui.h:6 +#: ../data/ui/histogram-info.ui.h:10 msgctxt "Pixels" msgid "Selected:" msgstr "Vybráno:" -#. After the colon there is the total number of pixels -#: ../data/ui/histogram-info.ui.h:8 -msgid "Pixels:" -msgstr "Pixelů:" - -#. Short for "Standard deviation". Try to keep it short in the translation. -#: ../data/ui/histogram-info.ui.h:10 -msgid "Std dev:" -msgstr "Sm. odchylka:" +#: ../data/ui/location.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +msgid "_Location:" +msgstr "U_místění:" #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "Nepřepisovat s_tarý soubor" +msgid "Overwrite the old file with the new one?" +msgstr "Přepsat starý soubor novým?" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Starý soubor:" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "Název souboru:" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Velikost:" + +#: ../data/ui/overwrite-dialog.ui.h:5 msgid "Modified:" msgstr "Změněno:" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "Nový soubor:" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "Starý soubor:" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "_Přepsat starý soubor" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "Přeps_at všechny soubory" - #: ../data/ui/overwrite-dialog.ui.h:8 -msgid "Overwrite the old file with the new one?" -msgstr "Přepsat starý soubor novým?" +msgid "Do not overwrite _the old file" +msgstr "Nepřepisovat s_tarý soubor" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "Size:" -msgstr "Velikost:" +msgid "Overwrite _all files" +msgstr "Přeps_at všechny soubory" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -299,185 +298,181 @@ msgstr "_Ostatní filtry:" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Aktivovat položky dvojitým kliknutím" +msgid "below the folder list" +msgstr "pod seznamem složek" #: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Aktivovat položky jedním kliknutím" +msgid "on the right" +msgstr "napravo" #: ../data/ui/preferences.ui.h:3 -msgid "Appearance" -msgstr "Vzhled" +msgid "gThumb Preferences" +msgstr "Předvolby gThumb" #: ../data/ui/preferences.ui.h:4 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "Žádat _potvrzení před odstraněním souborů nebo katalogů" +msgid "_Toolbar style:" +msgstr "Styl liš_ty nástrojů:" #: ../data/ui/preferences.ui.h:5 -msgid "Ask whether to save _modified files" -msgstr "Ptát se, zda ukládat z_měněné soubory" +msgid "T_humbnails in viewer:" +msgstr "Ná_hledy v zobrazovači:" -#: ../data/ui/preferences.ui.h:6 ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Černě" +#: ../data/ui/preferences.ui.h:6 +msgid "System settings" +msgstr "Systémová nastavení" -#: ../data/ui/preferences.ui.h:7 ../gthumb/dlg-preferences-extensions.c:72 -#: ../gthumb/gth-browser-actions-entries.h:150 -msgid "Browser" -msgstr "Prohlížeč" +#: ../data/ui/preferences.ui.h:7 +msgid "Text below icons" +msgstr "Text pod ikonami" #: ../data/ui/preferences.ui.h:8 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 -msgid "Caption" -msgstr "Titulek" +msgid "Text beside icons" +msgstr "Text vedle ikon" -#: ../data/ui/preferences.ui.h:9 ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "Kostkovaně" +#: ../data/ui/preferences.ui.h:9 +msgid "Icons only" +msgstr "Pouze ikony" #: ../data/ui/preferences.ui.h:10 -msgid "Choose startup folder" -msgstr "Vyberte počáteční složku" +msgid "Text only" +msgstr "Pouze text" #: ../data/ui/preferences.ui.h:11 -msgid "D_etermine image type from content (slower)" -msgstr "_Určit typ obrázku podle jeho obsahu (pomalejší)" +msgid "on the bottom" +msgstr "dole" -#: ../data/ui/preferences.ui.h:12 ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Přizpůsobit šířce, pokud je větší" +#: ../data/ui/preferences.ui.h:12 +msgid "on the side" +msgstr "po straně" -#: ../data/ui/preferences.ui.h:13 ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Přizpůsobit oknu" +#: ../data/ui/preferences.ui.h:13 +msgid "File _properties in browser:" +msgstr "Vlastnosti souboru v _prohlížeči:" -#: ../data/ui/preferences.ui.h:14 ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Přizpůsobit oknu, pokud je větší" +#: ../data/ui/preferences.ui.h:14 +msgid "Appearance" +msgstr "Vzhled" #: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "Podle chování Nautilu" +msgid "Go to last _visited location" +msgstr "Přejít na poslední na_vštívené místo" #: ../data/ui/preferences.ui.h:16 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:393 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "Obecné" +msgid "Go to this _folder:" +msgstr "Přejít do této s_ložky:" #: ../data/ui/preferences.ui.h:17 -msgid "Go to last _visited location" -msgstr "Přejít na poslední na_vštívené místo" +msgid "Choose startup folder" +msgstr "Vyberte počáteční složku" #: ../data/ui/preferences.ui.h:18 -msgid "Go to this _folder:" -msgstr "Přejít do této s_ložky:" +msgid "Set to C_urrent" +msgstr "Nastavit na _aktuální" -#: ../data/ui/preferences.ui.h:19 ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Pouze ikony" +#: ../data/ui/preferences.ui.h:19 +msgid "_Reuse the active window to open files" +msgstr "Zno_vu použít aktivní okno k otevření souborů" -#: ../data/ui/preferences.ui.h:20 ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Ponechat předchozí přiblížení" +#: ../data/ui/preferences.ui.h:20 +msgid "On startup:" +msgstr "Při spuštění:" #: ../data/ui/preferences.ui.h:21 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-crop.c:448 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 -#: ../extensions/file_tools/gth-file-tool-rotate.c:414 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "Nic" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "Žádat _potvrzení před odstraněním souborů nebo katalogů" #: ../data/ui/preferences.ui.h:22 -msgid "On startup:" -msgstr "Při spuštění:" +msgid "Ask whether to save _modified files" +msgstr "Ptát se, zda ukládat z_měněné soubory" #: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:192 +msgid "_Store metadata inside files if possible" +msgstr "Pokud je to možné, uchovávat metadata v _souborech" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 msgid "Other" msgstr "Ostatní" -#: ../data/ui/preferences.ui.h:24 -msgid "Set image to actual size" -msgstr "Nastavit obrázek na skutečnou velikost" - #: ../data/ui/preferences.ui.h:25 -msgid "Set to C_urrent" -msgstr "Nastavit na _aktuální" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Obecné" -#. Set widgets data. -#: ../data/ui/preferences.ui.h:26 ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Podle nastavení systému" +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Titulek" #: ../data/ui/preferences.ui.h:27 -msgid "T_humbnails in viewer:" -msgstr "Ná_hledy v zobrazovači:" - -#: ../data/ui/preferences.ui.h:28 ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Text pod ikonami" - -#: ../data/ui/preferences.ui.h:29 ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Text vedle ikon" +msgid "Thumbnail _size:" +msgstr "Veliko_st náhledu:" -#: ../data/ui/preferences.ui.h:30 ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Pouze text" +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" #: ../data/ui/preferences.ui.h:31 -msgid "Thumbnail _size:" -msgstr "Veliko_st náhledu:" +msgid "95" +msgstr "95" -#: ../data/ui/preferences.ui.h:32 ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Bíle" +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" #: ../data/ui/preferences.ui.h:33 -msgid "_Store metadata inside files if possible" -msgstr "Pokud je to možné, uchovávat metadata v _souborech" +msgid "128" +msgstr "128" #: ../data/ui/preferences.ui.h:34 -msgid "_Toolbar style:" -msgstr "Styl liš_ty nástrojů:" +msgid "164" +msgstr "164" #: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "Předvolby gThumb" +msgid "200" +msgstr "200" #: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "dospodu" +msgid "256" +msgstr "256" #: ../data/ui/preferences.ui.h:37 -msgid "on the side" -msgstr "na stranu" +msgid "D_etermine image type from content (slower)" +msgstr "_Určit typ obrázku podle jeho obsahu (pomalejší)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Prohlížeč" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "Řadit podle" #: ../data/ui/sort-order.ui.h:2 -msgid "_Inverse order" -msgstr "_Obrácené pořadí" - -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" msgstr "Řa_dit podle:" +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "_Obrácené pořadí" + #: ../extensions/23hq/23hq.extension.in.in.h:1 msgid "23" msgstr "23" @@ -486,23 +481,23 @@ msgid "Upload images to 23hq.com" msgstr "Odesílání obrázků na 23hq.com." -#: ../extensions/23hq/callbacks.c:67 +#: ../extensions/23hq/callbacks.c:68 msgid "_23..." msgstr "_23…" -#: ../extensions/23hq/callbacks.c:68 +#: ../extensions/23hq/callbacks.c:69 msgid "Upload photos to 23" msgstr "Odeslat fotografie do služby 23" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -msgid "Add bookmarks support." -msgstr "Přidává podporu záložek." - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "Záložky" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Přidává podporu záložek." + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 @@ -528,6 +523,7 @@ #: ../extensions/rename_series/rename_series.extension.in.in.h:3 #: ../extensions/resize_images/resize_images.extension.in.in.h:3 #: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" @@ -562,13 +558,13 @@ msgstr "_Záložky:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "U_místění" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "_Název" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "U_místění" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "Nelze odstranit záložku" @@ -602,16 +598,16 @@ msgstr "Aktuální složka a její _podsložky" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "Zdroj" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "_Vybrané soubory" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Zdroj" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Zapsat na disk" @@ -628,9 +624,9 @@ #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 -#: ../extensions/file_manager/actions.c:65 -#: ../extensions/list_tools/gth-script-editor-dialog.c:319 -#: ../gthumb/gth-filter-editor-dialog.c:491 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format msgid "No name specified" msgstr "Není zadán název" @@ -638,7 +634,7 @@ #: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 #: ../extensions/catalogs/dlg-add-to-catalog.c:281 #: ../extensions/catalogs/dlg-add-to-catalog.c:401 -#: ../extensions/file_manager/actions.c:72 +#: ../extensions/file_manager/actions.c:75 #, c-format msgid "Invalid name. The following characters are not allowed: %s" msgstr "Neplatný název. Následující znaky nejsou povoleny: %s" @@ -646,7 +642,8 @@ #: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 #: ../extensions/catalogs/dlg-add-to-catalog.c:338 #: ../extensions/catalogs/dlg-add-to-catalog.c:448 -#: ../extensions/file_manager/actions.c:103 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 msgid "Name already used" msgstr "Název je již použit" @@ -663,7 +660,7 @@ #: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 #: ../extensions/catalogs/dlg-add-to-catalog.c:474 -#: ../extensions/file_manager/actions.c:133 +#: ../extensions/file_manager/actions.c:136 msgid "C_reate" msgstr "_Vytvořit" @@ -681,7 +678,7 @@ msgid "Could not remove the catalog" msgstr "Nelze odstranit katalog" -#: ../extensions/catalogs/actions.c:361 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" msgstr "Opravdu chcete odstranit „%s“?" @@ -699,8 +696,7 @@ msgstr "Přejít do složky obsahující vybrané soubory" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/edit_metadata/callbacks.c:116 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:86 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Jiné…" @@ -743,29 +739,29 @@ #: ../extensions/catalogs/callbacks.c:497 #: ../extensions/catalogs/callbacks.c:502 -#: ../extensions/photo_importer/dlg-photo-importer.c:359 -#: ../extensions/photo_importer/dlg-photo-importer.c:399 -#: ../gthumb/gth-file-list.c:45 ../gthumb/gth-folder-tree.c:874 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(Prázdné)" -#: ../extensions/catalogs/callbacks.c:695 +#: ../extensions/catalogs/callbacks.c:697 msgid "Catalog Properties" msgstr "Vlastnosti katalogu" -#: ../extensions/catalogs/callbacks.c:709 +#: ../extensions/catalogs/callbacks.c:711 msgid "Organize" msgstr "Uspořádat" -#: ../extensions/catalogs/callbacks.c:710 +#: ../extensions/catalogs/callbacks.c:712 msgid "Automatically organize files by date" msgstr "Automaticky uspořádat soubory podle data" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1024 +#: ../extensions/catalogs/gth-catalog.c:1025 msgid "Catalogs" msgstr "Katalogy" @@ -782,114 +778,114 @@ msgstr "K_atalogy:" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "Nová _knihovna" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "_Nový katalog" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "Nová _knihovna" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:922 -#: ../extensions/webalbums/gth-web-exporter.c:1852 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1842 msgid "_View the destination" msgstr "_Zobrazit cíl" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "Katalog" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:201 +#: ../gthumb/gth-file-properties.c:212 msgid "Properties" msgstr "Vlastnosti" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Název:" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "_Datum:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "_Název:" +msgid "Catalog" +msgstr "Katalog" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -msgid "Catalog _Preview:" -msgstr "Ná_hled katalogu:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 -msgid "Organization:" -msgstr "Uspořádání:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "Uspořádat soubory" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" msgstr "Uspořádání souborů" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Uspořádání:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Select All" msgstr "Vybrat vše" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "Nic nevybrat" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "Ná_hled katalogu:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:470 -#: ../gthumb/gth-main-default-tests.c:264 +#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Datum pořízení fotografie" #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -#: ../gthumb/gth-main-default-tests.c:256 +#: ../gthumb/gth-main-default-tests.c:292 msgid "File modified date" msgstr "Datum změny souboru" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "Ignorovat katalogy s jediným souborem" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "Samostatné soubory vložit do katalogu" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "Jednotlivé" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:261 +#: ../extensions/comments/main.c:159 msgid "Tag" msgstr "Štítek" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 -#: ../gthumb/gth-main-default-tests.c:284 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "štítek" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "Štítek (vložený)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "_Seskupit soubory podle:" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/search/data/ui/search-editor.ui.h:2 +msgid "_Include sub-folders" +msgstr "_Včetně podsložek" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Ignorovat katalogy s jediným souborem" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 -#: ../extensions/search/data/ui/search-editor.ui.h:2 -msgid "_Include sub-folders" -msgstr "_Včetně podsložek" +msgid "Put single files in the catalog:" +msgstr "Samostatné soubory vložit do katalogu" #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "štítek" +msgid "Singles" +msgstr "Jednotlivé" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -897,7 +893,7 @@ msgstr "Nelze přidat soubory do katalogu" #: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/search/gth-search-task.c:352 +#: ../extensions/search/gth-search-task.c:356 msgid "Could not create the catalog" msgstr "Nelze vytvořit katalog" @@ -905,7 +901,7 @@ msgid "Could not save the catalog" msgstr "Nelze uložit do katalogu" -#: ../extensions/catalogs/dlg-catalog-properties.c:166 +#: ../extensions/catalogs/dlg-catalog-properties.c:159 msgid "Could not load the catalog" msgstr "Nelze načíst katalog" @@ -915,52 +911,53 @@ "Soubory budou uspořádány v katalogu. Na disku žádné soubory přesouvány " "nebudou." -#: ../extensions/catalogs/gth-catalog.c:1145 ../extensions/comments/main.c:43 +#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Štítky" -#: ../extensions/catalogs/gth-file-source-catalogs.c:848 +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 #, c-format msgid "The catalog '%s' already exists, do you want to overwrite it?" msgstr "Katalog „%s“ již existuje, chcete jej přepsat?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:850 +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 #, c-format msgid "The library '%s' already exists, do you want to overwrite it?" msgstr "Knihovna „%s“ již existuje, chcete ji přepsat?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:858 +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 msgid "Over_write" msgstr "_Přepsat" -#: ../extensions/catalogs/gth-file-source-catalogs.c:976 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 msgid "Cannot move the files" msgstr "Nelze přesunout soubory" -#: ../extensions/catalogs/gth-file-source-catalogs.c:978 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 msgid "Cannot copy the files" msgstr "Nelze zkopírovat soubory" -#: ../extensions/catalogs/gth-file-source-catalogs.c:983 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 msgid "Invalid destination." msgstr "Neplatný cíl." -#: ../extensions/catalogs/gth-file-source-catalogs.c:1030 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format msgid "Copying files to '%s'" msgstr "Kopírují se soubory do „%s“" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1283 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1388 msgid "Could not remove the files from the catalog" msgstr "Nelze odstranit vybrané soubory z katalogu" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1341 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:683 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:711 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1214 -#: ../extensions/search/gth-search.c:295 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1446 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Neplatný formát souboru" @@ -985,86 +982,90 @@ msgid "Change the files date" msgstr "Změna data u souborů." -#: ../extensions/change_date/data/gthumb_change_date.schemas.in.h:1 -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "Možné hodnoty jsou: pixels (pixely), percentage (procenta)." - #: ../extensions/change_date/data/ui/change-date.ui.h:1 -msgid "+" -msgstr "+" +msgid "Change Date" +msgstr "Změna data" #: ../extensions/change_date/data/ui/change-date.ui.h:2 -msgid "-" -msgstr "-" +msgid "Change the following values:" +msgstr "Změnit následující hodnoty:" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -msgid "A_djust by" -msgstr "Po_sunout o" +msgid "_Last modified date" +msgstr "Datum _poslední změny" #: ../extensions/change_date/data/ui/change-date.ui.h:4 -msgid "Change Date" -msgstr "Změna data" +msgid "Co_mment date" +msgstr "Datum ko_mentáře" #: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Change the following values:" -msgstr "Změnit následující hodnoty:" +msgid "Exif DateTimeOriginal tag" +msgstr "Značku Exif DateTimeOriginal (datum a čas originálu)" #: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Change to:" msgstr "Změnit na:" #: ../extensions/change_date/data/ui/change-date.ui.h:7 -msgid "Co_mment date" -msgstr "Datum ko_mentáře" +msgid "The _following date:" +msgstr "_Následující datum:" #: ../extensions/change_date/data/ui/change-date.ui.h:8 -msgid "Date p_hoto was taken" -msgstr "Datum pořízení _fotografie" - -#: ../extensions/change_date/data/ui/change-date.ui.h:9 -msgid "Exif DateTimeOriginal tag" -msgstr "Značku Exif DateTimeOriginal (datum a čas originálu)" - -#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "Datum z_měny souboru" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File c_reation date" msgstr "Datum vytvoření soubo_ru" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 -msgid "The _following date:" -msgstr "_Následující datum:" +#: ../extensions/change_date/data/ui/change-date.ui.h:10 +msgid "Date p_hoto was taken" +msgstr "Datum pořízení _fotografie" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 -msgid "_Last modified date" -msgstr "Datum _poslední změny" +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "A_djust by" +msgstr "Po_sunout o" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "hours" msgstr "hodin" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "minutes" msgstr "minut" -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "sekund" -#: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "Přidávání komentářů a štítků k libovolnému typu souboru." +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +msgid "+" +msgstr "+" -#: ../extensions/comments/comments.extension.in.in.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:16 +msgid "-" +msgstr "-" + +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Importovat vložená metadata" + +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "" +"Importovat metadata uchovaná uvnitř souboru do systému komentářů gThumb" + +#: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "Komentáře a štítky" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Přidávání komentářů a štítků k libovolnému typu souboru." + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Předvolby" @@ -1072,37 +1073,37 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Synchronizovat s vloženými metadaty" -#: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:111 +#: ../extensions/comments/main.c:34 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Komentář" -#: ../extensions/comments/main.c:39 ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Název" -#: ../extensions/comments/main.c:40 ../extensions/comments/main.c:245 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:16 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Popis" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:253 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:151 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Umístění" -#: ../extensions/comments/main.c:42 ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:43 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Datum" -#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Hodnocení" @@ -1127,7 +1128,7 @@ msgstr "Vytvořit stěnu s obrázky" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" msgstr "Kontaktní otisk" @@ -1136,24 +1137,32 @@ msgstr "Vytváření indexu obrázků v podobě náhledů vybraných souborů." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid "Background" -msgstr "Pozadí" +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-crop.c:454 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Nic" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -msgid "C_olor:" -msgstr "_Barva:" +msgid "Simple" +msgstr "Jednoduchý" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Caption:" -msgstr "Titulek:" +msgid "Simple with shadow" +msgstr "Jednoduchý se stínem" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 -msgid "Frame" -msgstr "Rámeček" +msgid "Shadow only" +msgstr "Pouze stín" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 +msgid "Slide" +msgstr "Diarámeček" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 msgid "Inward Shadow" msgstr "Vnitřní stín" @@ -1161,242 +1170,244 @@ msgid "Outward Shadow" msgstr "Vnější stín" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 -msgid "Select a color" -msgstr "Výběr barvy" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -msgid "Select a font" -msgstr "Výběr písma" +msgid "Background" +msgstr "Pozadí" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -msgid "Shadow only" -msgstr "Pouze stín" +msgid "_Solid color" +msgstr "P_lná barva" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -msgid "Simple" -msgstr "Jednoduchý" +msgid "_Gradient" +msgstr "Přecho_d" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -msgid "Simple with shadow" -msgstr "Jednoduchý se stínem" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +msgid "_Horizontal:" +msgstr "Vo_dorovně:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -msgid "Slide" -msgstr "Diarámeček" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 +msgid "_Vertical:" +msgstr "S_visle:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#: ../extensions/rename_series/dlg-rename-series.c:63 -msgid "Text" -msgstr "Text" +msgid "Select a color" +msgstr "Výběr barvy" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "_Footer:" -msgstr "Zá_patí:" +msgid "Frame" +msgstr "Rámeček" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -msgid "_Gradient" -msgstr "Přecho_d" +msgid "_Style:" +msgstr "_Styl:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "_Header:" -msgstr "Zá_hlaví:" +msgid "C_olor:" +msgstr "_Barva:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Horizontal:" -msgstr "Vo_dorovně:" +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Text" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "Zá_hlaví:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -msgid "_Solid color" -msgstr "P_lná barva" +msgid "Select a font" +msgstr "Výběr písma" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 -msgid "_Style:" -msgstr "_Styl:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "Zá_patí:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "_Vertical:" -msgstr "S_visle:" - -#. translate only the text in the curly brackets -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, no-c-format -msgid "%D{ format }" -msgstr "%D{ formát }" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -msgid "All images on a single page" -msgstr "Všechny obrázky na jedné stránce" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Titulek:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:6 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:10 -msgid "Choose destination folder" -msgstr "Vyberte cílovou složku" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "Číslo aktuální stránky" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 #: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -msgid "Columns:" -msgstr "Sloupců:" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Celkový počet stránek" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -msgid "Create _HTML image map" -msgstr "Vytvořit obrázkovou mapu _HTML" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Speciální kód" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -msgid "Create a new theme" -msgstr "Vytvořit nový motiv" +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ formát }" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -msgid "Delete the selected theme" -msgstr "Smazat vybraný motiv" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "Aktuální datum" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "_Cíl:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 -msgid "Edit the selected theme" -msgstr "Upravit vybraný motiv" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "Vyberte cílovou složku" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 msgid "File_name:" msgstr "_Název souboru:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Číslice čítače nového" + #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Images per page:" -msgstr "Obrázků na stránku:" +msgid "Create _HTML image map" +msgstr "Vytvořit obrázkovou mapu _HTML" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Layout" -msgstr "Rozvržení" +#: ../extensions/pixbuf_savers/preferences.c:134 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Ukládání" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 -msgid "New enumerator digit" -msgstr "Číslice čítače nového" +msgid "Create a new theme" +msgstr "Vytvořit nový motiv" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -msgid "Re_verse order" -msgstr "_Obrácené pořadí" +msgid "Edit the selected theme" +msgstr "Upravit vybraný motiv" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -msgid "S_ort:" -msgstr "Řadit p_odle:" +msgid "Delete the selected theme" +msgstr "Smazat vybraný motiv" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "Saving" -msgstr "Ukládání" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:20 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -msgid "Special code" -msgstr "Speciální kód" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Motiv" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -msgid "Sq_uared" -msgstr "Čtvere_cový" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Sloupců:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -msgid "The current date" -msgstr "Aktuální datum" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Obrázků na stránku:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "The current page number" -msgstr "Číslo aktuální stránky" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Všechny obrázky na jedné stránce" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The total number of pages" -msgstr "Celkový počet stránek" +msgid "_All pages with the same size" +msgstr "Vš_echny stránky ve stejné velikosti" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "Theme" -msgstr "Motiv" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Rozvržení" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 -msgid "Thumbnails" -msgstr "Náhledy" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "Řadit p_odle:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 -msgid "_All pages with the same size" -msgstr "Vš_echny stránky ve stejné velikosti" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "_Obrácené pořadí" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "_Destination:" -msgstr "_Cíl:" +msgid "_Size:" +msgstr "Veliko_st:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "Čtvere_cový" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -msgid "_Size:" -msgstr "Veliko_st:" +msgid "Thumbnails" +msgstr "Náhledy" -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" msgstr "Stěna s obrázky" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:483 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:495 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:509 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 msgid "Could not save the theme" msgstr "Nelze uložit motiv" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:654 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 msgid "Could not delete the theme" msgstr "Nelze smazat motiv" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 msgid "Creating images" msgstr "Vytvářejí se obrázky" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 msgid "Generating thumbnails" msgstr "Generují se náhledy" @@ -1408,15 +1419,15 @@ msgid "Footer" msgstr "Zápatí" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:197 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 msgid "Theme Properties" msgstr "Vlastnosti motivu" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:212 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 msgid "Copy _From" msgstr "Kopírova_t z" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:348 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 msgid "New theme" msgstr "Nový motiv" @@ -1436,34 +1447,34 @@ msgid "Save images in a different format" msgstr "Uložení obrázků v jiném formátu." -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 msgid "Convert Format" msgstr "Převod formátu" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Nový formát" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "Cíl" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "Nový formát" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Use the original image folder" msgstr "Po_užít původní složku obrázku" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/dlg-convert-format.c:93 msgid "Converting images" msgstr "Převádí se obrázky" -#: ../extensions/desktop_background/actions.c:203 +#: ../extensions/desktop_background/actions.c:162 msgid "Could not show the desktop background properties" msgstr "Nelze zobrazit vlastnosti pozadí pracovní plochy" -#: ../extensions/desktop_background/actions.c:269 -#: ../extensions/desktop_background/actions.c:287 +#: ../extensions/desktop_background/actions.c:228 +#: ../extensions/desktop_background/actions.c:246 msgid "Could not set the desktop background" msgstr "Nelze nastavit pozadí pracovní plochy" @@ -1480,51 +1491,51 @@ msgid "Desktop background" msgstr "Pozadí pracovní plochy" -#: ../extensions/edit_metadata/actions.c:129 +#: ../extensions/edit_metadata/actions.c:66 msgid "" "Are you sure you want to permanently delete the metadata of the selected " "files?" msgstr "Opravdu chcete trvale smazat metadata vybraných souborů?" -#: ../extensions/edit_metadata/actions.c:136 +#: ../extensions/edit_metadata/actions.c:73 msgid "If you delete the metadata, it will be permanently lost." msgstr "Když metadata smažete, nepůjde to již vrátit zpět." -#: ../extensions/edit_metadata/callbacks.c:108 +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "Š_títky" -#: ../extensions/edit_metadata/callbacks.c:112 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" msgstr "Upravit komentář a další metadata u vybraných souborů" -#: ../extensions/edit_metadata/callbacks.c:117 -msgid "Choose another tag" -msgstr "Zvolit jiný štítek" +#: ../extensions/edit_metadata/callbacks.c:107 +msgid "Set the tags of the selected files" +msgstr "Nastavit štítky vybraným souborům" -#: ../extensions/edit_metadata/callbacks.c:121 +#: ../extensions/edit_metadata/callbacks.c:112 msgid "Delete Metadata" msgstr "Smazat metadata" -#: ../extensions/edit_metadata/callbacks.c:122 +#: ../extensions/edit_metadata/callbacks.c:113 msgid "Delete the comment and the embedded metadata of the selected files" msgstr "Smazat komentář a další vložená metadata u vybraných souborů" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "_Popis:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Umístění:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "Š_títky:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "_Umístění:" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "_Hodnocení:" @@ -1533,72 +1544,80 @@ msgid "_Title:" msgstr "_Název:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:63 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "Nelze uložit metadata souboru" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:150 -#: ../gthumb/gth-overwrite-dialog.c:166 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "Nelze načíst informace o souboru" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Úprava metadat" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Allow to edit files metadata." msgstr "Umožňuje upravovat metadata souborů." -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 -msgid "Edit metadata" -msgstr "Úprava metadat" +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "Metadata %s" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d soubor" +msgstr[1] "%d soubory" +msgstr[2] "%d souborů" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +msgid "Sa_ve and Close" +msgstr "Uložit a za_vřít" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Uložit pouze změ_něná pole" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:467 +#: ../extensions/edit_metadata/gth-edit-general-page.c:547 msgid "No date" msgstr "Datum neuvedeno" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:468 +#: ../extensions/edit_metadata/gth-edit-general-page.c:548 msgid "The following date" msgstr "Následující datum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:469 -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Dnešní datum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:471 +#: ../extensions/edit_metadata/gth-edit-general-page.c:551 msgid "Last modified date" msgstr "Datum poslední změny" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:472 +#: ../extensions/edit_metadata/gth-edit-general-page.c:552 msgid "File creation date" msgstr "Datum vytvoření souboru" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:553 msgid "Do not modify" msgstr "Neměnit" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:105 -msgid "Save only cha_nged fields" -msgstr "Uložit pouze změ_něná pole" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:161 -#, c-format -msgid "%s Metadata" -msgstr "Metadata %s" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:165 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:332 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d soubor" -msgstr[1] "%d soubory" -msgstr[2] "%d souborů" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Nový štítek" +msgid "%s Tags" +msgstr "Štítky souboru %s" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 msgid "Assign Tags" msgstr "Přiřadit štítky" @@ -1623,57 +1642,57 @@ msgid "Extension example." msgstr "Příklad rozšíření." -# Překlad vychází z Wikipedie: http://cs.wikipedia.org/wiki/IPTC #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "Pos_tavení autora:" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "C_opyright:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "_Země:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Kód země:" + # Překlad vychází z Wikipedie: http://cs.wikipedia.org/wiki/IPTC #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "Zprostř_edkovatel:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "State/Province:" -msgstr "Stát/region:" - -# Překlad vychází z Wikipedie: http://cs.wikipedia.org/wiki/IPTC #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_Byline:" -msgstr "_Jméno autora:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "Z_droj:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_City:" -msgstr "_Město:" +msgid "_Urgency:" +msgstr "_Důležitost:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -msgid "_Code:" -msgstr "_Kód země:" +msgid "_Object Name:" +msgstr "Název _objektu:" + +# Překlad vychází z Wikipedie: http://cs.wikipedia.org/wiki/IPTC +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "Pos_tavení autora:" +# Překlad vychází z Wikipedie: http://cs.wikipedia.org/wiki/IPTC #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Language:" -msgstr "_Jazyk:" +msgid "_Byline:" +msgstr "_Jméno autora:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -msgid "_Object Name:" -msgstr "Název _objektu:" +msgid "_City:" +msgstr "_Město:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -msgid "_Source:" -msgstr "Z_droj:" +msgid "_Language:" +msgstr "_Jazyk:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 -msgid "_Urgency:" -msgstr "_Důležitost:" +msgid "State/Province:" +msgstr "Stát/region:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1727,11 +1746,11 @@ msgid "XMP Attached" msgstr "Přiložené XMP" -#: ../extensions/exiv2_tools/main.c:255 +#: ../extensions/exiv2_tools/main.c:256 msgid "date photo was taken" msgstr "data pořízení fotografie" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" msgstr "Sdílet" @@ -1744,76 +1763,76 @@ msgstr "Odeslat fotografie na Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -msgid "1024 x 1024" -msgstr "1024 × 1024" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +msgid "Export to Flickr" +msgstr "Export na Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -msgid "1280 x 1280" -msgstr "1280 × 1280" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "_Odeslat" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -msgid "1600 x 1600" -msgstr "1600 × 1600" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +msgid "_Account:" +msgstr "Úč_et:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -msgid "2048 x 2048" -msgstr "2048 × 2048" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Upravit účty" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -msgid "720 x 720" -msgstr "720 × 720" - -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "A_lbum:" msgstr "A_lbum:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "Add a new album" msgstr "Přidat nové album" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +msgid "Resize the images if larger than this size" +msgstr "Změnit velikost obrázku, když je větší než tato" + #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "Upravit účty" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +msgid "_Resize to:" +msgstr "Změnit _velikost na:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "Export na Flickr" +msgid "720 x 720" +msgstr "720 × 720" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 -msgid "Resize the images if larger than this size" -msgstr "Změnit velikost obrázku, když je větší než tato" +msgid "1024 x 1024" +msgstr "1024 × 1024" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -msgid "_Account:" -msgstr "Úč_et:" +msgid "1280 x 1280" +msgstr "1280 × 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "Změnit _velikost na:" +msgid "1600 x 1600" +msgstr "1600 × 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "_Odeslat" +msgid "2048 x 2048" +msgstr "2048 × 2048" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 msgid "A_ccount:" msgstr "Úč_et:" @@ -1825,27 +1844,23 @@ msgid "A_ccounts:" msgstr "Úč_ty:" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "Private" -msgstr "Soukromé" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 -msgid "Private photos, visible to friends" -msgstr "Soukromé fotografie, viditelné pro přátele" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Veřejné fotografie" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 -msgid "_Location:" -msgstr "U_místění:" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +msgid "Private photos, visible to friends" +msgstr "Soukromé fotografie, viditelné pro přátele" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Soukromé" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 msgid "_Visibility:" msgstr "_Viditelnost:" @@ -1856,18 +1871,18 @@ msgstr "_Ověřit…" #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Až budete hotovi, klikněte na tlačítko „Pokračovat“ níže." + +#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 #: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 msgid "C_ontinue" msgstr "P_okračovat" -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker_utils/flickr-authentication.c:435 -#: ../extensions/oauth/oauth-authentication.c:450 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Až budete hotovi, klikněte na tlačítko „Pokračovat“ níže." - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1879,34 +1894,34 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1851 +#: ../extensions/webalbums/gth-web-exporter.c:1841 msgid "_Open in the Browser" msgstr "_Otevřít v prohlížeči" -#: ../extensions/facebook/dlg-export-to-facebook.c:128 -#: ../extensions/facebook/dlg-export-to-facebook.c:333 -#: ../extensions/facebook/facebook-authentication.c:219 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:234 -#: ../extensions/flicker_utils/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 #: ../extensions/photobucket/dlg-export-to-photobucket.c:376 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:377 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "Nelze se připojit k serveru" -#: ../extensions/facebook/dlg-export-to-facebook.c:180 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 msgid "Could not upload the files" msgstr "Nelze odeslat soubory" -#: ../extensions/facebook/dlg-export-to-facebook.c:410 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 #: ../extensions/photobucket/dlg-export-to-photobucket.c:462 @@ -1914,35 +1929,35 @@ msgid "Could not create the album" msgstr "Nelze vytvořit album" -#: ../extensions/facebook/dlg-export-to-facebook.c:479 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 #: ../extensions/photobucket/dlg-export-to-photobucket.c:534 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 msgid "New Album" msgstr "Nové album" -#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1816 +#: ../extensions/image_print/gth-image-print-job.c:1789 #: ../extensions/photobucket/dlg-export-to-photobucket.c:614 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 msgid "No valid file selected." msgstr "Není vybrán žádný platný soubor." -#: ../extensions/facebook/dlg-export-to-facebook.c:559 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 #: ../extensions/photobucket/dlg-export-to-photobucket.c:615 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 msgid "Could not export the files" msgstr "Nelze exportovat soubory" -#: ../extensions/facebook/dlg-export-to-facebook.c:567 -#: ../extensions/find_duplicates/gth-find-duplicates.c:284 -#: ../extensions/find_duplicates/gth-find-duplicates.c:376 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:255 +#: ../extensions/find_duplicates/gth-find-duplicates.c:347 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 #: ../extensions/photobucket/dlg-export-to-photobucket.c:623 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:800 -#: ../gthumb/gth-browser.c:990 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:1005 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" @@ -1950,43 +1965,43 @@ msgstr[1] "%d soubory (%s)" msgstr[2] "%d souborů (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:589 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:590 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:643 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 #, c-format msgid "Export to %s" msgstr "Export do %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:229 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:229 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:229 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "Nové ověření…" -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker_utils/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." msgstr "Vybr_at účet…" -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker_utils/flickr-authentication.c:434 -#: ../extensions/oauth/oauth-authentication.c:449 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 #, c-format msgid "" "Return to this window when you have finished the authorization process on %s" msgstr "Až dokončíte proces ověření pro %s, tak se vraťte do tohoto okna" -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker_utils/flickr-authentication.c:514 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" msgstr "gtbumb vyžaduje vaše ověření k odeslání fotografií na %s" -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker_utils/flickr-authentication.c:515 -#: ../extensions/oauth/oauth-authentication.c:530 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 #, c-format msgid "" "Click 'Authorize' to open your web browser and authorize gthumb to upload " @@ -1997,31 +2012,31 @@ "ověření pro aplikaci gthumb k odesílání fotografií na %s. Až budete hotovi, " "tak se vraťte do tohoto okna, kde se ověření dokončí." -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker_utils/flickr-authentication.c:615 -#: ../extensions/oauth/oauth-authentication.c:632 +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:681 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Vybrat účet" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker_utils/flickr-authentication.c:724 -#: ../extensions/oauth/oauth-authentication.c:741 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:742 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Upravit účty" -#: ../extensions/facebook/facebook-connection.c:304 -#: ../extensions/facebook/facebook-connection.c:464 -#: ../extensions/facebook/facebook-service.c:191 -#: ../extensions/facebook/facebook-service.c:294 -#: ../extensions/facebook/facebook-service.c:497 -#: ../extensions/flicker_utils/flickr-connection.c:295 -#: ../extensions/flicker_utils/flickr-connection.c:442 -#: ../extensions/flicker_utils/flickr-service.c:224 -#: ../extensions/flicker_utils/flickr-service.c:427 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:195 +#: ../extensions/flicker_utils/flickr-service.c:398 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2029,17 +2044,17 @@ msgid "Unknown error" msgstr "Neznámá chyba" -#: ../extensions/facebook/facebook-connection.c:339 -#: ../extensions/facebook/facebook-connection.c:490 -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-connection.c:321 -#: ../extensions/flicker_utils/flickr-connection.c:468 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 -#: ../extensions/picasaweb/google-connection.c:373 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" msgstr "Připojuje se k serveru" @@ -2051,78 +2066,78 @@ msgid "Upload images to Facebook" msgstr "Odesílání obrázků na Facebook" -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "Získávají se informace účtu" -#: ../extensions/facebook/facebook-service.c:425 -#: ../extensions/flicker_utils/flickr-service.c:352 -#: ../extensions/photobucket/photobucket-service.c:236 -#: ../extensions/picasaweb/picasa-web-service.c:238 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:209 msgid "Getting the album list" msgstr "Získává se seznam alb" -#: ../extensions/facebook/facebook-service.c:554 -#: ../extensions/flicker_utils/flickr-service.c:455 -#: ../extensions/flicker_utils/flickr-service.c:575 -#: ../extensions/flicker_utils/flickr-service.c:613 -#: ../extensions/photobucket/photobucket-service.c:345 -#: ../extensions/picasaweb/picasa-web-service.c:329 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:426 +#: ../extensions/flicker_utils/flickr-service.c:546 +#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:300 msgid "Creating the new album" msgstr "Vytváří se nové album" -#: ../extensions/facebook/facebook-service.c:613 -#: ../extensions/flicker_utils/flickr-service.c:663 -#: ../extensions/photobucket/photobucket-service.c:402 -#: ../extensions/picasaweb/picasa-web-service.c:386 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:357 #, c-format msgid "Could not upload '%s': %s" msgstr "Nelze odeslat „%s“: %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:699 -#: ../extensions/flicker_utils/flickr-service.c:774 -#: ../extensions/photobucket/photobucket-service.c:459 -#: ../extensions/picasaweb/picasa-web-service.c:441 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:412 #, c-format msgid "Uploading '%s'" msgstr "Odesílá se „%s“" -#: ../extensions/facebook/facebook-service.c:915 -#: ../extensions/flicker_utils/flickr-service.c:943 -#: ../extensions/photobucket/photobucket-service.c:628 -#: ../extensions/picasaweb/picasa-web-service.c:634 +#: ../extensions/facebook/facebook-service.c:886 +#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:605 msgid "Uploading the files to the server" msgstr "Odesílají se soubory na server" -#: ../extensions/facebook/facebook-service.c:1032 -#: ../extensions/flicker_utils/flickr-service.c:1106 -#: ../extensions/picasaweb/picasa-web-service.c:747 +#: ../extensions/facebook/facebook-service.c:1003 +#: ../extensions/flicker_utils/flickr-service.c:1077 +#: ../extensions/picasaweb/picasa-web-service.c:718 msgid "Getting the photo list" msgstr "Získává se seznam fotografií" -#: ../extensions/file_manager/actions.c:130 +#: ../extensions/file_manager/actions.c:133 msgid "New folder" msgstr "Nová složka" -#: ../extensions/file_manager/actions.c:131 +#: ../extensions/file_manager/actions.c:134 msgid "Enter the folder name:" msgstr "Zadejte název složky:" -#: ../extensions/file_manager/actions.c:397 +#: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:847 +#: ../extensions/file_manager/callbacks.c:842 msgid "Could not move the files" msgstr "Nelze přesunout soubory" -#: ../extensions/file_manager/actions.c:398 +#: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:848 +#: ../extensions/file_manager/callbacks.c:843 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." @@ -2130,54 +2145,54 @@ "Soubor nelze přesunout do současného umístění, můžete jej místo toho nechat " "zkopírovat." -#: ../extensions/file_manager/actions.c:555 +#: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "Nelze otevřít umístění" -#: ../extensions/file_manager/actions.c:688 +#: ../extensions/file_manager/actions.c:696 msgid "" "The folder is not empty, do you want to delete the folder and its content " "permanently?" msgstr "Složka není prázdná. Chcete složku a její obsah smazat natrvalo?" -#: ../extensions/file_manager/actions.c:704 +#: ../extensions/file_manager/actions.c:712 msgid "Could not delete the folder" msgstr "Nelze smazat složku" -#: ../extensions/file_manager/actions.c:765 +#: ../extensions/file_manager/actions.c:773 msgid "" "The folder cannot be moved to the Trash. Do you want to delete it " "permanently?" msgstr "Složku nelze přesunout do koše. Chcete ji smazat natrvalo?" -#: ../extensions/file_manager/actions.c:772 +#: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" msgstr "Nelze přesunout složku do koše" -#: ../extensions/file_manager/actions.c:808 -#: ../gthumb/gth-file-source-vfs.c:826 +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" msgstr "Opravdu chcete trvale smazat „%s“?" -#: ../extensions/file_manager/actions.c:818 -#: ../gthumb/gth-file-source-vfs.c:839 +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "Když soubor smažete, nepůjde to již vrátit zpět." -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Move To" msgstr "Přesun do" -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Copy To" msgstr "Kopírování do" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Move" msgstr "Přesunout" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Copy" msgstr "Kopírovat" @@ -2201,7 +2216,7 @@ #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 -#: ../gthumb/gth-file-source-vfs.c:800 +#: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" msgstr "Přesunout do _koše" @@ -2221,7 +2236,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "_Přejmenovat" @@ -2263,9 +2278,9 @@ msgid "Move the selected files to another folder" msgstr "Přesunout vybrané soubory do jiné složky" -#: ../extensions/file_manager/callbacks.c:1009 -#: ../extensions/find_duplicates/gth-find-duplicates.c:610 -#: ../gthumb/gth-browser.c:4945 ../gthumb/gth-browser.c:4979 +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:581 +#: ../gthumb/gth-browser.c:4939 ../gthumb/gth-browser.c:4973 msgid "Could not perform the operation" msgstr "Nelze provést tuto operaci" @@ -2282,451 +2297,451 @@ msgstr "Mažou se soubory" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "_Jas:" +msgid "_Preview" +msgstr "Ná_hled" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "Úrovně barev" +msgid "B_rightness:" +msgstr "_Jas:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "Kon_trast:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "Azu_rová - Červená:" +msgid "_Saturation:" +msgstr "_Sytost:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "G_ama:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "Purpurová - _Zelená:" +msgid "Cyan-_Red:" +msgstr "Azu_rová - Červená:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Preview" -msgstr "Ná_hled" +msgid "_Magenta-Green:" +msgstr "Purpurová - _Zelená:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 -msgid "_Reset" -msgstr "Půvo_dní" +msgid "_Yellow-Blue:" +msgstr "Žl_utá - Modrá:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -msgid "_Saturation:" -msgstr "_Sytost:" +msgid "Color Levels" +msgstr "Úrovně barev" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 -msgid "_Yellow-Blue:" -msgstr "Žl_utá - Modrá:" - -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "Půvo_dní" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "Poměr stran" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +msgid "_Position:" +msgstr "_Poloha:" +#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "C_rop" -msgstr "_Oříznout" +msgid "×" +msgstr "×" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "Center" -msgstr "Vystředit" +msgid "_Grid:" +msgstr "_Mřížka:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:6 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "Obrátit poměr stra_n" - -#. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -msgid "M_ultiple of:" -msgstr "Náso_bek:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 msgid "Maximize" msgstr "Maximalizovat" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +msgid "Center" +msgstr "Vystředit" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "Selection" msgstr "Výběr" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 -msgid "_Grid:" -msgstr "_Mřížka:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "I_nvert aspect ratio" +msgstr "Obrátit poměr stra_n" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 -msgid "_Position:" -msgstr "_Poloha:" +#. after the colon there is a control to select the size in pixels +#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +msgid "M_ultiple of:" +msgstr "Náso_bek:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 msgid "px" msgstr "px" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "Aspect ratio" +msgstr "Poměr stran" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "C_rop" +msgstr "_Oříznout" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "Šíř_ka:" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +msgid "Heigh_t:" +msgstr "_Výška:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Set the image size to this value" +msgstr "Nastavit velikost obrázku na tuto hodnotu" #: ../extensions/file_tools/data/ui/resize-options.ui.h:4 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Rozměry" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "_Výška:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 msgid "High _quality" msgstr "Vysoká _kvalita" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "New dimensions:" -msgstr "Nové rozměry:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 #: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "Options" msgstr "Volby" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" msgstr "Původní rozměry:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "Poměr změny velikosti:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -msgid "Set the image size to this value" -msgstr "Nastavit velikost obrázku na tuto hodnotu" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 -msgid "_Width:" -msgstr "Šíř_ka:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Nové rozměry:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "pixelů" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 msgid "Align" msgstr "Vyrovnat" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -msgid "Alignment" -msgstr "Vyrovnání" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 msgid "Angle" msgstr "Úhel" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Point 1:" +msgstr "Bod 1:" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -msgid "Bounding box" -msgstr "Ohraničující okénko" +msgid "Point 2:" +msgstr "Bod 2:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -msgid "Crop borders" -msgstr "Odříznout okraje" +msgid "Keep aspect ratio" +msgstr "Zachovat poměr stran" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "" -"Draw a line on the image \n" -"to set the alignment." -msgstr "" -"Nakreslete v obrázku čáru,\n" -"vůči které jej chcete vyrovnat." +msgid "Image size" +msgstr "Velikost obrázku" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 msgid "Grid:" msgstr "Mřížka:" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Pick a background color" +msgstr "Výběr barvy pozadí" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -msgid "Image size" -msgstr "Velikost obrázku" +msgid "_Transparent" +msgstr "Průh_ledné" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "Keep aspect ratio" -msgstr "Zachovat poměr stran" +msgid "_Background:" +msgstr "_Pozadí:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -msgid "Original size" -msgstr "Původní velikost" +msgid "Reset" +msgstr "Vynulovat" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Nakreslete v obrázku čáru,\n" +"vůči které jej chcete vyrovnat." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 msgid "Parallel" msgstr "Rovnoběžka" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 msgid "Perpendicular" msgstr "Kolmice" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 -msgid "Pick a background color" -msgstr "Výběr barvy pozadí" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 -msgid "Point 1:" -msgstr "Bod 1:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 -msgid "Point 2:" -msgstr "Bod 2:" +msgid "Alignment" +msgstr "Vyrovnání" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -msgid "Reset" -msgstr "Vynulovat" +msgid "Original size" +msgstr "Původní velikost" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 -msgid "_Background:" -msgstr "_Pozadí:" +msgid "Bounding box" +msgstr "Ohraničující okénko" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 -msgid "_Transparent" -msgstr "Průh_ledné" +msgid "Crop borders" +msgstr "Odříznout okraje" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -msgid "Amount:" -msgstr "Míra:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "Ná_hled:" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 -msgid "Radius:" -msgstr "Poloměr:" - -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 msgid "Threshold:" msgstr "Práh:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Poloměr:" + #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 -msgid "_Preview:" -msgstr "Ná_hled:" +msgid "Amount:" +msgstr "Míra:" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 -msgid "Basic tools to modify images." -msgstr "Základní nástroje pro úpravu obrázků." - -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Image tools" msgstr "Obrazové nástroje" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +msgid "Basic tools to modify images." +msgstr "Základní nástroje pro úpravu obrázků." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors..." msgstr "Upravit barvy…" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors" msgstr "Úprava barev" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:528 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Změnit jas, kontrast, sytost a úroveň gamy obrázku" -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 msgid "Square" msgstr "Čtverec" -#: ../extensions/file_tools/gth-file-tool-crop.c:423 -#: ../extensions/file_tools/gth-file-tool-resize.c:494 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:499 #, c-format msgid "%d x %d (Image)" msgstr "%d × %d (Obrázek)" -#: ../extensions/file_tools/gth-file-tool-crop.c:426 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:503 #, c-format msgid "%d x %d (Screen)" msgstr "%d × %d (Obrazovka)" -#: ../extensions/file_tools/gth-file-tool-crop.c:430 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:508 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:431 -#: ../extensions/file_tools/gth-file-tool-resize.c:504 +#: ../extensions/file_tools/gth-file-tool-crop.c:433 +#: ../extensions/file_tools/gth-file-tool-resize.c:509 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, kniha)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:505 +#: ../extensions/file_tools/gth-file-tool-crop.c:434 +#: ../extensions/file_tools/gth-file-tool-resize.c:510 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:506 +#: ../extensions/file_tools/gth-file-tool-crop.c:435 +#: ../extensions/file_tools/gth-file-tool-resize.c:511 msgid "3:2 (Postcard)" msgstr "3:2 (Pohlednice)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:507 +#: ../extensions/file_tools/gth-file-tool-crop.c:436 +#: ../extensions/file_tools/gth-file-tool-resize.c:512 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:437 +#: ../extensions/file_tools/gth-file-tool-resize.c:513 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:438 +#: ../extensions/file_tools/gth-file-tool-resize.c:514 msgid "1.85:1" msgstr "1,85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:439 +#: ../extensions/file_tools/gth-file-tool-resize.c:515 msgid "2.39:1" msgstr "2,39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/rename_series/gth-template-selector.c:260 +#: ../extensions/file_tools/gth-file-tool-crop.c:440 +#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Vlastní" -#: ../extensions/file_tools/gth-file-tool-crop.c:449 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:455 +#: ../extensions/file_tools/gth-file-tool-rotate.c:416 msgid "Rule of Thirds" msgstr "Pravidlo třetin" -#: ../extensions/file_tools/gth-file-tool-crop.c:450 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:456 +#: ../extensions/file_tools/gth-file-tool-rotate.c:417 msgid "Golden Sections" msgstr "Zlatý řez" -#: ../extensions/file_tools/gth-file-tool-crop.c:451 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:457 +#: ../extensions/file_tools/gth-file-tool-rotate.c:418 msgid "Center Lines" msgstr "Středové čáry" -#: ../extensions/file_tools/gth-file-tool-crop.c:452 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:458 +#: ../extensions/file_tools/gth-file-tool-rotate.c:419 msgid "Uniform" msgstr "Rovnoměrná" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop..." msgstr "Oříznout…" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop" msgstr "Oříznutí" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:65 -#: ../extensions/file_tools/gth-file-tool-negative.c:65 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 msgid "Applying changes" msgstr "Uplatňují se změny" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:189 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 msgid "Desaturate" msgstr "Odstíny šedi" -#: ../extensions/file_tools/gth-file-tool-enhance.c:116 +#: ../extensions/file_tools/gth-file-tool-enhance.c:119 msgid "White balance correction" msgstr "Oprava vyvážení bílé" -#: ../extensions/file_tools/gth-file-tool-enhance.c:339 +#: ../extensions/file_tools/gth-file-tool-enhance.c:342 msgid "Enhance Colors" msgstr "Zvýraznit barvy" -#: ../extensions/file_tools/gth-file-tool-enhance.c:340 +#: ../extensions/file_tools/gth-file-tool-enhance.c:343 msgid "Automatic white balance correction" msgstr "Automatická oprava vyvážení bílé" -#: ../extensions/file_tools/gth-file-tool-equalize.c:83 +#: ../extensions/file_tools/gth-file-tool-equalize.c:86 msgid "Equalizing image histogram" msgstr "Vyrovnává se histogram obrázku" -#: ../extensions/file_tools/gth-file-tool-equalize.c:261 +#: ../extensions/file_tools/gth-file-tool-equalize.c:275 msgid "Equalize" msgstr "Vyrovnat" -#: ../extensions/file_tools/gth-file-tool-equalize.c:262 +#: ../extensions/file_tools/gth-file-tool-equalize.c:276 msgid "Equalize image histogram" msgstr "Vyrovnat histogram obrázku" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Překlopit" -#: ../extensions/file_tools/gth-file-tool-flip.c:74 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 msgid "Flip the image vertically" msgstr "Překlopit obrázek svisle" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Zrcadlit" -#: ../extensions/file_tools/gth-file-tool-mirror.c:74 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 msgid "Mirror the image horizontally" msgstr "Zrcadlit obrázek vodorovně" -#: ../extensions/file_tools/gth-file-tool-negative.c:183 +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Negativ" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Znovu" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize..." msgstr "Změnit velikost…" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize" msgstr "Změna velikosti" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate..." msgstr "Otočit…" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate" msgstr "Otočení" -#: ../extensions/file_tools/gth-file-tool-rotate.c:597 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Freely rotate the image" msgstr "Volně otočit obrázek" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Otočit doleva" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 msgid "Rotate the image by 90 degrees counterclockwise" msgstr "Otočit obrázek o 90 stupňů proti směru hodinových ručiček" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Otočit doprava" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 msgid "Rotate the image by 90 degrees clockwise" msgstr "Otočit obrázek o 90 stupňů po směru hodinových ručiček" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Uložit jako" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Uložit" @@ -2734,15 +2749,15 @@ msgid "Sharpening image" msgstr "Doostřuje se obrázek" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus..." msgstr "Zvýšit ostrost…" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus" msgstr "Zvýšení ostrosti" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Zpět" @@ -2759,38 +2774,38 @@ msgstr "_Složky:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Hledání duplicit" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 msgid "Duplicates:" msgstr "Duplicity:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 msgid "Files:" msgstr "Soubory:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -msgid "No duplicates found." -msgstr "Nenalezeny žádné duplicity." - #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -msgid "Search for Duplicates" -msgstr "Hledání duplicit" - -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 -#: ../gthumb/gth-browser-actions-entries.h:32 +#: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "Zo_brazit" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Nenalezeny žádné duplicity." + #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 msgid "Find Duplicates" msgstr "Hledání duplicit" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "Z_ačít od:" -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" msgstr "_Filtr:" @@ -2818,8 +2833,8 @@ msgid "no file" msgstr "žádný soubor" -#: ../extensions/find_duplicates/gth-find-duplicates.c:426 -#: ../extensions/find_duplicates/gth-find-duplicates.c:521 +#: ../extensions/find_duplicates/gth-find-duplicates.c:397 +#: ../extensions/find_duplicates/gth-find-duplicates.c:492 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" @@ -2827,15 +2842,15 @@ msgstr[1] "%d duplicity" msgstr[2] "%d duplicit" -#: ../extensions/find_duplicates/gth-find-duplicates.c:565 +#: ../extensions/find_duplicates/gth-find-duplicates.c:536 msgid "Search completed" msgstr "Hledání dokončeno" -#: ../extensions/find_duplicates/gth-find-duplicates.c:577 +#: ../extensions/find_duplicates/gth-find-duplicates.c:548 msgid "Searching for duplicates" msgstr "Vyhledávají se duplicity" -#: ../extensions/find_duplicates/gth-find-duplicates.c:580 +#: ../extensions/find_duplicates/gth-find-duplicates.c:551 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2845,19 +2860,19 @@ msgstr[1] "Zbývají %d soubory" msgstr[2] "Zbývá %d souborů" -#: ../extensions/find_duplicates/gth-find-duplicates.c:663 +#: ../extensions/find_duplicates/gth-find-duplicates.c:634 msgid "Getting the file list" msgstr "Získává se seznam souborů" -#: ../extensions/find_duplicates/gth-find-duplicates.c:769 +#: ../extensions/find_duplicates/gth-find-duplicates.c:740 msgid "Duplicates" msgstr "Duplicity" -#: ../extensions/find_duplicates/gth-find-duplicates.c:1023 +#: ../extensions/find_duplicates/gth-find-duplicates.c:997 msgid "Select" msgstr "Vybrat" -#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:63 +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr…" @@ -2865,7 +2880,7 @@ msgid "Download photos from Flickr" msgstr "Stáhnout fotografie ze služby Flickr" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "Odeslat fotografie do služby Flickr" @@ -2877,135 +2892,128 @@ msgid "Upload images to Flickr" msgstr "Odesílání obrázků do služby Flicker." -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Volné místo:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "S_krýt před veřejným hledáním" - -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -msgid "Moderate content" -msgstr "Moderovat obsah" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "Sada f_otografií:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "Soukromé fotografie" +msgid "_Privacy:" +msgstr "_Soukromí:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "Soukromé fotografie, viditelné pro rodinu" +msgid "Hi_de from public searches" +msgstr "S_krýt před veřejným hledáním" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Ochrana:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Private photos, visible to family and friends" msgstr "Soukromé fotografie, viditelné pro rodinu a přátele" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 -msgid "Restricted content" -msgstr "Chráněný obsah" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 -msgid "Safe content" -msgstr "Zabezpečený obsah" +msgid "Private photos, visible to family" +msgstr "Soukromé fotografie, viditelné pro rodinu" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos" +msgstr "Soukromé fotografie" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 -msgid "_Privacy:" -msgstr "_Soukromí:" +msgid "Safe content" +msgstr "Zabezpečený obsah" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 -msgid "_Safety:" -msgstr "_Ochrana:" +msgid "Moderate content" +msgstr "Moderovat obsah" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Restricted content" +msgstr "Chráněný obsah" + +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "_Import" msgstr "_Import" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:357 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:827 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "Nelze získat seznam fotografií" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:394 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:559 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:861 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1024 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 msgid "No album selected" msgstr "Není vybráno žádné album" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:577 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 #, c-format msgid "Import from %s" msgstr "Importovat z %s" -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1118 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 #: ../gthumb/gth-browser.c:2008 msgid "Could not save the file" msgstr "Nelze uložit soubor" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "Nelze pořídit snímek obrazovky" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1266 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 msgid "Save Image" msgstr "Uložení obrázku" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Snímek obrazovky" -#. this is an empty time +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Pomaleji" + #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "--:--" -msgstr "--:--" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +msgid "Play" +msgstr "Přehrát" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 -msgid "Change volume level" -msgstr "Změnit hlasitost" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Faster" msgstr "Rychleji" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:656 -msgid "Play" -msgstr "Přehrát" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Slower" -msgstr "Pomaleji" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Time:" msgstr "Čas:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--:--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Toggle volume" msgstr "Změnit hlasitost" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 -msgctxt "time" -msgid "/" -msgstr "/" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Změnit hlasitost" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 -#: ../extensions/photo_importer/dlg-photo-importer.c:614 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Vybrat složku" @@ -3017,29 +3025,29 @@ msgid "Play audio and video files." msgstr "Přehrávání zvukových a video souborů." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:93 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Snímek obrazovky" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:94 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Pořídit snímek obrazovky" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:633 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 msgid "Playing video" msgstr "Přehrávání videa" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:646 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Pause" msgstr "Pozastavit" #: ../extensions/gstreamer_tools/main.c:31 -#: ../gthumb/gth-main-default-tests.c:211 +#: ../gthumb/gth-main-default-tests.c:247 msgid "Video" msgstr "Video" #: ../extensions/gstreamer_tools/main.c:32 -#: ../gthumb/gth-main-default-tests.c:218 +#: ../gthumb/gth-main-default-tests.c:254 msgid "Audio" msgstr "Zvuk" @@ -3048,7 +3056,7 @@ msgstr "Umělec" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "Album" @@ -3070,13 +3078,13 @@ msgstr "Snímková rychlost" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 -#: ../extensions/image_viewer/gth-image-viewer-page.c:222 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Šířka" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "Výška" @@ -3098,10 +3106,10 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1318 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 #: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:429 -#: ../extensions/webalbums/gth-web-exporter.c:2456 +#: ../extensions/webalbums/dlg-web-exporter.c:442 +#: ../extensions/webalbums/gth-web-exporter.c:2446 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3114,94 +3122,94 @@ msgid "Print the selected images" msgstr "Vytisknout vybrané obrázky" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 msgid "Centered" msgstr "Na střed" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 -msgid "Image" -msgstr "Obrázek" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Left" -msgstr "Vlevo" - #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Position:" -msgstr "Poloha:" +msgid "The total number of files" +msgstr "Celkový počet souborů" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 -msgid "Preview" -msgstr "Náhled" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -msgid "Rotation:" -msgstr "Otočení:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 msgid "The event description" msgstr "Popis události" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "Řá_dků:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Obrázek" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Poloha:" + #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "The total number of files" -msgstr "Celkový počet souborů" +msgid "Left" +msgstr "Vlevo" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "Nahoru" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Otočení:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "Jednotky:" #: ../extensions/image_print/data/ui/print-layout.ui.h:28 -msgid "_Rows:" -msgstr "Řá_dků:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 -msgid "inches" -msgstr "palce" +msgid "Preview" +msgstr "Náhled" #: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "milimetry" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 -msgid "Fonts" -msgstr "Písma" +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "palce" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 msgid "Select Caption Font" msgstr "Výběr písma titulku" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -msgid "Select Footer Font" -msgstr "Výběr písma zápatí" - #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" msgstr "Výběr písma záhlaví" -#: ../extensions/image_print/gth-image-print-job.c:997 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Výběr písma zápatí" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Písma" + +#: ../extensions/image_print/gth-image-print-job.c:971 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Strana %d z %d" -#: ../extensions/image_print/gth-image-print-job.c:1761 -#: ../extensions/image_print/gth-image-print-job.c:1888 -#: ../extensions/image_print/gth-image-print-job.c:1925 +#: ../extensions/image_print/gth-image-print-job.c:1734 +#: ../extensions/image_print/gth-image-print-job.c:1861 +#: ../extensions/image_print/gth-image-print-job.c:1898 msgid "Could not print" msgstr "Nelze tisknout" -#: ../extensions/image_print/gth-image-print-job.c:1823 -#: ../gthumb/gth-main-default-tests.c:204 +#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Obrázky" -#: ../extensions/image_print/gth-image-print-job.c:1890 -#: ../gthumb/gth-image-loader.c:233 ../gthumb/gth-image-loader.c:306 +#: ../extensions/image_print/gth-image-print-job.c:1863 +#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 msgid "No suitable loader available for this file type" msgstr "" "Pro tento typ souboru není k dispozici žádný vhodný modul, který by jej " @@ -3214,19 +3222,19 @@ msgstr "Načítá se „%s“" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2695 +#: ../extensions/webalbums/gth-web-exporter.c:2685 msgid "Loading images" msgstr "Načítají se obrázky" #: ../extensions/image_print/image_print.extension.in.in.h:1 -msgid "Allow to print images choosing the page layout." -msgstr "Umožňuje tisk obrázků volbou rozvržení stránky." - -#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Image print" msgstr "Tisk obrázku" -#: ../extensions/image_print/preferences.c:76 +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "Umožňuje tisk obrázků volbou rozvržení stránky." + +#: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "Tisk" @@ -3234,31 +3242,31 @@ msgid "Rotate the selected images 90° to the right" msgstr "Otočit vybraný obrázek o 90° doprava" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" msgstr "Otočit vybraný obrázek o 90° doleva" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Fyzicky otočit" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" msgstr "" "Otočit vybrané obrázky podle orientace uvedené ve vložených informacích" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" msgstr "Vynulovat údaj EXIF o orientaci" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" msgstr "Vynulovat vložené informace o orientaci, aniž by se obrázek otáčel." #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2349 -#: ../extensions/webalbums/gth-web-exporter.c:2433 +#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Ukládám obrázky" @@ -3270,12 +3278,12 @@ msgid "Rotate images without data loss." msgstr "Otáčení obrázků beze ztráty kvality." -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "Problém při transformaci obrázku: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" "This transformation may introduce small image distortions along one or more " "edges, because the image dimensions are not multiples of 8.\n" @@ -3298,218 +3306,213 @@ "Můžete také odstranit problematické okrajové pixely. Tento režim dává v " "praxi nejlepší výsledky, transformace již ale není bezeztrátová." -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" msgstr "Oříznou_t" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "Souhl_asit se zkreslením" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -msgid "" -"Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, " -"fit-width, fit-width-if-larger." -msgstr "" -"Možné hodnoty jsou: actual_size (současná velikost), fit (přizpůsobit), " -"keep_prev (zachovat předchozí), fit_if_larger (přizpůsobit, když je větší), " -"fit_width_if_larger (přizpůsobit šířku, když je větší)." - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -msgid "Whether to resize the window to fit the size of the image" -msgstr "Zda změnit velikost okna, aby odpovídalo velikosti obrázku" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "Po načtení obrázku:" +msgid "Set to actual size" +msgstr "Nastavit na aktuální velikost" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Vysoká" +msgid "Keep previous zoom" +msgstr "Zachovat předchozí přiblížení" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Nízká" +msgid "Fit to window" +msgstr "Přizpůsobit oknu" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "Přizpůsobit oknu, když je větší" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 -msgid "Reset scrollbar positions" -msgstr "Posuvníky na začátek" +msgid "Fit to width" +msgstr "Přizpůsobit šířce" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 -msgid "Transparency _type:" -msgstr "_Typ průhlednosti:" +msgid "Fit to width if larger" +msgstr "Přizpůsobit šířce, když je větší" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Posuvníky na začátek" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "Po načtení obrázku:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "K_valita přibližování:" -#: ../extensions/image_viewer/gth-image-histogram.c:74 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "_Typ průhlednosti:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Vysoká" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Nízká" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Bílá" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Černá" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Šachovnice" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "Histogram" -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 msgid "Copy Image" msgstr "Kopírovat obrázek" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 msgid "Copy the image to the clipboard" msgstr "Kopírovat obrázek do schránky" -#: ../extensions/image_viewer/gth-image-viewer-page.c:197 +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 msgid "Paste Image" msgstr "Vložit obrázek" -#: ../extensions/image_viewer/gth-image-viewer-page.c:198 +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 msgid "Paste the image from the clipboard" msgstr "Vložit obrázek ze schránky" -#: ../extensions/image_viewer/gth-image-viewer-page.c:202 +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "Přiblížit" -#: ../extensions/image_viewer/gth-image-viewer-page.c:203 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Přiblížit" -#: ../extensions/image_viewer/gth-image-viewer-page.c:207 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Oddálit" -#: ../extensions/image_viewer/gth-image-viewer-page.c:208 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Oddálit" -#: ../extensions/image_viewer/gth-image-viewer-page.c:212 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:213 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Skutečná velikost" -#: ../extensions/image_viewer/gth-image-viewer-page.c:217 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Přizpůsobit" -#: ../extensions/image_viewer/gth-image-viewer-page.c:218 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Přizpůsobit velikosti okna" -#: ../extensions/image_viewer/gth-image-viewer-page.c:223 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Přizpůsobit šířce okna" -#: ../extensions/image_viewer/gth-image-viewer-page.c:230 -msgid "_Fit Window to Image" -msgstr "_Přizpůsobit okno obrázku" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:231 -msgid "Resize the window to the size of the image" -msgstr "Změnit velikost okna, aby odpovídalo velikosti obrázku" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -msgid "Basic image viewing." -msgstr "Základní prohlížení obrázků." - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Zobrazovač obrázků" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Nastavit na skutečnou velikost" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Přizpůsobit šířku" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Základní prohlížení obrázků." -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Zobrazovač" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "" -"Možné hodnoty jsou: none (nic), file_data (datum souboru), current_data " -"(dnešní datum)" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "_Cíl" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "" -"Možné hodnoty jsou: yyyymmdd, yyyymm, yyyy (yyyy představuje rok, mm měsíc a " -"dd den)" +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "_Automatická podsložka" #: ../extensions/importer/data/ui/import-preferences.ui.h:3 -msgid "The day of the month" -msgstr "Den v měsíci" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "Hodina" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "Minuty" +msgid "as _single subfolder" +msgstr "jako jednotlivé pod_složky" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "Měsíc" +msgid "The year" +msgstr "Rok" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "Sekundy" +msgid "The month" +msgstr "Měsíc" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "Rok" +msgid "The day of the month" +msgstr "Den v měsíci" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -msgid "_Automatic subfolder" -msgstr "_Automatická podsložka" +msgid "The hour" +msgstr "Hodina" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "_Cíl" +msgid "The minutes" +msgstr "Minuty" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -msgid "as _single subfolder" -msgstr "jako jednotlivé pod_složky" +msgid "The seconds" +msgstr "Sekundy" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "Neplatný cíl" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "příklad: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:326 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Datum souboru" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:336 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "rok-měsíc-den" -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "rok-měsíc" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "rok" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "vlastní formát" #: ../extensions/importer/gth-import-task.c:442 #: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:643 +#: ../extensions/importer/gth-import-task.c:648 msgid "Importing files" msgstr "Importují se soubory" @@ -3521,25 +3524,25 @@ msgid "The selected files are already present in the destination." msgstr "Vybrané soubory se již v cíli vyskytují." -#: ../extensions/importer/gth-import-task.c:619 -#: ../gthumb/gth-file-source-vfs.c:685 +#: ../extensions/importer/gth-import-task.c:622 +#: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Nelze smazat soubory" -#: ../extensions/importer/gth-import-task.c:620 +#: ../extensions/importer/gth-import-task.c:623 msgid "Delete operation not supported." msgstr "Operace mazání není podporována." -#: ../extensions/importer/gth-import-task.c:704 +#: ../extensions/importer/gth-import-task.c:709 msgid "Last imported" msgstr "Naposledy importováno" -#: ../extensions/importer/gth-import-task.c:839 +#: ../extensions/importer/gth-import-task.c:815 msgid "No file specified." msgstr "Není zadán žádný soubor." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:876 +#: ../extensions/importer/gth-import-task.c:852 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3548,17 +3551,15 @@ "Nedostatek volného místa na „%s“.\n" "Je požadováno %s místa, ale k dispozici je jen %s." -#: ../extensions/list_tools/callbacks.c:65 ../gthumb/gth-filterbar.c:303 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 msgid "Personalize..." msgstr "Přizpůsobit…" -#: ../extensions/list_tools/callbacks.c:238 -#: ../extensions/list_tools/callbacks.c:249 +#: ../extensions/list_tools/callbacks.c:320 msgid "Tools" msgstr "Nástroje" -#: ../extensions/list_tools/callbacks.c:240 -#: ../extensions/list_tools/callbacks.c:251 +#: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" msgstr "Dávkové příkazy pro více souborů" @@ -3567,97 +3568,97 @@ msgstr "Pře_skočit" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "Pří_kazy:" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "Příkazy" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "Pří_kazy:" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, no-c-format -msgid "%E" -msgstr "%E" +msgid "_Wait for the command to finish" +msgstr "Ček_at na dokončení příkazu" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "P_rovést příkaz samostatně pro každý soubor" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format -msgid "%N" -msgstr "%N" +msgid "_Terminal command (shell script)" +msgstr "_Terminálový příkaz (skript shellu)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "Kláves_ová zkratka:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +msgid "The file uri" +msgstr "URI souboru" -#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:7 -#, no-c-format -msgid "%ask{ message }{ default value }" -msgstr "%ask{ zpráva }{ výchozí hodnota }" +msgid "The file path" +msgstr "Cesta k souboru" -#. Translate only 'attribute name' -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#, no-c-format -msgid "%attr{ attribute name }" -msgstr "%attr{ název atributu }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "Základní název souboru" -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:13 -#, no-c-format -msgid "%quote{ text }" -msgstr "%quote{ text }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "Cesta k rodičovské složce" +#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:14 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 -msgid "A file attribute" -msgstr "Atribut souboru" +#, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "%ask{ zpráva }{ výchozí hodnota }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:15 msgid "Ask an input value" msgstr "Dotaz na vstupní hodnotu" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:17 -msgid "E_xecute command once for every file" -msgstr "P_rovést příkaz samostatně pro každý soubor" - +#. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 -msgid "Quote the text " -msgstr "Text do uvozovek" +#, no-c-format +msgid "%attr{ attribute name }" +msgstr "%attr{ název atributu }" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 -msgid "Sh_ortcut:" -msgstr "Kláves_ová zkratka:" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "Atribut souboru" #: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -msgid "The file basename" -msgstr "Základní název souboru" +#, no-c-format +msgid "%N" +msgstr "%N" #: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" msgstr "Základní název souboru bez přípony" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -msgid "The file extension" -msgstr "Přípona souboru" - #: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -msgid "The file path" -msgstr "Cesta k souboru" +#, no-c-format +msgid "%E" +msgstr "%E" #: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -msgid "The file uri" -msgstr "URI souboru" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "The parent folder path" -msgstr "Cesta k rodičovské složce" +msgid "The file extension" +msgstr "Přípona souboru" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "_Command:" -msgstr "Pří_kaz:" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ text }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "_Terminal command (shell script)" -msgstr "_Terminálový příkaz (skript shellu)" +msgid "Quote the text " +msgstr "Text do uvozovek" #: ../extensions/list_tools/data/ui/script-editor.ui.h:30 -msgid "_Wait for the command to finish" -msgstr "Ček_at na dokončení příkazu" +msgid "_Command:" +msgstr "Pří_kaz:" #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" @@ -3668,7 +3669,7 @@ msgstr "Klávesová zkratka" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "Zobrazit" @@ -3688,32 +3689,32 @@ msgid "Are you sure you want to delete the selected command?" msgstr "Opravdu chcete smazat vybraný příkaz?" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" msgstr "Zadejte hodnotu:" -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:570 -#: ../extensions/webalbums/gth-web-exporter.c:582 -#: ../extensions/webalbums/gth-web-exporter.c:590 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:560 +#: ../extensions/webalbums/gth-web-exporter.c:572 +#: ../extensions/webalbums/gth-web-exporter.c:580 msgid "Malformed command" msgstr "Nesprávně zadaný přikaz" -#: ../extensions/list_tools/gth-script-editor-dialog.c:176 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "nic" -#: ../extensions/list_tools/gth-script-editor-dialog.c:182 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "klávesa %d na číselné klávesnici" -#: ../extensions/list_tools/gth-script-editor-dialog.c:325 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "Není zadán příkaz" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "Příkaz skončil nenormálně se stavovým kódem %d" @@ -3726,33 +3727,33 @@ msgid "Scripting and batch manipulation of files." msgstr "Skriptování a dávkové zpracování souborů." -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "S" msgstr "J" -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "N" msgstr "S" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "W" msgstr "Z" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "E" msgstr "V" -#: ../extensions/map_view/gth-map-view.c:196 +#: ../extensions/map_view/gth-map-view.c:205 #: ../extensions/map_view/map_view.extension.in.in.h:1 msgid "Map" msgstr "Mapa" #. No GPS label -#: ../extensions/map_view/gth-map-view.c:265 +#: ../extensions/map_view/gth-map-view.c:276 msgid "The geographical position information is not available for this image." msgstr "" "Pro tento obrázek nejsou k dispozici žádné informace o geografické poloze." @@ -3770,39 +3771,39 @@ msgstr "Odeslat fotografie na Photobucket" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -msgid "1 megabyte file size" -msgstr "Velikost souboru 1 megabajt" +msgid "Tiny ( 100 x 75 )" +msgstr "Velmi malá (100 × 75)" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "15ʺ obrazovka (800 × 600)" +msgid "Small ( 160 x 120 )" +msgstr "Malá (160 × 120)" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "17ʺ obrazovka (1024 × 768)" +msgid "Medium ( 320 x 240 )" +msgstr "Střední (320 × 240)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 msgid "Large ( 640 x 480 )" msgstr "Velká (640 × 480)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "Střední (320 × 240)" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "15ʺ obrazovka (800 × 600)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 -msgid "Small ( 160 x 120 )" -msgstr "Malá (160 × 120)" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "17ʺ obrazovka (1024 × 768)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "Velmi malá (100 × 75)" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +msgid "1 megabyte file size" +msgstr "Velikost souboru 1 megabajt" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 msgid "_Scramble filenames" msgstr "_Změnit názvy souborů" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Kontejner:" @@ -3863,60 +3864,60 @@ msgstr "Importovat fotografie a jiné soubory ze složky" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "Po naimportování ze zařízení:" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 msgid "_Rotate the images physically" msgstr "Otáčet ob_rázky fyzicky" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "Po naimportování ze zařízení:" + #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../gthumb/gth-filterbar.c:413 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:414 msgid "S_how:" msgstr "_Zobrazit:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -msgid "_Delete the imported files from the source" -msgstr "_Smazat importované obrázky ze zdrojového místa" - #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "Š_títky:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "_Událost:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Tags:" -msgstr "Š_títky:" +msgid "_Delete the imported files from the source" +msgstr "_Smazat importované obrázky ze zdrojového místa" -#: ../extensions/photo_importer/dlg-photo-importer.c:222 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:173 +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 msgid "Could not import the files" msgstr "Nelze importovat soubory" #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:294 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "Soubory k importu: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:334 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" msgstr "Nelze načíst složku" -#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 #: ../gthumb/gth-browser.c:1921 msgid "Getting folder listing..." msgstr "Získává se výpis složky…" -#: ../extensions/photo_importer/dlg-photo-importer.c:410 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "Prázdné" -#: ../extensions/photo_importer/dlg-photo-importer.c:580 +#: ../extensions/photo_importer/dlg-photo-importer.c:586 msgid "Import from Removable Device" msgstr "Import z výměnného zařízení" -#: ../extensions/photo_importer/dlg-photo-importer.c:612 +#: ../extensions/photo_importer/dlg-photo-importer.c:618 msgid "Import from Folder" msgstr "Import ze složky" @@ -3929,7 +3930,7 @@ msgstr "Import fotografií z výměnných zařízení." #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." msgstr "Webové album _Picasa…" @@ -3937,61 +3938,61 @@ msgid "Download photos from Picasa Web Album" msgstr "Stáhnout fotografie z webového alba Picasa" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" msgstr "Odeslat fotografie do webového alba Picasa" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "Exportovat do webového alba Picasa" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "_Alba:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 msgid "Import from Picasa Web Album" msgstr "Importovat z webového alba Picasa" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 msgid "_Album:" msgstr "_Album:" #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 +msgid "_E-Mail:" +msgstr "_E-mail:" + +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 msgid "" "Type the characters you see in the picture below. Letters are not case-" "sensitive." msgstr "" "Opište znaky, které vidíte na obrázku níže. Velikost písmen není důležitá." -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "_E-Mail:" -msgstr "_E-mail:" - #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 msgid "_Password:" msgstr "_Heslo:" -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Veřejné" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:307 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "Nelze získat seznam alb" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:391 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" msgstr "Webové album Picasa" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:478 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "Účet" -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:133 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 msgid "Could not load the file" msgstr "Nelze načíst soubor" @@ -4003,39 +4004,27 @@ msgid "Upload images to Picasa Web Albums" msgstr "Odesílání obrázků do webových alb Picasa." -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: jpeg, jpg." -msgstr "Možné hodnoty jsou: jpeg, jpg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:2 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Možné hodnoty jsou: none, deflate, jpeg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:3 -msgid "Possible values are: tiff, tif." -msgstr "Možné hodnoty jsou: tiff, tif." - #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "Opti_malizovat" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 msgid "_Default extension:" msgstr "_Výchozí přípona:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "_Progresivní" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 msgid "_Quality:" msgstr "_Kvalita:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 msgid "_Smoothing:" msgstr "Vy_hlazování:" +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_malizovat" + +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progresivní" + #: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 msgid "Compression _level:" msgstr "Úroveň _komprimace:" @@ -4048,48 +4037,48 @@ msgid "_RLE compression" msgstr "Komprimace _RLE" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "Komprimace" - #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "Běžná (_Deflace)" +msgid "_No compression" +msgstr "_Bez komprimace" #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "Rozlišení" +msgid "No_rmal (Deflate)" +msgstr "Běžná (_Deflace)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 msgid "_Loss compression (JPEG)" msgstr "_Ztrátová komprimace (JPEG)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_No compression" -msgstr "_Bez komprimace" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +msgid "Compression" +msgstr "Komprimace" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 msgid "dpi" msgstr "dpi" -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:527 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +msgid "Resolution" +msgstr "Rozlišení" + +#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 msgid "JPEG" msgstr "JPEG" -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 +#: ../extensions/pixbuf_savers/gth-png-saver.c:140 msgid "PNG" msgstr "PNG" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 #: ../gthumb/gth-buffer-data.c:84 msgid "Insufficient memory" msgstr "Nedostatek paměti" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 msgid "TGA" msgstr "TGA" -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:542 +#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 msgid "TIFF" msgstr "TIFF" @@ -4102,30 +4091,30 @@ msgstr "Uložení obrázků v běžných formátech, jako jsou JPEG, PNG a TIFF." #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "Umožňuje načítat formát obrázků RAW." - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" msgstr "Podpora formátu RAW" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Umožňuje načítat formát obrázků RAW." + +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_Y:" msgstr "_Y:" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." -msgstr "Odstranění če_rvených očí…" +msgstr "Odstranit červené oči…" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "Odstranění červených očí" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:470 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" msgstr "Odstraní efekt červených očí způsobený bleskem fotoaparátu" @@ -4137,148 +4126,134 @@ msgid "Tool to remove the red-eye effect from a photo." msgstr "Nástroj na odstranění efektu červených očí z fotografie." -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "" -"Possible values include: general::unsorted, file::name, file::size, file::" -"mtime, exif::photo::datetimeoriginal" -msgstr "" -"Možné hodnoty zahrnují: general::unsorted (obecné, neseřazené), file::name " -"(název souboru), file::size (velikost souboru), file::mtime (čas souboru), " -"exif::photo::datetimeoriginal (čas pořízení fotografie podle exif)" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "" -"Možné hodnoty jsou: 0 (beze změny), 1 (malá písmena), 2 (velká písmena)" - #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -msgid "add" -msgstr "Přidat" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "digits" msgstr "číslic" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "format:" msgstr "formát:" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 msgid "remove" msgstr "Odebrat" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, no-c-format -msgid "%A{ identifier }" -msgstr "%A{ identifikátor }" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "Přidat" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, no-c-format -msgid "%M{ format }" -msgstr "%M{ formát }" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Přejmenovat" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" msgstr "V_elikost písmen:" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 msgid "Edit template" msgstr "Upravit šablonu" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Re_verse Order" -msgstr "_Obrácené pořadí" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Původní název souboru" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -msgid "Rename" -msgstr "Přejmenovat" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "Původní přípona" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 -msgid "The digitalization date" -msgstr "Datum digitalizace" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "Čítač původního" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ formát }" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 msgid "The modification date" msgstr "Datum změny" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -msgid "The original enumerator" -msgstr "Čítač původního" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 -msgid "The original extension" -msgstr "Původní přípona" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "Datum digitalizace" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "The original filename" -msgstr "Původní název souboru" +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ identifikátor }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "Ša_blona:" -#: ../extensions/rename_series/dlg-rename-series.c:64 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "_Obrácené pořadí" + +#: ../extensions/rename_series/dlg-rename-series.c:58 msgid "Enumerator" msgstr "Čítač" -#: ../extensions/rename_series/dlg-rename-series.c:65 +#: ../extensions/rename_series/dlg-rename-series.c:59 msgid "Original filename" msgstr "Původní název souboru" -#: ../extensions/rename_series/dlg-rename-series.c:66 +#: ../extensions/rename_series/dlg-rename-series.c:60 msgid "Original extension" msgstr "Původní přípona" -#: ../extensions/rename_series/dlg-rename-series.c:67 +#: ../extensions/rename_series/dlg-rename-series.c:61 msgid "Original enumerator" msgstr "Čítač původního" -#: ../extensions/rename_series/dlg-rename-series.c:68 +#: ../extensions/rename_series/dlg-rename-series.c:62 msgid "Modification date" msgstr "Datum změny" -#: ../extensions/rename_series/dlg-rename-series.c:69 +#: ../extensions/rename_series/dlg-rename-series.c:63 msgid "Digitalization date" msgstr "Datum digitalizace" -#: ../extensions/rename_series/dlg-rename-series.c:70 +#: ../extensions/rename_series/dlg-rename-series.c:64 msgid "File attribute" msgstr "Atribut souboru" -#: ../extensions/rename_series/dlg-rename-series.c:556 -#: ../extensions/rename_series/dlg-rename-series.c:687 +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 msgid "Could not rename the files" msgstr "Nelze přejmenovat soubory" -#: ../extensions/rename_series/dlg-rename-series.c:784 +#: ../extensions/rename_series/dlg-rename-series.c:780 msgid "Could not save the template" msgstr "Nelze uložit šablonu" -#: ../extensions/rename_series/dlg-rename-series.c:802 +#: ../extensions/rename_series/dlg-rename-series.c:798 msgid "Edit Template" msgstr "Úprava šablony" -#: ../extensions/rename_series/dlg-rename-series.c:859 +#: ../extensions/rename_series/dlg-rename-series.c:856 msgid "Old Name" msgstr "Starý název" -#: ../extensions/rename_series/dlg-rename-series.c:870 +#: ../extensions/rename_series/dlg-rename-series.c:867 msgid "New Name" msgstr "Nový název" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:944 msgid "Keep original case" msgstr "Zachovat původní velikost písmen" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:945 msgid "Convert to lower-case" msgstr "Převést na malá písmena" -#: ../extensions/rename_series/dlg-rename-series.c:947 +#: ../extensions/rename_series/dlg-rename-series.c:946 msgid "Convert to upper-case" msgstr "Převést na velká písmena" @@ -4296,42 +4271,42 @@ #: ../extensions/resize_images/callbacks.c:45 msgid "Resize Images..." -msgstr "Změnit velikost obrázku…" +msgstr "Změnit velikost obrázků…" #: ../extensions/resize_images/callbacks.c:46 msgid "Resize the selected images" msgstr "Změnit velikost vybraných obrázků" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Formát" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Změnit velikost obrázků" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 msgid "New dimensions" msgstr "Nové rozměry" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "Resize Images" -msgstr "Změnit velikost obrázků" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "_Výška:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" msgstr "Zachovat _původní poměr stran" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Formát" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "pixel" msgstr "bodů" -#: ../extensions/resize_images/dlg-resize-images.c:163 +#: ../extensions/resize_images/dlg-resize-images.c:168 msgid "Resizing images" msgstr "Mění se velikost obrázků" -#: ../extensions/resize_images/dlg-resize-images.c:358 +#: ../extensions/resize_images/dlg-resize-images.c:412 msgid "Keep the original format" msgstr "Zachovat původní formát" @@ -4360,23 +4335,23 @@ msgid "Find files" msgstr "Hledat soubory" -#: ../extensions/search/callbacks.c:133 +#: ../extensions/search/callbacks.c:132 msgid "Search again" msgstr "Hledat znovu" #. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/callbacks.c:174 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "Hledání" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:195 +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "všechna následující pravidla" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:196 +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "libovolné z následujících pravidel" @@ -4385,18 +4360,56 @@ msgid "Files found until now: %s" msgstr "Doposud nalezené soubory: %s" -#: ../extensions/search/gth-search-task.c:270 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "Hledá se…" -#: ../extensions/search/gth-search-task.c:276 +#: ../extensions/search/gth-search-task.c:277 msgid "Cancel the operation" msgstr "Zrušit operaci" -#: ../extensions/search/search.extension.in.in.h:1 +#: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." msgstr "Nástroj na vyhledávání souborů." +#: ../extensions/selections/callbacks.c:62 +msgid "Add to _Selection" +msgstr "Přidat do vý_běru" + +#: ../extensions/selections/callbacks.c:65 +msgid "Selection 1" +msgstr "Výběr 1" + +#: ../extensions/selections/callbacks.c:70 +msgid "Selection 2" +msgstr "Výběr 2" + +#: ../extensions/selections/callbacks.c:75 +msgid "Selection 3" +msgstr "Výběr 3" + +#: ../extensions/selections/callbacks.c:180 +#, c-format +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" +"Použijte Alt-%d pro přidání souborů do tohoto výběru, Ctrl-%d pro zobrazení " +"tohoto výběru." + +#: ../extensions/selections/gth-selections-manager.c:250 +#, c-format +msgid "Selection %d" +msgstr "Výběr %d" + +#: ../extensions/selections/gth-selections-manager.c:253 +#: ../extensions/selections/selections.extension.in.in.h:1 +msgid "Selections" +msgstr "Výběry" + +#: ../extensions/selections/selections.extension.in.in.h:2 +msgid "Advanced file selection." +msgstr "Pokročilý výběr souboru." + #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" msgstr "Promítání _snímků" @@ -4405,59 +4418,59 @@ msgid "View as a slideshow" msgstr "Zobrazit jako promítání snímků" -#: ../extensions/slideshow/callbacks.c:406 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "Promítání snímků" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -msgid "Add files to the playlist" -msgstr "Přidat soubory do seznamu přehrávání" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "Seznam přehrávání" +msgid "_Personalize" +msgstr "_Přizpůsobit" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "Náhodné poř_adí" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "Odstranit vybrané soubory" +msgid "_Transition effect:" +msgstr "_Přechodový efekt:" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "_Změnit automaticky každých" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "Po _skončení začít znovu" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "_Přizpůsobit" +msgid "R_andom order" +msgstr "Náhodné poř_adí" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "Po _skončení začít znovu" +msgid "Playlist" +msgstr "Seznam přehrávání" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 -msgid "_Transition effect:" -msgstr "_Přechodový efekt:" +msgid "Add files to the playlist" +msgstr "Přidat soubory do seznamu přehrávání" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Odstranit vybrané soubory" #: ../extensions/slideshow/gth-slideshow.c:229 msgid "Playing slideshow" msgstr "Promítání snímků" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 msgid "Choose the files to play" msgstr "Vyberte soubory k přehrávání" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 msgid "Audio files" msgstr "Zvukové soubory" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 msgid "Random" msgstr "Náhodně" @@ -4523,12 +4536,12 @@ msgstr "Index" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "Následující" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:105 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "Předchozí" @@ -4553,169 +4566,176 @@ msgid "View the previous page" msgstr "Zobrazit předchozí stránku" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Všechny obrázky v jednom obrázku" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 +msgid "Adapts to the window width" +msgstr "Přizpůsobovat šířce okna" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Webové album" + #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 #, no-c-format msgid "%P" msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 -msgid "Adapts to the window width" -msgstr "Přizpůsobovat šířce okna" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 -msgid "All images on a single image" -msgstr "Všechny obrázky v jednom obrázku" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Kopírovat originály do cíle" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 -msgid "Image Attributes" -msgstr "Atributy obrázku" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Z_menšit, je-li větší než:" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "Image Page" -msgstr "Stránka s obrázky" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "_Adapt to the window width " +msgstr "_Přizpůsobit šířce okna" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 msgid "Index Page" msgstr "Stránka s indexem" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Show the description, if available" -msgstr "Zobrazit popis, pokud je k dispozici" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Show the following attributes:" -msgstr "Zobrazit následující atributy:" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "Titulek náhledu" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 msgid "The current image number" msgstr "Číslo aktuálního obrázku" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -msgid "The file comment" -msgstr "Komentář souboru" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "The total number of images" msgstr "Celkový počet obrázků" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "Thumbnail Caption" -msgstr "Titulek náhledu" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +msgid "The file comment" +msgstr "Komentář souboru" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 -msgid "Web Album" -msgstr "Webové album" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "Stránka s obrázky" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "_Adapt to the window width " -msgstr "_Přizpůsobit šířce okna" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "Zobrazit popis, pokud je k dispozici" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "_Copy originals to destination" -msgstr "_Kopírovat originály do cíle" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "Zobrazit následující atributy:" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -msgid "_Resize if larger than:" -msgstr "Z_menšit, je-li větší než:" +msgid "Image Attributes" +msgstr "Atributy obrázku" -#: ../extensions/webalbums/gth-web-exporter.c:1812 +#: ../extensions/webalbums/gth-web-exporter.c:1802 msgid "Could not show the destination" msgstr "Nelze zobrazit cíl" -#: ../extensions/webalbums/gth-web-exporter.c:1848 +#: ../extensions/webalbums/gth-web-exporter.c:1838 msgid "The album has been created successfully." msgstr "Album bylo úspěšně vytvořeno." -#: ../extensions/webalbums/gth-web-exporter.c:2116 -#: ../extensions/webalbums/gth-web-exporter.c:2143 +#: ../extensions/webalbums/gth-web-exporter.c:2106 +#: ../extensions/webalbums/gth-web-exporter.c:2133 msgid "Saving thumbnails" msgstr "Ukládají se náhledy" -#: ../extensions/webalbums/gth-web-exporter.c:2171 +#: ../extensions/webalbums/gth-web-exporter.c:2161 msgid "Saving HTML pages: Images" msgstr "Ukládám stránky HTML: Obrázky" -#: ../extensions/webalbums/gth-web-exporter.c:2229 +#: ../extensions/webalbums/gth-web-exporter.c:2219 msgid "Saving HTML pages: Indexes" msgstr "Ukládám stránky HTML: Indexy" -#: ../extensions/webalbums/gth-web-exporter.c:2512 +#: ../extensions/webalbums/gth-web-exporter.c:2502 msgid "Copying original images" msgstr "Kopírování originálních obrázků" -#: ../extensions/webalbums/gth-web-exporter.c:2938 +#: ../extensions/webalbums/gth-web-exporter.c:2929 msgid "Could not find the style folder" msgstr "Nelze najít složku se styly" -#: ../extensions/webalbums/gth-web-exporter.c:2971 +#: ../extensions/webalbums/gth-web-exporter.c:2967 msgid "Could not create a temporary folder" msgstr "Nelze vytvořit dočasný adresář" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Webová alba" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Create static web albums." msgstr "Vytváření statických webových alb." -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 -msgid "Web Albums" -msgstr "Webová alba" +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1250 +#: ../gthumb/gth-browser.c:1809 ../gthumb/gth-browser.c:5899 +#: ../gthumb/gth-browser.c:5918 ../gthumb/gth-browser.c:5942 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Nelze načíst polohu „%s“" -#: ../gthumb/dlg-personalize-filters.c:236 +#: ../gthumb/dlg-personalize-filters.c:237 msgid "Filter" msgstr "Filtr" -#: ../gthumb/dlg-personalize-filters.c:314 +#: ../gthumb/dlg-personalize-filters.c:315 msgid "Could not save the filter" msgstr "Nelze uložit filtr" -#: ../gthumb/dlg-personalize-filters.c:357 +#: ../gthumb/dlg-personalize-filters.c:358 msgid "New Filter" msgstr "Nový filtr" -#: ../gthumb/dlg-personalize-filters.c:386 +#: ../gthumb/dlg-personalize-filters.c:387 msgid "Edit Filter" msgstr "Upravit filtr" -#: ../gthumb/dlg-preferences-extensions.c:68 ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 msgid "All" msgstr "Vše" -#: ../gthumb/dlg-preferences-extensions.c:69 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" msgstr "Povolená" -#: ../gthumb/dlg-preferences-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" msgstr "Zakázaná" -#: ../gthumb/dlg-preferences-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" msgstr "Zobrazovače" -#: ../gthumb/dlg-preferences-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "Metadata" -#: ../gthumb/dlg-preferences-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "Práce se soubory" -#: ../gthumb/dlg-preferences-extensions.c:76 +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "Práce se seznamy" -#: ../gthumb/dlg-preferences-extensions.c:77 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "Importování" -#: ../gthumb/dlg-preferences-extensions.c:78 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" msgstr "Exportování" -#: ../gthumb/dlg-preferences-extensions.c:215 +#: ../gthumb/dlg-preferences-extensions.c:216 msgid "Could not activate the extension" msgstr "Nelze aktivovat rozšíření" -#: ../gthumb/dlg-preferences-extensions.c:225 +#: ../gthumb/dlg-preferences-extensions.c:226 msgid "Could not deactivate the extension" msgstr "Nelze deaktivovat rozšíření" @@ -4745,7 +4765,7 @@ msgid "File _Format: %s" msgstr "_Formát souboru: %s" -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:197 +#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 msgid "All Files" msgstr "Všechny soubory" @@ -4781,30 +4801,30 @@ msgstr "Formát souboru nebyl rozpoznán" #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1355 +#: ../gthumb/gio-utils.c:1351 #, c-format msgid "%s of %s" msgstr "%s z %s" -#: ../gthumb/gio-utils.c:1390 +#: ../gthumb/gio-utils.c:1386 #, c-format msgid "Moving \"%s\" to \"%s\"" msgstr "Přesouvá se „%s“ do „%s“" -#: ../gthumb/gio-utils.c:1392 +#: ../gthumb/gio-utils.c:1388 #, c-format msgid "Copying \"%s\" to \"%s\"" msgstr "Kopíruje se „%s“ do „%s“" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Moving files" msgstr "Přesouvají se soubory" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Copying files" msgstr "Kopírují se soubory" -#: ../gthumb/gio-utils.c:1734 +#: ../gthumb/gio-utils.c:1751 msgid "Getting file information" msgstr "Získávají se informace o souboru" @@ -4814,7 +4834,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2749 +#: ../gthumb/glib-utils.c:2848 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4826,13 +4846,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2758 +#: ../gthumb/glib-utils.c:2857 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:361 +#: ../gthumb/gth-browser-actions-callbacks.c:400 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4844,7 +4864,7 @@ "Software Foundation, a to buď ve verzi 2 této licence nebo (dle vaší volby) " "v libovolné novější verzi." -#: ../gthumb/gth-browser-actions-callbacks.c:365 +#: ../gthumb/gth-browser-actions-callbacks.c:404 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -4855,7 +4875,7 @@ "bez předpokládané záruky na PRODEJNOST nebo VHODNOST PRO KONKRÉTNÍ ÚČEL. " "Více podrobností najdete přímo v licenci GNU General Public License." -#: ../gthumb/gth-browser-actions-callbacks.c:369 +#: ../gthumb/gth-browser-actions-callbacks.c:408 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." @@ -4864,11 +4884,11 @@ "License. Pokud se tak nestalo, podívejte se na ." -#: ../gthumb/gth-browser-actions-callbacks.c:388 +#: ../gthumb/gth-browser-actions-callbacks.c:427 msgid "An image viewer and browser for GNOME." msgstr "Prohlížeč obrázků pro prostředí GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:391 +#: ../gthumb/gth-browser-actions-callbacks.c:430 msgid "translator_credits" msgstr "" "Michal Bukovjan \n" @@ -4876,204 +4896,221 @@ "Kamil Páral \n" "Marek Černocký " -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_Soubor" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" -msgstr "Ú_pravy" +msgstr "_Upravit" -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "Pře_jít" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "Nápo_věda" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" msgstr "_Otevřít pomocí" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" msgstr "I_mportovat z" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" msgstr "E_xportovat do" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" msgstr "No_vé okno" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" msgstr "Otevřít další okno" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Otevřít" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "Otevřít v novém okně" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "Upravit různé předvolby" -#: ../gthumb/gth-browser-actions-entries.h:85 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." msgstr "Řa_dit podle…" -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." msgstr "_Filtr…" -#: ../gthumb/gth-browser-actions-entries.h:96 +#: ../gthumb/gth-browser-actions-entries.h:108 msgid "Stop loading the current location" msgstr "Zastavit načítání současného místa" -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:114 msgid "Reload the current location" msgstr "Znovu načíst současné umístění" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" msgstr "Zobrazit předchozí obrázek" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "Zobrazit následující obrázek" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "Přepnout na celou obrazovku" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" msgstr "Opustit celou obrazovku" -#: ../gthumb/gth-browser-actions-entries.h:126 ../gthumb/gth-browser.c:3647 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3586 msgid "Go to the previous visited location" msgstr "Přejít na předchozí navštívené místo" -#: ../gthumb/gth-browser-actions-entries.h:131 ../gthumb/gth-browser.c:3668 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3604 msgid "Go to the next visited location" msgstr "Přejít na následující navštívené místo" -#: ../gthumb/gth-browser-actions-entries.h:136 ../gthumb/gth-browser.c:3689 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3622 msgid "Go up one level" msgstr "Přejít o úroveň výše" -#: ../gthumb/gth-browser-actions-entries.h:145 ../gthumb/gth-browser.c:667 +#: ../gthumb/gth-browser-actions-entries.h:161 +msgid "_Location..." +msgstr "U_místění…" + +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "Určit umístění, které se má otevřít" + +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:672 msgid "_Delete History" msgstr "O_dstranit historii" -#: ../gthumb/gth-browser-actions-entries.h:146 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "Delete the list of visited locations" msgstr "Vymazat seznam navštívených míst" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "View the folders" msgstr "Zobrazit složky" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Show information about gthumb" msgstr "Zobrazit informace o aplikaci gthumb" -#: ../gthumb/gth-browser-actions-entries.h:160 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "Contents" msgstr "Obsah" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:192 msgid "Display the gthumb Manual" msgstr "Zobrazit příručku gthumb" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:197 msgid "_Keyboard Shortcuts" msgstr "_Klávesové zkratky" -#: ../gthumb/gth-browser-actions-entries.h:174 +#: ../gthumb/gth-browser-actions-entries.h:206 msgid "_Toolbar" msgstr "Lišta _nástrojů" -#: ../gthumb/gth-browser-actions-entries.h:175 +#: ../gthumb/gth-browser-actions-entries.h:207 msgid "View or hide the toolbar of this window" msgstr "Zobrazit nebo skrýt lištu nástrojů tohoto okna" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:211 msgid "_Statusbar" msgstr "_Stavová lišta" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "View or hide the statusbar of this window" msgstr "Zobrazit nebo skrýt stavovou lištu tohoto okna" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:216 msgid "_Filterbar" msgstr "Lišta _filtru" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "View or hide the filterbar of this window" msgstr "Zobrazit nebo skrýt lištu s filtrem tohoto okna" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:221 msgid "_Sidebar" msgstr "Po_stranní panel" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "View or hide the sidebar of this window" msgstr "Zobrazit nebo skrýt postranní panel tohoto okna" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:226 msgid "_Thumbnail Pane" msgstr "Panel s ná_hledy" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Zobrazit nebo skrýt panel s náhledy v režimu zobrazení" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:231 msgid "_Thumbnails" msgstr "Ná_hledy" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "View thumbnails" msgstr "Zobrazit náhledy" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:236 msgid "_Hidden Files" msgstr "S_kryté soubory" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "Show hidden files and folders" msgstr "Zobrazit skryté soubory a složky" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:242 +#: ../gthumb/gth-browser-actions-entries.h:247 msgid "View file properties" msgstr "Zobrazit vlastnosti souboru" -#: ../gthumb/gth-browser-actions-entries.h:214 +#: ../gthumb/gth-browser-actions-entries.h:251 msgid "Edit" msgstr "Upravit" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:252 msgid "Edit file" msgstr "Upravit soubor" -#: ../gthumb/gth-browser.c:363 +#: ../gthumb/gth-browser-actions-entries.h:256 +msgid "_Fit Window to Image" +msgstr "_Přizpůsobit okno obrázku" + +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Resize the window to the size of the image" +msgstr "Změnit velikost okna, aby odpovídalo velikosti obrázku" + +#: ../gthumb/gth-browser.c:369 #, c-format msgid "Open %s" msgstr "Otevřít %s" -#: ../gthumb/gth-browser.c:503 +#: ../gthumb/gth-browser.c:509 msgid "[modified]" msgstr "[změněno]" -#: ../gthumb/gth-browser.c:991 +#: ../gthumb/gth-browser.c:1006 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" @@ -5081,18 +5118,11 @@ msgstr[1] "Vybrány %d soubory (%s)" msgstr[2] "Vybráno %d souborů (%s)" -#: ../gthumb/gth-browser.c:1026 +#: ../gthumb/gth-browser.c:1041 #, c-format msgid "%s of free space" msgstr "%s volného místa" -#: ../gthumb/gth-browser.c:1235 ../gthumb/gth-browser.c:1809 -#: ../gthumb/gth-browser.c:5797 ../gthumb/gth-browser.c:5816 -#: ../gthumb/gth-browser.c:5841 -#, c-format -msgid "Could not load the position \"%s\"" -msgstr "Nelze načíst polohu „%s“" - #: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:1932 #, c-format msgid "No suitable module found for %s" @@ -5111,67 +5141,66 @@ msgid "Do _Not Save" msgstr "_Neukládat" -#: ../gthumb/gth-browser.c:2863 ../gthumb/gth-browser.c:2883 -#: ../gthumb/gth-source-tree.c:178 ../gthumb/gth-source-tree.c:200 +#: ../gthumb/gth-browser.c:2828 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Nelze změnit název" -#: ../gthumb/gth-browser.c:3328 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3257 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Změněno" -#: ../gthumb/gth-browser.c:3648 ../gthumb/gth-browser.c:3669 +#: ../gthumb/gth-browser.c:3587 ../gthumb/gth-browser.c:3605 msgid "View the list of visited locations" msgstr "Zobrazit seznam navštívených míst" -#: ../gthumb/gth-browser.c:3690 +#: ../gthumb/gth-browser.c:3623 msgid "View the list of upper locations" msgstr "Zobrazit seznam nadřízených míst" -#: ../gthumb/gth-browser.c:5798 +#: ../gthumb/gth-browser.c:5900 #, c-format msgid "File type not supported" msgstr "Typ souboru není podporován" -#: ../gthumb/gth-browser.c:5842 +#: ../gthumb/gth-browser.c:5943 #, c-format msgid "No suitable module found" msgstr "Nenalezen žádný použitelný modul" -#: ../gthumb/gth-extensions.c:228 +#: ../gthumb/gth-extensions.c:203 #, c-format msgid "Could not open the module `%s`: %s" msgstr "Nelze otevřít modul „%s“: %s" -#: ../gthumb/gth-extensions.c:831 +#: ../gthumb/gth-extensions.c:744 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Rozšíření „%1$s“ je vyžadováno rozšířením „%2$s“" -#: ../gthumb/gth-file-source-vfs.c:116 +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Domovská složka" -#: ../gthumb/gth-file-source-vfs.c:121 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" msgstr "Systém souborů" -#: ../gthumb/gth-file-source-vfs.c:730 +#: ../gthumb/gth-file-source-vfs.c:739 msgid "" "The files cannot be moved to the Trash. Do you want to delete them " "permanently?" msgstr "Soubory nelze přesunout do koše. Chcete je odstranit natrvalo?" -#: ../gthumb/gth-file-source-vfs.c:741 +#: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" msgstr "Soubory nelze přesunout do koše" -#: ../gthumb/gth-file-source-vfs.c:785 +#: ../gthumb/gth-file-source-vfs.c:797 #, c-format msgid "Are you sure you want to move \"%s\" to trash?" msgstr "Opravdu chcete „%s“ přesunout do koše?" -#: ../gthumb/gth-file-source-vfs.c:788 +#: ../gthumb/gth-file-source-vfs.c:801 #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" @@ -5179,7 +5208,7 @@ msgstr[1] "Opravdu chcete %'d vybrané soubory přesunout do koše?" msgstr[2] "Opravdu chcete %'d vybraných souborů přesunout do koše?" -#: ../gthumb/gth-file-source-vfs.c:829 +#: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" msgid_plural "" @@ -5188,84 +5217,84 @@ msgstr[1] "Opravdu chcete trvale smazat %'d vybrané soubory?" msgstr[2] "Opravdu chcete trvale smazat %'d vybraných souborů?" -#: ../gthumb/gth-filterbar.c:405 +#: ../gthumb/gth-filterbar.c:406 msgid "Hide the filterbar" msgstr "Skrýt panel filtru" -#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" -#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "MB" -#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:279 ../gthumb/gth-filter-editor-dialog.c:207 +#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "souborů" -#: ../gthumb/gth-filter-editor-dialog.c:254 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" msgstr "vzestupně" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" msgstr "sestupně" -#: ../gthumb/gth-filter-editor-dialog.c:545 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "Nezadána žádná omezení" -#: ../gthumb/gth-folder-tree.c:848 +#: ../gthumb/gth-folder-tree.c:857 msgid "Loading..." msgstr "Načítá se…" -#: ../gthumb/gth-folder-tree.c:1119 +#: ../gthumb/gth-folder-tree.c:1100 msgid "(Open Parent)" msgstr "(Otevřít rodiče)" -#: ../gthumb/gth-histogram-view.c:800 +#: ../gthumb/gth-histogram-view.c:826 msgid "Linear scale" msgstr "Lineární měřítko" -#: ../gthumb/gth-histogram-view.c:812 +#: ../gthumb/gth-histogram-view.c:838 msgid "Logarithmic scale" msgstr "Logaritmické měřítko" -#: ../gthumb/gth-histogram-view.c:832 +#: ../gthumb/gth-histogram-view.c:858 msgid "Channel:" msgstr "Kanál:" -#: ../gthumb/gth-histogram-view.c:864 +#: ../gthumb/gth-histogram-view.c:890 msgid "Value" msgstr "Hodnota" -#: ../gthumb/gth-histogram-view.c:870 +#: ../gthumb/gth-histogram-view.c:896 msgid "Red" msgstr "Červená" -#: ../gthumb/gth-histogram-view.c:876 +#: ../gthumb/gth-histogram-view.c:902 msgid "Green" msgstr "Zelená" -#: ../gthumb/gth-histogram-view.c:882 +#: ../gthumb/gth-histogram-view.c:908 msgid "Blue" msgstr "Modrá" -#: ../gthumb/gth-histogram-view.c:888 +#: ../gthumb/gth-histogram-view.c:914 msgid "Alpha" msgstr "Průhlednost" -#: ../gthumb/gth-histogram-view.c:895 +#: ../gthumb/gth-histogram-view.c:921 msgid "RGB" msgstr "RGB" @@ -5282,7 +5311,7 @@ msgstr "Název" #: ../gthumb/gth-main-default-metadata.c:40 -#: ../gthumb/gth-main-default-tests.c:248 +#: ../gthumb/gth-main-default-tests.c:284 msgid "Size" msgstr "Velikost" @@ -5322,23 +5351,23 @@ msgid "dimensions" msgstr "rozměrů" -#: ../gthumb/gth-main-default-tests.c:225 +#: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Média" -#: ../gthumb/gth-main-default-tests.c:232 +#: ../gthumb/gth-main-default-tests.c:268 msgid "Text Files" msgstr "Textové soubory" -#: ../gthumb/gth-main-default-tests.c:240 +#: ../gthumb/gth-main-default-tests.c:276 msgid "Filename" msgstr "Název souboru" -#: ../gthumb/gth-main-default-tests.c:272 +#: ../gthumb/gth-main-default-tests.c:308 msgid "Title (embedded)" msgstr "Název (vložený)" -#: ../gthumb/gth-main-default-tests.c:278 +#: ../gthumb/gth-main-default-tests.c:316 msgid "Description (embedded)" msgstr "Popis (vložený)" @@ -5350,7 +5379,7 @@ msgid "No options available for this file type" msgstr "Pro tento typ souboru nejsou dostupné žádné volby" -#: ../gthumb/gth-progress-dialog.c:142 +#: ../gthumb/gth-progress-dialog.c:144 msgid "Cancel operation" msgstr "Zrušit operaci" @@ -5358,60 +5387,60 @@ msgid "Saving file information" msgstr "Ukládají se informace o souboru" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-tags-entry.c:388 #, c-format msgid "Create tag «%s»" msgstr "Vytvořit štítek „%s“" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:735 msgid "Show all the tags" msgstr "Zobrazit všechny štítky" -#: ../gthumb/gth-tags-file.c:234 +#: ../gthumb/gth-tags-file.c:236 msgid "Holidays" msgstr "Dovolená" -#: ../gthumb/gth-tags-file.c:235 +#: ../gthumb/gth-tags-file.c:237 msgid "Temporary" msgstr "Dočasné" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:238 msgid "Screenshots" msgstr "Snímky obrazovky" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:239 msgid "Science" msgstr "Věda" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:240 msgid "Favorite" msgstr "Oblíbené" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:241 msgid "Important" msgstr "Důležité" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:242 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:243 msgid "Games" msgstr "Hry" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:244 msgid "Party" msgstr "Večírek" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:245 msgid "Birthday" msgstr "Narozeniny" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:246 msgid "Astronomy" msgstr "Astronomie" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:247 msgid "Family" msgstr "Rodina" @@ -5429,18 +5458,18 @@ msgid "is not" msgstr "není" -#: ../gthumb/gth-test-category.c:374 ../gthumb/gth-test-simple.c:800 -#: ../gthumb/gth-test-simple.c:826 ../gthumb/gth-test-simple.c:847 -#: ../gthumb/gth-test-simple.c:873 +#: ../gthumb/gth-test-category.c:394 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "Definice testu je neúplná" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:252 msgid "Add a new rule" msgstr "Přidat nové pravidlo" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:263 msgid "Remove this rule" msgstr "Odstranit toto pravidlo" @@ -5484,11 +5513,11 @@ msgid "is after" msgstr "je za" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:477 msgid "Today" msgstr "Dnes" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:485 msgid "Now" msgstr "Nyní" @@ -5500,52 +5529,51 @@ msgid "Close _All Windows" msgstr "Zavřít všechn_a okna" -#: ../gthumb/gtk-utils.c:704 +#: ../gthumb/gtk-utils.c:551 msgid "Could not display help" msgstr "Nelze zobrazit nápovědu" -#: ../gthumb/gtk-utils.c:991 ../gthumb/gtk-utils.c:1000 +#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 msgid "Could not launch the application" msgstr "Nelze spustit aplikaci" -#: ../gthumb/gtk-utils.c:1103 +#: ../gthumb/gtk-utils.c:978 msgid "_Copy Here" msgstr "_Kopírovat sem" -#: ../gthumb/gtk-utils.c:1108 +#: ../gthumb/gtk-utils.c:983 msgid "_Move Here" msgstr "Přesunout se_m" -#: ../gthumb/gtk-utils.c:1113 +#: ../gthumb/gtk-utils.c:988 msgid "_Link Here" msgstr "Vytvořit zde _odkaz" -#: ../gthumb/gtk-utils.c:1122 +#: ../gthumb/gtk-utils.c:997 msgid "Cancel" msgstr "Zrušit" -#: ../gthumb/main.c:72 +#: ../gthumb/main.c:59 msgid "Open a new window" msgstr "Otevřít nové okno" -#: ../gthumb/main.c:76 +#: ../gthumb/main.c:63 msgid "Start in fullscreen mode" msgstr "Začít v režimu celé obrazovky" -#: ../gthumb/main.c:80 +#: ../gthumb/main.c:67 msgid "Automatically start a slideshow" msgstr "Automaticky začít promítání snímků" -#: ../gthumb/main.c:84 +#: ../gthumb/main.c:71 msgid "Automatically import digital camera photos" msgstr "Automaticky importovat fotografie z digitálního fotoaparátu" -#: ../gthumb/main.c:88 +#: ../gthumb/main.c:75 msgid "Show version" msgstr "Zobrazit verzi" -#. command line options -#: ../gthumb/main.c:539 +#: ../gthumb/main.c:344 msgid "- Image browser and viewer" msgstr "- prohlížeč obrázků" diff -Nru gthumb-2.14.3/po/de.po gthumb-3.0.0/po/de.po --- gthumb-2.14.3/po/de.po 2012-01-20 09:12:05.000000000 +0000 +++ gthumb-3.0.0/po/de.po 2012-03-04 15:22:06.000000000 +0000 @@ -1,10 +1,10 @@ # German gThumb translation. -# Copyright (C) 2002-2004 Paolo Bacch +# Copyright (C) 2002-2004 Paolo Bacchilega. # Christian Neumair , 2002-2004. # Hendrik Richter , 2005, 2006. # Maren Reinecke , 2008. # Jochen Skulj , 2008. -# Mario Blättermann , 2010, 2011. +# Mario Blättermann , 2010-2012. # Christian Kirbach , 2008, 2010. # Paul Seyfert , 2010. # Wolfgang Stöggl , 2011. @@ -14,202 +14,199 @@ "Project-Id-Version: gthumb master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-01-15 11:24+0000\n" -"PO-Revision-Date: 2012-01-15 12:55+0100\n" -"Last-Translator: Christian Kirbach \n" +"POT-Creation-Date: 2012-02-17 20:31+0000\n" +"PO-Revision-Date: 2012-03-01 12:51+0100\n" +"Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Datei ist keine gültige *.desktop-Datei" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Nicht erkannte Version »%s« der Desktop-Datei" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "%s wird gestartet" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "Anwendung akzeptiert keine Dokumente als Befehlszeilenargumente" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "Nicht erkannte Startoption: %d" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "" "Dokumentadressen können nicht an eine Desktop-Datei vom Typ " "»Link« (Verknüpfung) übergeben werden" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "Kein ausführbarer Eintrag" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "Verbindung zur Sitzungsverwaltung deaktivieren" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "Datei angeben, welche die gespeicherte Konfiguration enthält" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "DATEI" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "Kennung der Sitzungsverwaltung angeben" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "Kennung" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "Optionen der Sitzungsverwaltung:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "Optionen der Sitzungsverwaltung anzeigen" -#: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "gThumb Bildbetrachter" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "Ihre Bilder betrachten und katalogisieren" - #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:3 ../data/gthumb-import.desktop.in.in.h:3 -#: ../gthumb/gth-browser.c:523 ../gthumb/gth-main.c:229 -#: ../gthumb/gth-progress-dialog.c:443 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:529 +#: ../gthumb/gth-progress-dialog.c:386 ../gthumb/main.c:313 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "gThumb Bildbetrachter" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "gThumb Bildbetrachter" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Ihre Bilder betrachten und katalogisieren" + #: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "Bilder von einer Digitalkamera importieren" +msgid "Import with gThumb" +msgstr "Mit gThumb importieren" #: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "Werkzeug zum Importieren von Fotos" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "gThumb Werkzeug zum Importieren von Fotos" -#: ../data/gthumb.schemas.in.h:1 +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Bilder von einer Digitalkamera importieren" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "" "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " "to generate thumbnails for all images." msgstr "" -"Von Bildern, die größer sind als dieser Wert, wird kein Miniatur-" -"Vorschaubild erzeugt. Falls dieser Wert 0 ist, werden für alle Bilder " -"Miniatur-Vorschaubilder erzeugt." +"Von Bildern, die größer sind als dieser Wert, wird kein Miniatur-Vorschaubild " +"erzeugt. Falls dieser Wert 0 ist, werden für alle Bilder Miniatur-" +"Vorschaubilder erzeugt." -#: ../data/gthumb.schemas.in.h:2 -msgid "" -"Possible values are: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" msgstr "" -"Zulässige Werte: actual_size (tatsächliche Größe), fit (einpassen), " -"keep_prev (vorherige beibehalten), fit_if_larger (einpassen, wenn größer), " -"fit_width_if_larger (an Breite anpassen, wenn größer)" - -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "Zulässige Werte: high (hoch), low (gering)." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "Zulässige Werte: light (hell), midtone (mittel) sowie dark (dunkel)." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "Zulässige Werte: list (Liste), thumbnails (Miniatur-Vorschaubilder)." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "Zulässige Werte: small (klein), medium (mittel) sowie large (groß)." +"Legt fest, ob die Größe des Fensters an die Bildgröße angepasst werden soll" -#: ../data/gthumb.schemas.in.h:7 -msgid "" -"Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "" -"Zulässige Werte: system, text_below (Text unterhalb), text_beside (Text " -"daneben), text_only (nur Text) sowie icons_only (nur Symbole)." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Dateien im aktiven Fenster öffnen" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "" "Zulässige Werte: white (weiß), black (schwarz), checked (Schachbrettmuster), " "none (keiner)." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +msgid "Whether to reset the scrollbars position after changing image" +msgstr "" +"Gitb an, ob die Bildlaufleisten nach dem Ändern eines Bildes zurückgesetzt " +"werden" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to always use a black background." msgstr "Soll stets ein schwarzer Hintergrund verwendet werden?" -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Zulässige Werte: jpeg, jpg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Zulässige Werte: tiff, tif." + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" msgstr "" -"Ob die Bildlaufleisten nach dem Ändern eines Bildes zurückgesetzt werden" +"Mögliche Werte sind unter anderen: general::unsorted, file::name, file::size, " +"file::mtime, exif::photo::datetimeoriginal" #: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "_Erweiterungen:" + +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "Mehr Erweiterungen …" -#: ../data/ui/extensions-preferences.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:3 msgid "Some extensions are configurable." msgstr "Einige Erweiterungen sind konfigurierbar." -#: ../data/ui/extensions-preferences.ui.h:3 -msgid "_Extensions:" -msgstr "_Erweiterungen:" - #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "_Filtername:" -#. limit label -#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 -msgid "_Limit to" -msgstr "_Begrenzen bis" - -#: ../data/ui/filter-editor.ui.h:3 +#: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "_Vergleichen" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:268 +#: ../gthumb/gth-filter.c:340 +msgid "_Limit to" +msgstr "_Begrenzen bis" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "ausgewählt von" @@ -218,69 +215,69 @@ msgid "Mean:" msgstr "Durchschnitt:" -#: ../data/ui/histogram-info.ui.h:2 +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Standardabw.:" + +#: ../data/ui/histogram-info.ui.h:4 msgid "Median:" msgstr "Median:" +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Pixel:" + #. After the colon there is a percentile. -#: ../data/ui/histogram-info.ui.h:4 +#: ../data/ui/histogram-info.ui.h:8 msgctxt "Pixels" msgid "Max:" msgstr "Max:" #. After the colon there is the percentile of selected pixels. -#: ../data/ui/histogram-info.ui.h:6 +#: ../data/ui/histogram-info.ui.h:10 msgctxt "Pixels" msgid "Selected:" msgstr "Ausgewählt:" -#. After the colon there is the total number of pixels -#: ../data/ui/histogram-info.ui.h:8 -msgid "Pixels:" -msgstr "Pixel:" - -#. Short for "Standard deviation". Try to keep it short in the translation. -#: ../data/ui/histogram-info.ui.h:10 -msgid "Std dev:" -msgstr "Standardabw.:" - #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "Die alte Datei _nicht überschreiben" +msgid "Overwrite the old file with the new one?" +msgstr "Das alte Bild mit dem Neuen überschreiben?" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Alte Datei:" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "Dateiname:" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Größe:" + +#: ../data/ui/overwrite-dialog.ui.h:5 msgid "Modified:" msgstr "Geändert:" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "Neue Datei:" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "Alte Datei:" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "Die alte Datei ü_berschreiben" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "_Alle Dateien überschreiben" - #: ../data/ui/overwrite-dialog.ui.h:8 -msgid "Overwrite the old file with the new one?" -msgstr "Das alte Bild mit dem Neuen überschreiben?" +msgid "Do not overwrite _the old file" +msgstr "Die alte Datei _nicht überschreiben" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "Size:" -msgstr "Größe:" +msgid "Overwrite _all files" +msgstr "_Alle Dateien überschreiben" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -303,185 +300,181 @@ msgstr "_Weitere Filter:" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Objekte durch Doppelklick aktivieren" +msgid "below the folder list" +msgstr "Unterhalb der Ordnerliste" #: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Objekte durch einfachen Klick aktivieren" +msgid "on the right" +msgstr "auf der rechten Seite" #: ../data/ui/preferences.ui.h:3 -msgid "Appearance" -msgstr "Erscheinungsbild" +msgid "gThumb Preferences" +msgstr "gThumb-Einstellungen" #: ../data/ui/preferences.ui.h:4 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "Vor dem Löschen von Dateien oder Katalogen _nachfragen" +msgid "_Toolbar style:" +msgstr "_Werkzeugleisten-Stil:" #: ../data/ui/preferences.ui.h:5 -msgid "Ask whether to save _modified files" -msgstr "Nachfragen, ob _geänderte Dateien gespeichert werden sollen" +msgid "T_humbnails in viewer:" +msgstr "_Vorschaubilder im Betrachter:" -#: ../data/ui/preferences.ui.h:6 ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Schwarz" +#: ../data/ui/preferences.ui.h:6 +msgid "System settings" +msgstr "Systemeinstellungen" -#: ../data/ui/preferences.ui.h:7 ../gthumb/dlg-preferences-extensions.c:72 -#: ../gthumb/gth-browser-actions-entries.h:150 -msgid "Browser" -msgstr "Browser" +#: ../data/ui/preferences.ui.h:7 +msgid "Text below icons" +msgstr "Text unter Symbolen" #: ../data/ui/preferences.ui.h:8 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 -msgid "Caption" -msgstr "Beschriftung" +msgid "Text beside icons" +msgstr "Text neben Symbolen" -#: ../data/ui/preferences.ui.h:9 ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "Karomuster" +#: ../data/ui/preferences.ui.h:9 +msgid "Icons only" +msgstr "Nur Symbole" #: ../data/ui/preferences.ui.h:10 -msgid "Choose startup folder" -msgstr "Wählen Sie einen Startordner" +msgid "Text only" +msgstr "Nur Text" #: ../data/ui/preferences.ui.h:11 -msgid "D_etermine image type from content (slower)" -msgstr "Den Typ der Bilder anhand ihres _Inhalts bestimmen (langsamer)" +msgid "on the bottom" +msgstr "unten" -#: ../data/ui/preferences.ui.h:12 ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Bild an Breite anpassen, falls größer" +#: ../data/ui/preferences.ui.h:12 +msgid "on the side" +msgstr "seitlich" -#: ../data/ui/preferences.ui.h:13 ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Größe an Fenster anpassen" +#: ../data/ui/preferences.ui.h:13 +msgid "File _properties in browser:" +msgstr "Datei_eigenschaften im Browser:" -#: ../data/ui/preferences.ui.h:14 ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Bild an Fenster anpassen, falls größer" +#: ../data/ui/preferences.ui.h:14 +msgid "Appearance" +msgstr "Erscheinungsbild" #: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "Wie Nautilus" +msgid "Go to last _visited location" +msgstr "Zum letzten _besuchten Ort wechseln" #: ../data/ui/preferences.ui.h:16 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:393 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "Allgemein" +msgid "Go to this _folder:" +msgstr "Zu _folgendem Ordner gehen:" #: ../data/ui/preferences.ui.h:17 -msgid "Go to last _visited location" -msgstr "Zum letzten _besuchten Ort wechseln" +msgid "Choose startup folder" +msgstr "Wählen Sie einen Startordner" #: ../data/ui/preferences.ui.h:18 -msgid "Go to this _folder:" -msgstr "Zu _folgendem Ordner gehen:" +msgid "Set to C_urrent" +msgstr "Auf _momentan geöffneten setzen" -#: ../data/ui/preferences.ui.h:19 ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Nur Symbole" +#: ../data/ui/preferences.ui.h:19 +msgid "_Reuse the active window to open files" +msgstr "Das aktive Fenster zum Öffnen von Dateien wiede_rverwenden" -#: ../data/ui/preferences.ui.h:20 ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Letzte Vergrößerung beibehalten" +#: ../data/ui/preferences.ui.h:20 +msgid "On startup:" +msgstr "Beim Start:" #: ../data/ui/preferences.ui.h:21 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-crop.c:448 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 -#: ../extensions/file_tools/gth-file-tool-rotate.c:414 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "Keiner" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "Vor dem Löschen von Dateien oder Katalogen _nachfragen" #: ../data/ui/preferences.ui.h:22 -msgid "On startup:" -msgstr "Beim Start:" +msgid "Ask whether to save _modified files" +msgstr "Nachfragen, ob _geänderte Dateien gespeichert werden sollen" #: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:192 +msgid "_Store metadata inside files if possible" +msgstr "Metadaten in Dateien _speichern, wenn möglich" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 msgid "Other" msgstr "andere" -#: ../data/ui/preferences.ui.h:24 -msgid "Set image to actual size" -msgstr "Bild auf Originalgröße setzen" - #: ../data/ui/preferences.ui.h:25 -msgid "Set to C_urrent" -msgstr "Auf _momentan geöffneten setzen" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Allgemein" -#. Set widgets data. -#: ../data/ui/preferences.ui.h:26 ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Systemeinstellungen" +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Beschriftung" #: ../data/ui/preferences.ui.h:27 -msgid "T_humbnails in viewer:" -msgstr "_Vorschaubilder im Betrachter:" - -#: ../data/ui/preferences.ui.h:28 ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Text unter Symbolen" +msgid "Thumbnail _size:" +msgstr "_Vorschaubildgröße:" -#: ../data/ui/preferences.ui.h:29 ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Text neben Symbolen" - -#: ../data/ui/preferences.ui.h:30 ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Nur Text" +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" #: ../data/ui/preferences.ui.h:31 -msgid "Thumbnail _size:" -msgstr "_Vorschaubildgröße:" +msgid "95" +msgstr "95" -#: ../data/ui/preferences.ui.h:32 ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Weiß" +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" #: ../data/ui/preferences.ui.h:33 -msgid "_Store metadata inside files if possible" -msgstr "Metadaten in Dateien _speichern, wenn möglich" +msgid "128" +msgstr "128" #: ../data/ui/preferences.ui.h:34 -msgid "_Toolbar style:" -msgstr "_Werkzeugleisten-Stil:" +msgid "164" +msgstr "164" #: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "gThumb-Einstellungen" +msgid "200" +msgstr "200" #: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "auf der Unterseite" +msgid "256" +msgstr "256" #: ../data/ui/preferences.ui.h:37 -msgid "on the side" -msgstr "auf der Seite" +msgid "D_etermine image type from content (slower)" +msgstr "Den Typ der Bilder anhand ihres _Inhalts bestimmen (langsamer)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:173 +msgid "Browser" +msgstr "Browser" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "Sortieren nach" #: ../data/ui/sort-order.ui.h:2 -msgid "_Inverse order" -msgstr "Reihenfolge _umkehren" - -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" msgstr "_Sortieren nach:" +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "Reihenfolge _umkehren" + #: ../extensions/23hq/23hq.extension.in.in.h:1 msgid "23" msgstr "23" @@ -490,23 +483,23 @@ msgid "Upload images to 23hq.com" msgstr "Bilder zu 23hq.com übertragen" -#: ../extensions/23hq/callbacks.c:67 +#: ../extensions/23hq/callbacks.c:68 msgid "_23..." msgstr "_23 …" -#: ../extensions/23hq/callbacks.c:68 +#: ../extensions/23hq/callbacks.c:69 msgid "Upload photos to 23" msgstr "Fotos zu 23 übertragen" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -msgid "Add bookmarks support." -msgstr "Unterstützung für Lesezeichen hinzufügen." - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "Lesezeichen" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Unterstützung für Lesezeichen hinzufügen." + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 @@ -566,13 +559,13 @@ msgstr "_Lesezeichen:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "_Ort" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "_Name" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Ort" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "Das Lesezeichen konnte nicht entfernt werden" @@ -606,16 +599,16 @@ msgstr "Aktueller Ordner und dessen _Unterordner" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "Quelle" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "_Gewählte Dateien" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Quelle" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Auf Medium schreiben" @@ -633,8 +626,8 @@ #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 #: ../extensions/file_manager/actions.c:65 -#: ../extensions/list_tools/gth-script-editor-dialog.c:319 -#: ../gthumb/gth-filter-editor-dialog.c:491 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format msgid "No name specified" msgstr "Kein Name angegeben" @@ -686,7 +679,7 @@ msgid "Could not remove the catalog" msgstr "Der Katalog konnte nicht entfernt werden" -#: ../extensions/catalogs/actions.c:361 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" msgstr "Soll »%s« wirklich unwiderruflich gelöscht werden?" @@ -704,8 +697,7 @@ msgstr "Zum Ordner gehen, der die gewählte Datei enthält" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/edit_metadata/callbacks.c:116 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:86 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Andere …" @@ -748,9 +740,9 @@ #: ../extensions/catalogs/callbacks.c:497 #: ../extensions/catalogs/callbacks.c:502 -#: ../extensions/photo_importer/dlg-photo-importer.c:359 -#: ../extensions/photo_importer/dlg-photo-importer.c:399 -#: ../gthumb/gth-file-list.c:45 ../gthumb/gth-folder-tree.c:888 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(Leer)" @@ -767,10 +759,10 @@ msgstr "Dateien automatisch nach Datum ordnen" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:660 +#: ../extensions/catalogs/gth-catalog.c:1017 +#: ../extensions/catalogs/gth-catalog.c:1018 msgid "Catalogs" msgstr "Kataloge" @@ -787,114 +779,114 @@ msgstr "K_ataloge:" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "Neue _Bibliothek" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "Katalog a_nlegen" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "Neue _Bibliothek" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:922 -#: ../extensions/webalbums/gth-web-exporter.c:1852 +#: ../extensions/file_manager/actions.c:929 +#: ../extensions/webalbums/gth-web-exporter.c:1842 msgid "_View the destination" msgstr "Ziel _betrachten" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "Katalog" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:201 +#: ../gthumb/gth-file-properties.c:212 msgid "Properties" msgstr "Eigenschaften" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Name:" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "_Datum:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "_Name:" +msgid "Catalog" +msgstr "Katalog" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -msgid "Catalog _Preview:" -msgstr "Katalog_vorschau:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 -msgid "Organization:" -msgstr "Ordnung:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "Dateien ordnen" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" msgstr "Dateien ordnen" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Ordnung:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Select All" msgstr "Alle auswählen" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "Nichts auswählen" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "Katalog_vorschau:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:470 +#: ../extensions/edit_metadata/gth-edit-general-page.c:549 #: ../gthumb/gth-main-default-tests.c:264 msgid "Date photo was taken" msgstr "Zeitpunkt der Aufnahme" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -#: ../gthumb/gth-main-default-tests.c:256 -msgid "File modified date" -msgstr "Änderungsdatum der Datei" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "Kataloge mit einer einzelnen Datei ignorieren" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "Einzelne Dateien setzen in Katalog:" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "Einzelne" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:261 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:2 +#: ../gthumb/gth-main-default-tests.c:256 +msgid "File modified date" +msgstr "Änderungsdatum der Datei" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:3 +#: ../extensions/comments/main.c:280 msgid "Tag" msgstr "Schlagwort" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "Schlagwort" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 #: ../gthumb/gth-main-default-tests.c:284 msgid "Tag (embedded)" msgstr "Schlagwort (eingebettet)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "Dateien _gruppieren nach:" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "_Unterordner einbeziehen" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Kataloge mit einer einzelnen Datei ignorieren" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Einzelne Dateien setzen in Katalog:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "Schlagwort" +msgid "Singles" +msgstr "Einzelne" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -902,7 +894,7 @@ msgstr "Dateien konnten nicht zum Katalog hinzugefügt werden" #: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/search/gth-search-task.c:352 +#: ../extensions/search/gth-search-task.c:356 msgid "Could not create the catalog" msgstr "Der Katalog konnte nicht angelegt werden" @@ -920,7 +912,8 @@ "Die Dateien werden in Kataloge eingeordnet. Auf dem Datenträger wird keine " "Datei verschoben." -#: ../extensions/catalogs/gth-catalog.c:1145 ../extensions/comments/main.c:43 +#: ../extensions/catalogs/gth-catalog.c:1115 ../extensions/comments/main.c:43 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Schlagwörter" @@ -961,11 +954,11 @@ msgstr "Die gewählten Bilder konnten nicht aus dem Katalog entfernt werden" #: ../extensions/catalogs/gth-file-source-catalogs.c:1441 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:683 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:711 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1214 -#: ../extensions/search/gth-search.c:295 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:682 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:691 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:720 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1225 +#: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Ungültiges Dateiformat" @@ -991,80 +984,80 @@ msgstr "Das Datum der gewählten Dateien ändern" #: ../extensions/change_date/data/ui/change-date.ui.h:1 -msgid "+" -msgstr "+" +msgid "Change Date" +msgstr "Datum ändern" #: ../extensions/change_date/data/ui/change-date.ui.h:2 -msgid "-" -msgstr "-" +msgid "Change the following values:" +msgstr "Folgende Werte ändern:" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -msgid "A_djust by" -msgstr "A_bgleichen nach" +msgid "_Last modified date" +msgstr "_Letztes Änderungsdatum" #: ../extensions/change_date/data/ui/change-date.ui.h:4 -msgid "Change Date" -msgstr "Datum ändern" +msgid "Co_mment date" +msgstr "Datum des Ko_mmentars" #: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Change the following values:" -msgstr "Folgende Werte ändern:" +msgid "Exif DateTimeOriginal tag" +msgstr "Exif-Originalzeitpunkteintrag" #: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Change to:" msgstr "Ändern in:" #: ../extensions/change_date/data/ui/change-date.ui.h:7 -msgid "Co_mment date" -msgstr "Datum des Ko_mmentars" +msgid "The _following date:" +msgstr "_Folgendes Datum:" #: ../extensions/change_date/data/ui/change-date.ui.h:8 -msgid "Date p_hoto was taken" -msgstr "Zeitpunkt der Aufna_hme" - -#: ../extensions/change_date/data/ui/change-date.ui.h:9 -msgid "Exif DateTimeOriginal tag" -msgstr "Exif-Originalzeitpunkteintrag" - -#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "_Änderungsdatum" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File c_reation date" msgstr "_Erstellungsdatum der Datei" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 -msgid "The _following date:" -msgstr "_Folgendes Datum:" +#: ../extensions/change_date/data/ui/change-date.ui.h:10 +msgid "Date p_hoto was taken" +msgstr "Zeitpunkt der Aufna_hme" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 -msgid "_Last modified date" -msgstr "_Letztes Änderungsdatum" +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "A_djust by" +msgstr "A_bgleichen nach" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "hours" msgstr "Stunden" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "minutes" msgstr "Minuten" -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "Sekunden" -#: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "Kommentare und Schlagworte zu Dateien beliebigen Typs hinzufügen." +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +msgid "+" +msgstr "+" -#: ../extensions/comments/comments.extension.in.in.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:16 +msgid "-" +msgstr "-" + +#: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "Kommentare und Schlagwörter" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Kommentare und Schlagworte zu Dateien beliebigen Typs hinzufügen." + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Einstellungen" @@ -1072,8 +1065,7 @@ msgid "_Synchronize with the embedded metadata" msgstr "Mit den eingebetteten Metadaten _abgleichen" -#: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:111 +#: ../extensions/comments/main.c:33 ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Kommentar" @@ -1081,19 +1073,19 @@ msgid "Title" msgstr "Titel" -#: ../extensions/comments/main.c:40 ../extensions/comments/main.c:245 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/comments/main.c:40 ../extensions/comments/main.c:264 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:16 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Beschreibung" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:253 +#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:272 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Ort" @@ -1127,7 +1119,7 @@ msgstr "Eine Bildwand erstellen" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" msgstr "Übersichtsbild" @@ -1138,24 +1130,32 @@ "Dateien zeigt." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid "Background" -msgstr "Hintergrund" +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-crop.c:454 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Keiner" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -msgid "C_olor:" -msgstr "_Farbe:" +msgid "Simple" +msgstr "Einfach" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Caption:" -msgstr "Beschriftung:" +msgid "Simple with shadow" +msgstr "Einfach, mit Schattierung" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 -msgid "Frame" -msgstr "Rahmen" +msgid "Shadow only" +msgstr "Nur Schatten" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 +msgid "Slide" +msgstr "Dia" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 msgid "Inward Shadow" msgstr "Innerer Schatten" @@ -1163,243 +1163,245 @@ msgid "Outward Shadow" msgstr "Äußerer Schatten" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 -msgid "Select a color" -msgstr "Farbe auswählen" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -msgid "Select a font" -msgstr "Schrift auswählen" +msgid "Background" +msgstr "Hintergrund" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -msgid "Shadow only" -msgstr "Nur Schatten" +msgid "_Solid color" +msgstr "_Einfarbig" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -msgid "Simple" -msgstr "Einfach" +msgid "_Gradient" +msgstr "Farb_verlauf" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -msgid "Simple with shadow" -msgstr "Einfach, mit Schattierung" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +msgid "_Horizontal:" +msgstr "_Horizontal:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -msgid "Slide" -msgstr "Dia" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 +msgid "_Vertical:" +msgstr "_Vertikal:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#: ../extensions/rename_series/dlg-rename-series.c:63 -msgid "Text" -msgstr "Text" +msgid "Select a color" +msgstr "Farbe auswählen" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "_Footer:" -msgstr "_Fußzeile:" +msgid "Frame" +msgstr "Rahmen" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -msgid "_Gradient" -msgstr "Farb_verlauf" +msgid "_Style:" +msgstr "_Stil:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "_Header:" -msgstr "_Kopfzeile:" +msgid "C_olor:" +msgstr "_Farbe:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Horizontal:" -msgstr "_Horizontal:" +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Text" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "_Kopfzeile:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -msgid "_Solid color" -msgstr "_Einfarbig" +msgid "Select a font" +msgstr "Schrift auswählen" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 -msgid "_Style:" -msgstr "_Stil:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "_Fußzeile:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "_Vertical:" -msgstr "_Vertikal:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Beschriftung:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "Die aktuelle Seitennummer" -#. translate only the text in the curly brackets #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, no-c-format -msgid "%D{ format }" -msgstr "%D{ Format }" +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Gesamtanzahl der Seiten" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -msgid "All images on a single page" -msgstr "Alle Bilder in einer einzigen Seite" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:6 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:10 -msgid "Choose destination folder" -msgstr "Wählen Sie einen Zielordner" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Spezieller Code" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -msgid "Columns:" -msgstr "Spalten:" +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ Format }" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -msgid "Create _HTML image map" -msgstr "_HTML-Bildübersicht erstellen" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -msgid "Create a new theme" -msgstr "Neues Thema erstellen" +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "Das aktuelle Datum" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -msgid "Delete the selected theme" -msgstr "Das gewählte Thema löschen" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "S_peicherort:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 -msgid "Edit the selected theme" -msgstr "Das gewählte Thema bearbeiten" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "Wählen Sie einen Zielordner" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 msgid "File_name:" msgstr "Datei_name:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Neue Zählnummer" + #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Images per page:" -msgstr "Bilder pro Seite:" +msgid "Create _HTML image map" +msgstr "_HTML-Bildübersicht erstellen" +# Es geht hier um Einstellungen wie Speicherort, Dateiname oder Erweiterung in den Dialogen. #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Layout" -msgstr "Layout" +#: ../extensions/pixbuf_savers/preferences.c:134 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Speichern" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 -msgid "New enumerator digit" -msgstr "Neue Zählnummer" +msgid "Create a new theme" +msgstr "Neues Thema erstellen" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -msgid "Re_verse order" -msgstr "_Reihenfolge umkehren" +msgid "Edit the selected theme" +msgstr "Das gewählte Thema bearbeiten" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -msgid "S_ort:" -msgstr "_Sortieren nach:" +msgid "Delete the selected theme" +msgstr "Das gewählte Thema löschen" -# Es geht hier um Einstellungen wie Speicherort, Dateiname oder Erweiterung in den Dialogen. #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "Saving" -msgstr "Speichern" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:20 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -msgid "Special code" -msgstr "Spezieller Code" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Thema" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -msgid "Sq_uared" -msgstr "Im Q_uadrat" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Spalten:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -msgid "The current date" -msgstr "Das aktuelle Datum" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Bilder pro Seite:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "The current page number" -msgstr "Die aktuelle Seitennummer" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Alle Bilder in einer einzigen Seite" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The total number of pages" -msgstr "Gesamtanzahl der Seiten" +msgid "_All pages with the same size" +msgstr "_Alle Seiten der gleichen Größe" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "Theme" -msgstr "Thema" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Layout" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 -msgid "Thumbnails" -msgstr "Vorschaubilder" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "_Sortieren nach:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 -msgid "_All pages with the same size" -msgstr "_Alle Seiten der gleichen Größe" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "_Reihenfolge umkehren" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "_Destination:" -msgstr "S_peicherort:" +msgid "_Size:" +msgstr "Gr_öße:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "Im Q_uadrat" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -msgid "_Size:" -msgstr "Gr_öße:" +msgid "Thumbnails" +msgstr "Vorschaubilder" -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" msgstr "Bildwand" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:483 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:495 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:509 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 msgid "Could not save the theme" msgstr "Das Thema konnte nicht gespeichert werden" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:654 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 msgid "Could not delete the theme" msgstr "Das Thema konnte nicht gelöscht werden" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 msgid "Creating images" msgstr "Bilder werden erstellt" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 msgid "Generating thumbnails" msgstr "Miniatur-Vorschaubilder werden erstellt" @@ -1411,15 +1413,15 @@ msgid "Footer" msgstr "Fußzeile" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:197 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 msgid "Theme Properties" msgstr "Eigenschaften des Themas" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:212 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 msgid "Copy _From" msgstr "Kopieren _von" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:348 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 msgid "New theme" msgstr "Neues Thema" @@ -1439,36 +1441,36 @@ msgid "Save images in a different format" msgstr "Bilder in einem anderen Format speichern" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 msgid "Convert Format" msgstr "Format umwandeln" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Neues Format" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "Ziel" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "Neues Format" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Use the original image folder" msgstr "Den _ursprünglichen Bildordner verwenden" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/dlg-convert-format.c:93 msgid "Converting images" msgstr "Bilder werden konvertiert" -#: ../extensions/desktop_background/actions.c:203 +#: ../extensions/desktop_background/actions.c:162 msgid "Could not show the desktop background properties" msgstr "" "Die Eigenschaften des Arbeitsflächenhintergrundes konnten nicht angezeigt " "werden" -#: ../extensions/desktop_background/actions.c:269 -#: ../extensions/desktop_background/actions.c:287 +#: ../extensions/desktop_background/actions.c:228 +#: ../extensions/desktop_background/actions.c:246 msgid "Could not set the desktop background" msgstr "Arbeitsflächenhintergrund konnte nicht gesetzt werden" @@ -1485,55 +1487,53 @@ msgid "Desktop background" msgstr "Arbeitsflächenhintergrund" -#: ../extensions/edit_metadata/actions.c:129 +#: ../extensions/edit_metadata/actions.c:66 msgid "" "Are you sure you want to permanently delete the metadata of the selected " "files?" msgstr "" "Sollen die Metadaten der ausgewählten Dateien unwiderruflich gelöscht werden?" -#: ../extensions/edit_metadata/actions.c:136 +#: ../extensions/edit_metadata/actions.c:73 msgid "If you delete the metadata, it will be permanently lost." -msgstr "" -"Wenn Sie die Metadaten löschen, gehen diese für Sie dauerhaft verloren." +msgstr "Wenn Sie die Metadaten löschen, gehen diese für Sie dauerhaft verloren." -#: ../extensions/edit_metadata/callbacks.c:108 +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "Schl_agwörter" -#: ../extensions/edit_metadata/callbacks.c:112 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" msgstr "Den Kommentar und andere Informationen der gewählten Felder bearbeiten" -#: ../extensions/edit_metadata/callbacks.c:117 -msgid "Choose another tag" -msgstr "Wählen Sie ein anderes Schlagwort" +#: ../extensions/edit_metadata/callbacks.c:107 +msgid "Set the tags of the selected files" +msgstr "Den gewählten Dateien Schlagwörter zuweisen" -#: ../extensions/edit_metadata/callbacks.c:121 +#: ../extensions/edit_metadata/callbacks.c:112 msgid "Delete Metadata" msgstr "Metadaten löschen" -#: ../extensions/edit_metadata/callbacks.c:122 +#: ../extensions/edit_metadata/callbacks.c:113 msgid "Delete the comment and the embedded metadata of the selected files" msgstr "" -"Den Kommentar und die eingebetteten Metadaten der gewählten Dateien " -"bearbeiten" +"Den Kommentar und die eingebetteten Metadaten der gewählten Dateien bearbeiten" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "_Beschreibung:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Ort:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "Schl_agwörter:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "_Ort:" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "Bewe_rtung:" @@ -1542,71 +1542,79 @@ msgid "_Title:" msgstr "_Titel:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:63 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "Metadaten der Datei konnten nicht gespeichert werden" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:150 -#: ../gthumb/gth-overwrite-dialog.c:166 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "Dateiinformation konnte nicht gelesen werden" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Metadaten bearbeiten" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Allow to edit files metadata." msgstr "Bearbeitung der Metadaten der Datei ermöglichen." -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 -msgid "Edit metadata" -msgstr "Metadaten bearbeiten" +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "Metadaten zu %s" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d Datei" +msgstr[1] "%d Dateien" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +msgid "Sa_ve and Close" +msgstr "S_peichern und schließen" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:467 +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Nur _veränderte Felder speichern" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:546 msgid "No date" msgstr "Kein Datum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:468 +#: ../extensions/edit_metadata/gth-edit-general-page.c:547 msgid "The following date" msgstr "Folgendes Datum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:469 -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/edit_metadata/gth-edit-general-page.c:548 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Heutiges Datum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:471 +#: ../extensions/edit_metadata/gth-edit-general-page.c:550 msgid "Last modified date" msgstr "Letztes Änderungsdatum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:472 +#: ../extensions/edit_metadata/gth-edit-general-page.c:551 msgid "File creation date" msgstr "Erstellungsdatum der Datei" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:552 msgid "Do not modify" msgstr "Nicht ändern" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:105 -msgid "Save only cha_nged fields" -msgstr "Nur _veränderte Felder speichern" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:161 -#, c-format -msgid "%s Metadata" -msgstr "Metadaten zu %s" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:165 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:332 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d Datei" -msgstr[1] "%d Dateien" +msgid "%s Tags" +msgstr "Schlagwörter für %s" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Neues Schlagwort" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 msgid "Assign Tags" msgstr "Schlagworte zuweisen" @@ -1632,53 +1640,53 @@ msgstr "Beispielerweiterung." #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "Verfasser_titel:" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "C_opyright:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "La_nd:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Code:" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "Ermöglicht _durch:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "State/Province:" -msgstr "Staat/Bundesland:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Quelle:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 +msgid "_Urgency:" +msgstr "_Dringlichkeit:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 +msgid "_Object Name:" +msgstr "_Objektname:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "Verfasser_titel:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 msgid "_Byline:" msgstr "_Verfasserzeile:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 msgid "_City:" msgstr "S_tadt:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -msgid "_Code:" -msgstr "_Code:" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 msgid "_Language:" msgstr "_Sprache:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -msgid "_Object Name:" -msgstr "_Objektname:" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -msgid "_Source:" -msgstr "_Quelle:" - #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 -msgid "_Urgency:" -msgstr "_Dringlichkeit:" +msgid "State/Province:" +msgstr "Staat/Bundesland:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1733,11 +1741,11 @@ msgid "XMP Attached" msgstr "Angehängtes XMP" -#: ../extensions/exiv2_tools/main.c:255 +#: ../extensions/exiv2_tools/main.c:256 msgid "date photo was taken" msgstr "Zeitpunkt der Aufnahme" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" msgstr "Freigeben" @@ -1750,76 +1758,76 @@ msgstr "Fotos zu Facebook übertragen" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -msgid "1024 x 1024" -msgstr "1024 x 1024" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +msgid "Export to Flickr" +msgstr "Zu Flickr exportieren" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -msgid "1280 x 1280" -msgstr "1280 x 1280" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "_Hochladen" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -msgid "1600 x 1600" -msgstr "1600 x 1600" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +msgid "_Account:" +msgstr "K_onto:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -msgid "2048 x 2048" -msgstr "2048 x 2048" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Konten bearbeiten" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -msgid "720 x 720" -msgstr "720 x 720" - -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "A_lbum:" msgstr "A_lbum:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "Add a new album" msgstr "Neues Album hinzufügen" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +msgid "Resize the images if larger than this size" +msgstr "Bilder verkleinern, wenn sie diese Größe übersteigen" + #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "Konten bearbeiten" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +msgid "_Resize to:" +msgstr "_Größe ändern auf:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "Zu Flickr exportieren" +msgid "720 x 720" +msgstr "720 x 720" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 -msgid "Resize the images if larger than this size" -msgstr "Bilder verkleinern, wenn sie diese Größe übersteigen" +msgid "1024 x 1024" +msgstr "1024 x 1024" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -msgid "_Account:" -msgstr "K_onto:" +msgid "1280 x 1280" +msgstr "1280 x 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "_Größe ändern auf:" +msgid "1600 x 1600" +msgstr "1600 x 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "_Hochladen" +msgid "2048 x 2048" +msgstr "2048 x 2048" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 msgid "A_ccount:" msgstr "K_onto:" @@ -1831,30 +1839,30 @@ msgid "A_ccounts:" msgstr "_Konten:" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "Private" -msgstr "Privat" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 -msgid "Private photos, visible to friends" -msgstr "Private Fotos, für Freunde sichtbar" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Öffentliche Fotos" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 -msgid "_Location:" -msgstr "_Ort:" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +msgid "Private photos, visible to friends" +msgstr "Private Fotos, für Freunde sichtbar" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Privat" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 msgid "_Visibility:" msgstr "_Sichtbarkeit:" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +msgid "_Location:" +msgstr "_Ort:" + #: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 @@ -1862,18 +1870,18 @@ msgstr "_Legitimieren …" #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Sobald dies erledigt ist, klicken Sie auf »Fortsetzen«." + +#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 #: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 msgid "C_ontinue" msgstr "F_ortfahren" -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker_utils/flickr-authentication.c:435 -#: ../extensions/oauth/oauth-authentication.c:450 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Sobald dies erledigt ist, klicken Sie auf »Fortsetzen«." - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1885,34 +1893,34 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1851 +#: ../extensions/webalbums/gth-web-exporter.c:1841 msgid "_Open in the Browser" msgstr "Im Br_owser öffnen" -#: ../extensions/facebook/dlg-export-to-facebook.c:128 -#: ../extensions/facebook/dlg-export-to-facebook.c:333 -#: ../extensions/facebook/facebook-authentication.c:219 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:234 -#: ../extensions/flicker_utils/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 #: ../extensions/photobucket/dlg-export-to-photobucket.c:376 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:377 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "Verbindung zum Server konnte nicht hergestellt werden" -#: ../extensions/facebook/dlg-export-to-facebook.c:180 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 msgid "Could not upload the files" msgstr "Die Dateien konnten nicht übertragen werden" -#: ../extensions/facebook/dlg-export-to-facebook.c:410 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 #: ../extensions/photobucket/dlg-export-to-photobucket.c:462 @@ -1920,63 +1928,63 @@ msgid "Could not create the album" msgstr "Das Album konnte nicht angelegt werden" -#: ../extensions/facebook/dlg-export-to-facebook.c:479 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 #: ../extensions/photobucket/dlg-export-to-photobucket.c:534 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 msgid "New Album" msgstr "Neues Album" -#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1816 +#: ../extensions/image_print/gth-image-print-job.c:1789 #: ../extensions/photobucket/dlg-export-to-photobucket.c:614 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 msgid "No valid file selected." msgstr "Keine gültige Datei ausgewählt" -#: ../extensions/facebook/dlg-export-to-facebook.c:559 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 #: ../extensions/photobucket/dlg-export-to-photobucket.c:615 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 msgid "Could not export the files" msgstr "Die Dateien konnten nicht exportiert werden" -#: ../extensions/facebook/dlg-export-to-facebook.c:567 -#: ../extensions/find_duplicates/gth-find-duplicates.c:284 -#: ../extensions/find_duplicates/gth-find-duplicates.c:376 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:255 +#: ../extensions/find_duplicates/gth-find-duplicates.c:347 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 #: ../extensions/photobucket/dlg-export-to-photobucket.c:623 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:800 -#: ../gthumb/gth-browser.c:990 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:995 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d Datei (%s)" msgstr[1] "%d Dateien (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:589 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:590 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:643 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 #, c-format msgid "Export to %s" msgstr "Exportieren nach %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:229 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:229 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:229 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "Neue Legitimierung …" -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker_utils/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." msgstr "K_onto wählen …" -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker_utils/flickr-authentication.c:434 -#: ../extensions/oauth/oauth-authentication.c:449 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 #, c-format msgid "" "Return to this window when you have finished the authorization process on %s" @@ -1984,17 +1992,17 @@ "Kehren Sie zu diesem Fenster zurück, sobald der Legitimierungsvorgang auf %s " "abgeschlossen ist." -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker_utils/flickr-authentication.c:514 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" msgstr "" "gThumb benötigt Ihre Legitimierung, um Bilder zu %s übertragen zu können." -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker_utils/flickr-authentication.c:515 -#: ../extensions/oauth/oauth-authentication.c:530 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 #, c-format msgid "" "Click 'Authorize' to open your web browser and authorize gthumb to upload " @@ -2002,34 +2010,34 @@ "authorization." msgstr "" "Klicken Sie auf »Legitimieren«, um Ihren Webbrowser zu öffnen und gThumb zu " -"legitimieren, Fotos zu %s zu übertragen. Sobald dies erledigt ist, kehren " -"Sie zu diesem Fenster zurück, um die Legitimierung abzuschließen." +"legitimieren, Fotos zu %s zu übertragen. Sobald dies erledigt ist, kehren Sie " +"zu diesem Fenster zurück, um die Legitimierung abzuschließen." -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker_utils/flickr-authentication.c:615 -#: ../extensions/oauth/oauth-authentication.c:632 +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:681 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Konto wählen" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker_utils/flickr-authentication.c:724 -#: ../extensions/oauth/oauth-authentication.c:741 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:742 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Konten bearbeiten" -#: ../extensions/facebook/facebook-connection.c:304 -#: ../extensions/facebook/facebook-connection.c:464 -#: ../extensions/facebook/facebook-service.c:191 -#: ../extensions/facebook/facebook-service.c:294 -#: ../extensions/facebook/facebook-service.c:497 -#: ../extensions/flicker_utils/flickr-connection.c:295 -#: ../extensions/flicker_utils/flickr-connection.c:442 -#: ../extensions/flicker_utils/flickr-service.c:224 -#: ../extensions/flicker_utils/flickr-service.c:427 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:195 +#: ../extensions/flicker_utils/flickr-service.c:398 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2037,17 +2045,17 @@ msgid "Unknown error" msgstr "Unbekannter Fehler" -#: ../extensions/facebook/facebook-connection.c:339 -#: ../extensions/facebook/facebook-connection.c:490 -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-connection.c:321 -#: ../extensions/flicker_utils/flickr-connection.c:468 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 -#: ../extensions/picasaweb/google-connection.c:373 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" msgstr "Verbindung mit Server wird aufgebaut" @@ -2059,58 +2067,58 @@ msgid "Upload images to Facebook" msgstr "Bilder zu Facebook übertragen" -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "Kontoinformationen wird ermittelt" -#: ../extensions/facebook/facebook-service.c:425 -#: ../extensions/flicker_utils/flickr-service.c:352 -#: ../extensions/photobucket/photobucket-service.c:236 -#: ../extensions/picasaweb/picasa-web-service.c:238 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:209 msgid "Getting the album list" msgstr "Albenliste wird geholt" -#: ../extensions/facebook/facebook-service.c:554 -#: ../extensions/flicker_utils/flickr-service.c:455 -#: ../extensions/flicker_utils/flickr-service.c:575 -#: ../extensions/flicker_utils/flickr-service.c:613 -#: ../extensions/photobucket/photobucket-service.c:345 -#: ../extensions/picasaweb/picasa-web-service.c:329 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:426 +#: ../extensions/flicker_utils/flickr-service.c:546 +#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:300 msgid "Creating the new album" msgstr "Neues Album wird angelegt" -#: ../extensions/facebook/facebook-service.c:613 -#: ../extensions/flicker_utils/flickr-service.c:663 -#: ../extensions/photobucket/photobucket-service.c:402 -#: ../extensions/picasaweb/picasa-web-service.c:386 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:357 #, c-format msgid "Could not upload '%s': %s" msgstr "»%s« konnte nicht übertragen werden: %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:699 -#: ../extensions/flicker_utils/flickr-service.c:774 -#: ../extensions/photobucket/photobucket-service.c:459 -#: ../extensions/picasaweb/picasa-web-service.c:441 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:412 #, c-format msgid "Uploading '%s'" msgstr "»%s« wird übertragen …" -#: ../extensions/facebook/facebook-service.c:915 -#: ../extensions/flicker_utils/flickr-service.c:943 -#: ../extensions/photobucket/photobucket-service.c:628 -#: ../extensions/picasaweb/picasa-web-service.c:634 +#: ../extensions/facebook/facebook-service.c:886 +#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:605 msgid "Uploading the files to the server" msgstr "Dateien werden zum Server übertragen" -#: ../extensions/facebook/facebook-service.c:1032 -#: ../extensions/flicker_utils/flickr-service.c:1106 -#: ../extensions/picasaweb/picasa-web-service.c:747 +#: ../extensions/facebook/facebook-service.c:1003 +#: ../extensions/flicker_utils/flickr-service.c:1077 +#: ../extensions/picasaweb/picasa-web-service.c:718 msgid "Getting the photo list" msgstr "Bilderliste wird geholt" @@ -2156,8 +2164,7 @@ #: ../extensions/file_manager/actions.c:765 msgid "" -"The folder cannot be moved to the Trash. Do you want to delete it " -"permanently?" +"The folder cannot be moved to the Trash. Do you want to delete it permanently?" msgstr "" "Der Ordner konnte nicht in den Müll verschoben werden. Soll er Dateien " "dauerhaft gelöscht werden?" @@ -2166,30 +2173,28 @@ msgid "Could not move the folder to the Trash" msgstr "Der Ordner konnte nicht in den Müll verschoben werden" -#: ../extensions/file_manager/actions.c:808 -#: ../gthumb/gth-file-source-vfs.c:826 +#: ../extensions/file_manager/actions.c:808 ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" msgstr "Soll »%s« wirklich unwiderruflich gelöscht werden?" -#: ../extensions/file_manager/actions.c:818 -#: ../gthumb/gth-file-source-vfs.c:839 +#: ../extensions/file_manager/actions.c:818 ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "Wenn Sie eine Datei löschen, geht diese für Sie dauerhaft verloren." -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:910 msgid "Move To" msgstr "Verschieben nach" -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:910 msgid "Copy To" msgstr "Kopieren nach" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:914 msgid "Move" msgstr "Verschieben" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:914 msgid "Copy" msgstr "Kopieren" @@ -2213,7 +2218,7 @@ #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 -#: ../gthumb/gth-file-source-vfs.c:800 +#: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" msgstr "In den _Müll verschieben" @@ -2233,7 +2238,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "_Umbenennen" @@ -2275,9 +2280,9 @@ msgid "Move the selected files to another folder" msgstr "Die gewählten Dateien in einen anderen Ordner verschieben" -#: ../extensions/file_manager/callbacks.c:1004 -#: ../extensions/find_duplicates/gth-find-duplicates.c:610 -#: ../gthumb/gth-browser.c:4926 ../gthumb/gth-browser.c:4960 +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:581 +#: ../gthumb/gth-browser.c:4925 ../gthumb/gth-browser.c:4959 msgid "Could not perform the operation" msgstr "Die Aktion konnte nicht ausgeführt werden" @@ -2294,247 +2299,247 @@ msgstr "Dateien werden gelöscht" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "_Helligkeit:" +msgid "_Preview" +msgstr "_Vorschau" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "Farbanzahl" +msgid "B_rightness:" +msgstr "_Helligkeit:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "_Kontrast:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "Cyan-_Rot:" +msgid "_Saturation:" +msgstr "_Sättigung:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "G_amma:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "_Magenta-Grün:" +msgid "Cyan-_Red:" +msgstr "Cyan-_Rot:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Preview" -msgstr "_Vorschau" +msgid "_Magenta-Green:" +msgstr "_Magenta-Grün:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 -msgid "_Reset" -msgstr "_Zurücksetzen" +msgid "_Yellow-Blue:" +msgstr "_Gelb-Blau:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -msgid "_Saturation:" -msgstr "_Sättigung:" +msgid "Color Levels" +msgstr "Farbanzahl" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 -msgid "_Yellow-Blue:" -msgstr "_Gelb-Blau:" - -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "_Zurücksetzen" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "Seitenverhältnis" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +msgid "_Position:" +msgstr "_Position:" +#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "C_rop" -msgstr "_Zuschneiden" +msgid "×" +msgstr "×" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "Center" -msgstr "Zentrieren" +msgid "_Grid:" +msgstr "_Gitterlinien:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:6 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "Seitenverhältnis _umkehren" - -#. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -msgid "M_ultiple of:" -msgstr "_Vielfaches von:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 msgid "Maximize" msgstr "Maximieren" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +msgid "Center" +msgstr "Zentrieren" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "Selection" msgstr "Auswahl" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 -msgid "_Grid:" -msgstr "_Gitterlinien:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "I_nvert aspect ratio" +msgstr "Seitenverhältnis _umkehren" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 -msgid "_Position:" -msgstr "_Position:" +#. after the colon there is a control to select the size in pixels +#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +msgid "M_ultiple of:" +msgstr "_Vielfaches von:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 msgid "px" msgstr "px" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "Aspect ratio" +msgstr "Seitenverhältnis" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "C_rop" +msgstr "_Zuschneiden" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Breite:" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +msgid "Heigh_t:" +msgstr "_Höhe:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Set the image size to this value" +msgstr "Die Bildgröße auf diesen Wert setzen" #: ../extensions/file_tools/data/ui/resize-options.ui.h:4 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Bildgröße" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "_Höhe:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 msgid "High _quality" -msgstr "Hohe _Qualität" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "New dimensions:" -msgstr "Neue Abmessungen:" +msgstr "Hohe _Qualität" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:8 #: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "Options" msgstr "Optionen" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" msgstr "Die ursprünglichen Abmessungen:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "Skalierungsfaktor:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -msgid "Set the image size to this value" -msgstr "Die Bildgröße auf diesen Wert setzen" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 -msgid "_Width:" -msgstr "_Breite:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Neue Abmessungen:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "Pixel" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 msgid "Align" msgstr "Ausrichten" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -msgid "Alignment" -msgstr "Ausrichtung" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 msgid "Angle" msgstr "Winkel" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Point 1:" +msgstr "Punkt 1:" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -msgid "Bounding box" -msgstr "Begrenzungsrahmen" +msgid "Point 2:" +msgstr "Punkt 2:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -msgid "Crop borders" -msgstr "Ränder beschneiden" +msgid "Keep aspect ratio" +msgstr "Seitenverhältnis beibehalten" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "" -"Draw a line on the image \n" -"to set the alignment." -msgstr "" -"Linie am Bild zeichnen, \n" -"um die Ausrichtung festzulegen." +msgid "Image size" +msgstr "Bildgröße" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 msgid "Grid:" msgstr "Gitterlinien:" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Pick a background color" +msgstr "Eine Hintergrundfarbe wählen" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -msgid "Image size" -msgstr "Bildgröße" +msgid "_Transparent" +msgstr "_Transparent" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "Keep aspect ratio" -msgstr "Seitenverhältnis beibehalten" +msgid "_Background:" +msgstr "_Hintergrund:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -msgid "Original size" -msgstr "Ursprüngliche Größe" +msgid "Reset" +msgstr "Zurücksetzen" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Linie am Bild zeichnen, \n" +"um die Ausrichtung festzulegen." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 msgid "Parallel" msgstr "Parallel" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 msgid "Perpendicular" msgstr "Im rechten Winkel" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 -msgid "Pick a background color" -msgstr "Eine Hintergrundfarbe wählen" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 -msgid "Point 1:" -msgstr "Punkt 1:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 -msgid "Point 2:" -msgstr "Punkt 2:" +msgid "Alignment" +msgstr "Ausrichtung" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -msgid "Reset" -msgstr "Zurücksetzen" +msgid "Original size" +msgstr "Ursprüngliche Größe" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 -msgid "_Background:" -msgstr "_Hintergrund:" +msgid "Bounding box" +msgstr "Begrenzungsrahmen" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 -msgid "_Transparent" -msgstr "_Transparent" +msgid "Crop borders" +msgstr "Ränder beschneiden" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -msgid "Amount:" -msgstr "Wert:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Vorschau:" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 -msgid "Radius:" -msgstr "Radius:" - -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 msgid "Threshold:" msgstr "Schwellwert:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Radius:" + #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 -msgid "_Preview:" -msgstr "_Vorschau:" +msgid "Amount:" +msgstr "Wert:" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 -msgid "Basic tools to modify images." -msgstr "Grundlegende Werkzeuge zum Bearbeiten von Bildern." - -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Image tools" msgstr "Bildwerkzeuge" +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +msgid "Basic tools to modify images." +msgstr "Grundlegende Werkzeuge zum Bearbeiten von Bildern." + #: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors..." msgstr "Farbabgleich …" @@ -2547,200 +2552,200 @@ msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Helligkeit, Kontrast, Sättigung und Gammawert eines Bildes ändern" -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 msgid "Square" msgstr "Quadrat" -#: ../extensions/file_tools/gth-file-tool-crop.c:423 -#: ../extensions/file_tools/gth-file-tool-resize.c:494 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:499 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (Bild)" # CHECK -#: ../extensions/file_tools/gth-file-tool-crop.c:426 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:503 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (Bildschirm)" -#: ../extensions/file_tools/gth-file-tool-crop.c:430 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:508 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:431 -#: ../extensions/file_tools/gth-file-tool-resize.c:504 +#: ../extensions/file_tools/gth-file-tool-crop.c:433 +#: ../extensions/file_tools/gth-file-tool-resize.c:509 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, Buch)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:505 +#: ../extensions/file_tools/gth-file-tool-crop.c:434 +#: ../extensions/file_tools/gth-file-tool-resize.c:510 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:506 +#: ../extensions/file_tools/gth-file-tool-crop.c:435 +#: ../extensions/file_tools/gth-file-tool-resize.c:511 msgid "3:2 (Postcard)" msgstr "3:2 (Postkarte)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:507 +#: ../extensions/file_tools/gth-file-tool-crop.c:436 +#: ../extensions/file_tools/gth-file-tool-resize.c:512 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:437 +#: ../extensions/file_tools/gth-file-tool-resize.c:513 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:438 +#: ../extensions/file_tools/gth-file-tool-resize.c:514 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:439 +#: ../extensions/file_tools/gth-file-tool-resize.c:515 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/rename_series/gth-template-selector.c:260 +#: ../extensions/file_tools/gth-file-tool-crop.c:440 +#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:232 msgid "Custom" msgstr "Benutzerdefiniert:" -#: ../extensions/file_tools/gth-file-tool-crop.c:449 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:455 +#: ../extensions/file_tools/gth-file-tool-rotate.c:416 msgid "Rule of Thirds" msgstr "Drittel-Regel" -#: ../extensions/file_tools/gth-file-tool-crop.c:450 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:456 +#: ../extensions/file_tools/gth-file-tool-rotate.c:417 msgid "Golden Sections" msgstr "Goldener Schnitt" -#: ../extensions/file_tools/gth-file-tool-crop.c:451 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:457 +#: ../extensions/file_tools/gth-file-tool-rotate.c:418 msgid "Center Lines" msgstr "Zentrale Linien" -#: ../extensions/file_tools/gth-file-tool-crop.c:452 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:458 +#: ../extensions/file_tools/gth-file-tool-rotate.c:419 msgid "Uniform" msgstr "Gleichmäßig" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop..." msgstr "Zuschneiden …" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop" msgstr "Zuschneiden" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:65 -#: ../extensions/file_tools/gth-file-tool-negative.c:65 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 msgid "Applying changes" msgstr "Änderungen anwenden" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:189 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 msgid "Desaturate" msgstr "Entsättigen" -#: ../extensions/file_tools/gth-file-tool-enhance.c:116 +#: ../extensions/file_tools/gth-file-tool-enhance.c:119 msgid "White balance correction" msgstr "Weißabgleichlorrektur" -#: ../extensions/file_tools/gth-file-tool-enhance.c:339 +#: ../extensions/file_tools/gth-file-tool-enhance.c:342 msgid "Enhance Colors" msgstr "Farben verbessern" -#: ../extensions/file_tools/gth-file-tool-enhance.c:340 +#: ../extensions/file_tools/gth-file-tool-enhance.c:343 msgid "Automatic white balance correction" msgstr "Automatische Weißabgleichkorrektur" -#: ../extensions/file_tools/gth-file-tool-equalize.c:83 +#: ../extensions/file_tools/gth-file-tool-equalize.c:86 msgid "Equalizing image histogram" msgstr "Bild durch Angleichen des Histogramms verbessern" # CHECK -#: ../extensions/file_tools/gth-file-tool-equalize.c:261 +#: ../extensions/file_tools/gth-file-tool-equalize.c:275 msgid "Equalize" msgstr "Angleichen" -#: ../extensions/file_tools/gth-file-tool-equalize.c:262 +#: ../extensions/file_tools/gth-file-tool-equalize.c:276 msgid "Equalize image histogram" msgstr "Das Bildhistogramm angleichen" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Vertikal spiegeln" -#: ../extensions/file_tools/gth-file-tool-flip.c:74 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 msgid "Flip the image vertically" msgstr "Das Bild vertikal spiegeln" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Horizontal spiegeln" -#: ../extensions/file_tools/gth-file-tool-mirror.c:74 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 msgid "Mirror the image horizontally" msgstr "Das Bild horizontal spiegeln" -#: ../extensions/file_tools/gth-file-tool-negative.c:183 +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Negativ" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Wiederholen" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize..." msgstr "Bildgröße ändern …" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize" msgstr "Größe ändern" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate..." msgstr "Drehen …" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate" msgstr "Drehen" -#: ../extensions/file_tools/gth-file-tool-rotate.c:597 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Freely rotate the image" msgstr "Das Bild frei drehen" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Linksherum drehen" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 msgid "Rotate the image by 90 degrees counterclockwise" msgstr "Das Bild um 90 Grad gegen den Uhrzeigersinn drehen" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Rechts herum drehen" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 msgid "Rotate the image by 90 degrees clockwise" msgstr "Das Bild um 90 Grad im Uhrzeigersinn drehen" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Speichern unter" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Speichern" @@ -2748,15 +2753,15 @@ msgid "Sharpening image" msgstr "Bild wird geschärft" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus..." msgstr "Schärfe verbessern …" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus" msgstr "Schärfe verbessern" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Rückgängig" @@ -2773,38 +2778,38 @@ msgstr "_Ordner:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Nach Duplikaten suchen" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 msgid "Duplicates:" msgstr "Duplikate:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 msgid "Files:" msgstr "Dateien:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -msgid "No duplicates found." -msgstr "Keine Duplikate gefunden." - #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -msgid "Search for Duplicates" -msgstr "Nach Duplikaten suchen" - -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 -#: ../gthumb/gth-browser-actions-entries.h:32 +#: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "_Ansicht" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Keine Duplikate gefunden." + #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 msgid "Find Duplicates" msgstr "Nach Duplikaten suchen" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "_Beginnen in:" -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" msgstr "_Filter:" @@ -2832,23 +2837,23 @@ msgid "no file" msgstr "Keine Datei" -#: ../extensions/find_duplicates/gth-find-duplicates.c:426 -#: ../extensions/find_duplicates/gth-find-duplicates.c:521 +#: ../extensions/find_duplicates/gth-find-duplicates.c:397 +#: ../extensions/find_duplicates/gth-find-duplicates.c:492 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d Duplikat" msgstr[1] "%d Duplikate" -#: ../extensions/find_duplicates/gth-find-duplicates.c:565 +#: ../extensions/find_duplicates/gth-find-duplicates.c:536 msgid "Search completed" msgstr "Suche abgeschlossen" -#: ../extensions/find_duplicates/gth-find-duplicates.c:577 +#: ../extensions/find_duplicates/gth-find-duplicates.c:548 msgid "Searching for duplicates" msgstr "Nach Duplikaten wird gesucht" -#: ../extensions/find_duplicates/gth-find-duplicates.c:580 +#: ../extensions/find_duplicates/gth-find-duplicates.c:551 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2857,19 +2862,19 @@ msgstr[0] "%d Datei verbleibend" msgstr[1] "%d Dateien verbleibend" -#: ../extensions/find_duplicates/gth-find-duplicates.c:663 +#: ../extensions/find_duplicates/gth-find-duplicates.c:634 msgid "Getting the file list" msgstr "Dateiliste wird geholt" -#: ../extensions/find_duplicates/gth-find-duplicates.c:769 +#: ../extensions/find_duplicates/gth-find-duplicates.c:740 msgid "Duplicates" msgstr "Duplikate" -#: ../extensions/find_duplicates/gth-find-duplicates.c:1023 +#: ../extensions/find_duplicates/gth-find-duplicates.c:997 msgid "Select" msgstr "Auswählen" -#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:63 +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr …" @@ -2877,7 +2882,7 @@ msgid "Download photos from Flickr" msgstr "Fotos von Flickr herunterladen" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "Fotos zu Flickr übertragen" @@ -2889,137 +2894,130 @@ msgid "Upload images to Flickr" msgstr "Bilder zu Flickr übertragen" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Freier Platz:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "Von _öffentlichen Suchvorgängen ausschließen" - -# CHECK: Moderater Inhalt? Inhalt moderieren? -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -msgid "Moderate content" -msgstr "Moderierter Inhalt" - # CHECK: Bildersatz? Wie heißt das denn bei Flickr? #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "Bilder_sammlung:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "Private Fotos" +msgid "_Privacy:" +msgstr "_Privatsphäre:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "Private Fotos, für die Familie sichtbar" +msgid "Hi_de from public searches" +msgstr "Von _öffentlichen Suchvorgängen ausschließen" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Sicherheit:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Private photos, visible to family and friends" msgstr "Private Fotos, für die Familie und Freunde sichtbar" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 -msgid "Restricted content" -msgstr "Eingeschränkter Inhalt" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 -msgid "Safe content" -msgstr "Sicherer Inhalt" +msgid "Private photos, visible to family" +msgstr "Private Fotos, für die Familie sichtbar" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos" +msgstr "Private Fotos" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 -msgid "_Privacy:" -msgstr "_Privatsphäre:" +msgid "Safe content" +msgstr "Sicherer Inhalt" +# CHECK: Moderater Inhalt? Inhalt moderieren? #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 -msgid "_Safety:" -msgstr "_Sicherheit:" +msgid "Moderate content" +msgstr "Moderierter Inhalt" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Restricted content" +msgstr "Eingeschränkter Inhalt" + +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "_Import" msgstr "_Importieren" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:357 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:827 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "Fotoliste konnten nicht geholt werden" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:394 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:559 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:861 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1024 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 msgid "No album selected" msgstr "Keine Album ausgewählt" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:577 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 #, c-format msgid "Import from %s" msgstr "Importieren von %s" -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1118 -#: ../gthumb/gth-browser.c:2008 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 +#: ../gthumb/gth-browser.c:1998 msgid "Could not save the file" msgstr "Die Datei konnte nicht gespeichert werden" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "Bildschirmfoto konnte nicht aufgenommen werden" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1266 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 msgid "Save Image" msgstr "Bild speichern" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Bildschirmfoto" -#. this is an empty time -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "--:--" -msgstr "--:--" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 -msgid "Change volume level" -msgstr "Die Lautstärke ändern" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 -msgid "Faster" -msgstr "Schneller" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Langsamer" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:657 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 msgid "Play" msgstr "Wiedergabe" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Slower" -msgstr "Langsamer" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 +msgid "Faster" +msgstr "Schneller" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Time:" msgstr "Zeit:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--:--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Toggle volume" msgstr "Datenträger umschalten" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 -msgctxt "time" -msgid "/" -msgstr "/" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Die Lautstärke ändern" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 -#: ../extensions/photo_importer/dlg-photo-importer.c:614 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Order wählen" @@ -3031,19 +3029,19 @@ msgid "Play audio and video files." msgstr "Video- und Audiodateien wiedergeben." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:94 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Bildschirmfoto" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:95 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Ein Bildschirmfoto aufnehmen" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:634 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 msgid "Playing video" msgstr "Video wird abgespielt" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:647 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Pause" msgstr "Pause" @@ -3062,7 +3060,7 @@ msgstr "Künstler" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "Album" @@ -3084,13 +3082,13 @@ msgstr "Einzelbildrate" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 -#: ../extensions/image_viewer/gth-image-viewer-page.c:222 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" -msgstr "Breite:" +msgstr "Breite" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "Höhe" @@ -3112,10 +3110,10 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1321 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 #: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:429 -#: ../extensions/webalbums/gth-web-exporter.c:2456 +#: ../extensions/webalbums/dlg-web-exporter.c:442 +#: ../extensions/webalbums/gth-web-exporter.c:2446 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3128,94 +3126,94 @@ msgid "Print the selected images" msgstr "Gewählte Bilder drucken" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 msgid "Centered" msgstr "Zentriert" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 -msgid "Image" -msgstr "Bild" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Left" -msgstr "Links" - #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Position:" -msgstr "Position:" +msgid "The total number of files" +msgstr "Gesamtanzahl der Dateien" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 -msgid "Preview" -msgstr "Vorschau" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -msgid "Rotation:" -msgstr "Rotation:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 msgid "The event description" msgstr "Beschreibung des Ereignisses" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "_Zeilen:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Bild" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Position:" + #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "The total number of files" -msgstr "Gesamtanzahl der Dateien" +msgid "Left" +msgstr "Links" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "Oben" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Rotation:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "Einheit:" #: ../extensions/image_print/data/ui/print-layout.ui.h:28 -msgid "_Rows:" -msgstr "_Zeilen:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 -msgid "inches" -msgstr "Zoll" +msgid "Preview" +msgstr "Vorschau" #: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "Millimeter" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 -msgid "Fonts" -msgstr "Schriften" +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "Zoll" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 msgid "Select Caption Font" msgstr "Schriftart der Beschriftung auswählen" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -msgid "Select Footer Font" -msgstr "Schriftart der Fußzeile auswählen" - #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" msgstr "Schriftart der Kopfzeile auswählen" -#: ../extensions/image_print/gth-image-print-job.c:997 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Schriftart der Fußzeile auswählen" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Schriften" + +#: ../extensions/image_print/gth-image-print-job.c:971 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Seite %d von %d" -#: ../extensions/image_print/gth-image-print-job.c:1761 -#: ../extensions/image_print/gth-image-print-job.c:1888 -#: ../extensions/image_print/gth-image-print-job.c:1925 +#: ../extensions/image_print/gth-image-print-job.c:1734 +#: ../extensions/image_print/gth-image-print-job.c:1861 +#: ../extensions/image_print/gth-image-print-job.c:1898 msgid "Could not print" msgstr "Drucken nicht möglich" -#: ../extensions/image_print/gth-image-print-job.c:1823 +#: ../extensions/image_print/gth-image-print-job.c:1796 #: ../gthumb/gth-main-default-tests.c:204 msgid "Images" msgstr "Bilder" -#: ../extensions/image_print/gth-image-print-job.c:1890 -#: ../gthumb/gth-image-loader.c:233 ../gthumb/gth-image-loader.c:306 +#: ../extensions/image_print/gth-image-print-job.c:1863 +#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:277 msgid "No suitable loader available for this file type" msgstr "Für diesen Dateityp ist kein brauchbarer Lader verfügbar" @@ -3226,19 +3224,19 @@ msgstr "»%s« wird geladen" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2695 +#: ../extensions/webalbums/gth-web-exporter.c:2685 msgid "Loading images" msgstr "Bilder werden geladen" #: ../extensions/image_print/image_print.extension.in.in.h:1 -msgid "Allow to print images choosing the page layout." -msgstr "Die Anpassung des Seitenlayouts beim Drucken von Bildern ermöglichen." - -#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Image print" msgstr "Bilddruck" -#: ../extensions/image_print/preferences.c:76 +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "Die Anpassung des Seitenlayouts beim Drucken von Bildern ermöglichen." + +#: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "Drucken" @@ -3246,24 +3244,24 @@ msgid "Rotate the selected images 90° to the right" msgstr "Die gewählten Bilder um 90° nach rechts drehen" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" msgstr "Die gewählten Bilder um 90° nach links drehen" # Bilder werden anhand der Ausrichtungsinformation gedreht. -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Tatsächlich drehen" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" msgstr "Die gewählten Bilder anhand der eingebetteten Ausrichtung drehen" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" -msgstr "Die Exif-Ausrichtung zurücksetzen" +msgstr "Die EXIF-Ausrichtung zurücksetzen" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" msgstr "" "Die eingebettete Ausrichtung zurücksetzen, ohne die Bilder tatsächlich zu " @@ -3271,8 +3269,8 @@ #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2349 -#: ../extensions/webalbums/gth-web-exporter.c:2433 +#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Bilder werden gespeichert" @@ -3284,12 +3282,12 @@ msgid "Rotate images without data loss." msgstr "Bilder verlustfrei drehen." -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "Beim Umwandeln des Bildes trat ein Problem auf: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" "This transformation may introduce small image distortions along one or more " "edges, because the image dimensions are not multiples of 8.\n" @@ -3298,8 +3296,8 @@ "unacceptable, simply apply the reverse transformation to return to the " "original image.\n" "\n" -"You can also choose to discard (or trim) any untransformable edge pixels. " -"For practical use, this mode gives the best looking results, but the " +"You can also choose to discard (or trim) any untransformable edge pixels. For " +"practical use, this mode gives the best looking results, but the " "transformation is not strictly lossless anymore." msgstr "" "Diese Umwandlung kann zu ein oder mehreren Verzerrungen entlang von Kanten " @@ -3310,220 +3308,217 @@ "ursprünglichen Bild zurückzugelangen.\n" "\n" "Sie können sich auch dafür entscheiden, alle nicht umwandelbaren Pixel an " -"Ecken zu entfernen (oder auszuschneiden). Bei der praktischen Anwendung " -"führt dies zu den besten Ergebnissen, allerdings ist die Umwandlung nicht " -"mehr strikt verlustfrei." +"Ecken zu entfernen (oder auszuschneiden). Bei der praktischen Anwendung führt " +"dies zu den besten Ergebnissen, allerdings ist die Umwandlung nicht mehr " +"strikt verlustfrei." -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" msgstr "_Trimmen" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "Verzerrung _akzeptieren" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -msgid "" -"Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, " -"fit-width, fit-width-if-larger." -msgstr "" -"Zulässige Werte: actual_size (tatsächliche Größe), keep_prev (vorherige " -"beibehalten), fit-size (Größe einpassen), fit_size_if_larger (einpassen, " -"wenn größer), fit_width (Breite anpassen), fit_width_if_larger (an Breite " -"anpassen, wenn größer)" - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -msgid "Whether to resize the window to fit the size of the image" -msgstr "" -"Legt fest, ob die Größe des Fensters an die Bildgröße angepasst werden soll" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "Nach dem Laden eines Bildes:" +msgid "Set to actual size" +msgstr "Auf Originalgröße setzen" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Hoch" +msgid "Keep previous zoom" +msgstr "Vorherigen Vergrößerungsfaktor behalten" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Niedrig" +msgid "Fit to window" +msgstr "In Fenster einpassen" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "In Fenster einpassen, falls größer" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 -msgid "Reset scrollbar positions" -msgstr "Position der Bildlaufleisten zurücksetzen" +msgid "Fit to width" +msgstr "Breite einpassen" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 -msgid "Transparency _type:" -msgstr "_Transparenzmodus:" +msgid "Fit to width if larger" +msgstr "In Fensterbreite einpassen, falls größer" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Position der Bildlaufleisten zurücksetzen" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "Nach dem Laden eines Bildes:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "Vergrößerungs_qualität:" -#: ../extensions/image_viewer/gth-image-histogram.c:74 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "_Transparenzmodus:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Hoch" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Niedrig" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Weiß" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Schwarz" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Karomuster" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "Histogramm" -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 msgid "Copy Image" msgstr "Bild kopieren" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 msgid "Copy the image to the clipboard" msgstr "Das Bild in die Zwischenablage kopieren" -#: ../extensions/image_viewer/gth-image-viewer-page.c:197 +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 msgid "Paste Image" msgstr "Bild einfügen" -#: ../extensions/image_viewer/gth-image-viewer-page.c:198 +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 msgid "Paste the image from the clipboard" msgstr "Das Bild aus der Zwischenablage einfügen" -#: ../extensions/image_viewer/gth-image-viewer-page.c:202 +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "Vergrößern" -#: ../extensions/image_viewer/gth-image-viewer-page.c:203 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Vergrößern" -#: ../extensions/image_viewer/gth-image-viewer-page.c:207 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Verkleinern" -#: ../extensions/image_viewer/gth-image-viewer-page.c:208 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Verkleinern" -#: ../extensions/image_viewer/gth-image-viewer-page.c:212 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:213 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Originalgröße" -#: ../extensions/image_viewer/gth-image-viewer-page.c:217 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Einpassen" -#: ../extensions/image_viewer/gth-image-viewer-page.c:218 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Größe an Fenster anpassen" -#: ../extensions/image_viewer/gth-image-viewer-page.c:223 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Größe an Breite anpassen" -#: ../extensions/image_viewer/gth-image-viewer-page.c:230 -msgid "_Fit Window to Image" -msgstr "Bild auf die Fenstergr_öße anpassen" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:231 -msgid "Resize the window to the size of the image" -msgstr "Die Größe des Fensters an die Bildgröße anpassen" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -msgid "Basic image viewing." -msgstr "Grundlegende Bildbetrachtung." - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Bildbetrachter" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Originalgröße" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Größe an Breite anpassen" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Grundlegende Bildbetrachtung." -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Betrachter" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "Zulässige Werte: none, file_date, current_date" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "Zulässige Werte: yyyymmdd, yyyymm, yyyy" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:3 -msgid "The day of the month" -msgstr "Der Tag des Monats" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "S_peicherort" -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "Die Stunde" +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "_Automatischer Unterordner" -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "Die Minuten" +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +msgid "as _single subfolder" +msgstr "als einzelner _Unterordner" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "Der Monat" +msgid "The year" +msgstr "Das Jahr" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "Die Sekunden" +msgid "The month" +msgstr "Der Monat" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "Das Jahr" +msgid "The day of the month" +msgstr "Der Tag des Monats" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -msgid "_Automatic subfolder" -msgstr "_Automatischer Unterordner" +msgid "The hour" +msgstr "Die Stunde" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "S_peicherort" +msgid "The minutes" +msgstr "Die Minuten" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -msgid "as _single subfolder" -msgstr "als einzelner _Unterordner" +msgid "The seconds" +msgstr "Die Sekunden" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "Ungültiges Ziel" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "Beispiel: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:326 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Dateidatum" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:336 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "Jahr-Monat-Tag" -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "Jahr-Monat" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "Jahr" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "Benutzerdefiniertes Format" #: ../extensions/importer/gth-import-task.c:442 #: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:643 +#: ../extensions/importer/gth-import-task.c:648 msgid "Importing files" msgstr "Dateien werden importiert" @@ -3535,25 +3530,25 @@ msgid "The selected files are already present in the destination." msgstr "Die gewählten Dateien sind im Ziel bereits vorhanden." -#: ../extensions/importer/gth-import-task.c:619 -#: ../gthumb/gth-file-source-vfs.c:685 +#: ../extensions/importer/gth-import-task.c:622 +#: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Die Dateien konnte nicht gelöscht werden" -#: ../extensions/importer/gth-import-task.c:620 +#: ../extensions/importer/gth-import-task.c:623 msgid "Delete operation not supported." msgstr "Löschvorgang wird nicht unterstützt." -#: ../extensions/importer/gth-import-task.c:704 +#: ../extensions/importer/gth-import-task.c:709 msgid "Last imported" msgstr "Zuletzt importiert" -#: ../extensions/importer/gth-import-task.c:839 +#: ../extensions/importer/gth-import-task.c:815 msgid "No file specified." msgstr "Keine Datei angegeben." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:876 +#: ../extensions/importer/gth-import-task.c:852 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3562,17 +3557,15 @@ "Nicht genug freier Platz in »%s«.\n" "%s werden benötigt, aber es sind nur %s verfügbar." -#: ../extensions/list_tools/callbacks.c:65 ../gthumb/gth-filterbar.c:303 +#: ../extensions/list_tools/callbacks.c:75 ../gthumb/gth-filterbar.c:303 msgid "Personalize..." msgstr "_Personalisieren …" -#: ../extensions/list_tools/callbacks.c:238 -#: ../extensions/list_tools/callbacks.c:249 +#: ../extensions/list_tools/callbacks.c:319 msgid "Tools" msgstr "Werkzeuge" -#: ../extensions/list_tools/callbacks.c:240 -#: ../extensions/list_tools/callbacks.c:251 +#: ../extensions/list_tools/callbacks.c:320 msgid "Batch tools for multiple files" msgstr "Stapelverarbeitung für mehrere Dateien" @@ -3581,98 +3574,98 @@ msgstr "_Übergehen" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "_Befehle:" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "Befehle" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "_Befehle:" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, no-c-format -msgid "%E" -msgstr "%E" +msgid "_Wait for the command to finish" +msgstr "Auf Beendigung des Befehls _warten" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "Befehl für jede Datei einmal _ausführen" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format -msgid "%N" -msgstr "%N" +msgid "_Terminal command (shell script)" +msgstr "_Terminalbefehl (Shellskript)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "T_astenkürzel:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +msgid "The file uri" +msgstr "Die Dateiadresse" -#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:7 -#, no-c-format -msgid "%ask{ message }{ default value }" -msgstr "%ask{ Meldung }{ Vorgabewert }" +msgid "The file path" +msgstr "Der Dateipfad" -#. Translate only 'attribute name' -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#, no-c-format -msgid "%attr{ attribute name }" -msgstr "%attr{ Attributname }" +# CHECK +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "Der Basisname der Datei" -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:13 -#, no-c-format -msgid "%quote{ text }" -msgstr "%quote{ Text }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "Der Pfad zum Eltern-Ordner" +#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:14 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 -msgid "A file attribute" -msgstr "Ein Dateiattribut" +#, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "%ask{ Meldung }{ Vorgabewert }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:15 msgid "Ask an input value" msgstr "Nach einem Eingabewert fragen" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:17 -msgid "E_xecute command once for every file" -msgstr "Befehl für jede Datei einmal _ausführen" - +#. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 -msgid "Quote the text " -msgstr "Text zitieren" +#, no-c-format +msgid "%attr{ attribute name }" +msgstr "%attr{ Attributname }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:19 -msgid "Sh_ortcut:" -msgstr "T_astenkürzel:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "Ein Dateiattribut" -# CHECK #: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -msgid "The file basename" -msgstr "Der Basisname der Datei" +#, no-c-format +msgid "%N" +msgstr "%N" #: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" msgstr "Basisname der Datei ohne Erweiterung" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -msgid "The file extension" -msgstr "Die Dateierweiterung" - #: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -msgid "The file path" -msgstr "Der Dateipfad" +#, no-c-format +msgid "%E" +msgstr "%E" #: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -msgid "The file uri" -msgstr "Die Dateiadresse" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "The parent folder path" -msgstr "Der Pfad zum Eltern-Ordner" +msgid "The file extension" +msgstr "Die Dateierweiterung" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "_Command:" -msgstr "_Befehl:" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ Text }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "_Terminal command (shell script)" -msgstr "_Terminalbefehl (Shellskript)" +msgid "Quote the text " +msgstr "Text zitieren" #: ../extensions/list_tools/data/ui/script-editor.ui.h:30 -msgid "_Wait for the command to finish" -msgstr "Auf Beendigung des Befehls _warten" +msgid "_Command:" +msgstr "_Befehl:" #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" @@ -3683,7 +3676,7 @@ msgstr "Tastenkürzel" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "Zeigen" @@ -3703,32 +3696,32 @@ msgid "Are you sure you want to delete the selected command?" msgstr "Soll der ausgewählte Befehl gelöscht werden?" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" msgstr "Geben Sie einen Wert ein:" -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:570 -#: ../extensions/webalbums/gth-web-exporter.c:582 -#: ../extensions/webalbums/gth-web-exporter.c:590 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:560 +#: ../extensions/webalbums/gth-web-exporter.c:572 +#: ../extensions/webalbums/gth-web-exporter.c:580 msgid "Malformed command" msgstr "Ungültiger Befehl" -#: ../extensions/list_tools/gth-script-editor-dialog.c:176 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "nichts" -#: ../extensions/list_tools/gth-script-editor-dialog.c:182 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "Taste %d auf dem Nummernblock" -#: ../extensions/list_tools/gth-script-editor-dialog.c:325 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "Kein Befehl angegeben" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "Befehl wurde mit Status %d beendet" @@ -3741,37 +3734,36 @@ msgid "Scripting and batch manipulation of files." msgstr "Stapelverarbeitung und Bearbeitung von Dateien mittels Skripten." -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "S" msgstr "S" -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "N" msgstr "N" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "W" msgstr "W" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "E" msgstr "O" -#: ../extensions/map_view/gth-map-view.c:196 +#: ../extensions/map_view/gth-map-view.c:205 #: ../extensions/map_view/map_view.extension.in.in.h:1 msgid "Map" msgstr "Karte" #. No GPS label -#: ../extensions/map_view/gth-map-view.c:265 +#: ../extensions/map_view/gth-map-view.c:273 msgid "The geographical position information is not available for this image." msgstr "" -"Informationen zur geografischen Position sind für dieses Bild nicht " -"verfügbar." +"Informationen zur geografischen Position sind für dieses Bild nicht verfügbar." #: ../extensions/map_view/map_view.extension.in.in.h:2 msgid "View the photo position on the map" @@ -3786,39 +3778,39 @@ msgstr "Fotos zu Photobucket übertragen" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -msgid "1 megabyte file size" -msgstr "Dateigröße 1 Megabyte" +msgid "Tiny ( 100 x 75 )" +msgstr "Winzig ( 100 x 75 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "15ʺ Bildschirm ( 800 x 600 )" +msgid "Small ( 160 x 120 )" +msgstr "Klein ( 160 x 120 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "17ʺ Bildschirm ( 1024 x 768 )" +msgid "Medium ( 320 x 240 )" +msgstr "Mittel ( 320 x 240 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 msgid "Large ( 640 x 480 )" msgstr "Groß ( 640 x 480 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "Mittel ( 320 x 240 )" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "15ʺ Bildschirm ( 800 x 600 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 -msgid "Small ( 160 x 120 )" -msgstr "Klein ( 160 x 120 )" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "17ʺ Bildschirm ( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "Winzig ( 100 x 75 )" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +msgid "1 megabyte file size" +msgstr "Dateigröße 1 Megabyte" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 msgid "_Scramble filenames" msgstr "Dateinamen ver_würfeln" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Container:" @@ -3880,60 +3872,60 @@ msgstr "Fotos und andere Dateien aus einem Ordner importieren" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "Nach dem Import von einem Gerät:" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 msgid "_Rotate the images physically" msgstr "Bilder tatsächlich _drehen" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "Nach dem Import von einem Gerät:" + #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 #: ../gthumb/gth-filterbar.c:413 msgid "S_how:" msgstr "An_zeigen:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -msgid "_Delete the imported files from the source" -msgstr "Originale der importierten Bilder _löschen" - #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "_Schlagwörter:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "_Ereignis:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Tags:" -msgstr "_Schlagwörter:" +msgid "_Delete the imported files from the source" +msgstr "Originale der importierten Bilder _löschen" -#: ../extensions/photo_importer/dlg-photo-importer.c:222 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:173 +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 msgid "Could not import the files" msgstr "Die Dateien konnten nicht importiert werden" #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:294 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "Zu importierende Dateien: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:334 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" msgstr "Ordner konnte nicht geladen werden" -#: ../extensions/photo_importer/dlg-photo-importer.c:364 -#: ../gthumb/gth-browser.c:1921 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:1911 msgid "Getting folder listing..." msgstr "Ordnerinhalt wird ermittelt …" -#: ../extensions/photo_importer/dlg-photo-importer.c:410 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "Leer" -#: ../extensions/photo_importer/dlg-photo-importer.c:580 +#: ../extensions/photo_importer/dlg-photo-importer.c:586 msgid "Import from Removable Device" msgstr "Import von tragbarem Gerät" -#: ../extensions/photo_importer/dlg-photo-importer.c:612 +#: ../extensions/photo_importer/dlg-photo-importer.c:618 msgid "Import from Folder" msgstr "Aus Ordner importieren" @@ -3946,7 +3938,7 @@ msgstr "Fotos von tragbaren Geräten importieren." #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." msgstr "_Picasa-Webalbum …" @@ -3954,27 +3946,31 @@ msgid "Download photos from Picasa Web Album" msgstr "Fotos vom Picasa-Webalbum herunterladen" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" msgstr "Fotos zum Picasa-Webalbum übertragen" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "In Picasa-Webalbum exportieren" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "_Alben:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 msgid "Import from Picasa Web Album" msgstr "Aus dem Picasa-Webalbum importieren" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 msgid "_Album:" msgstr "_Album:" #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 +msgid "_E-Mail:" +msgstr "E-_Mail:" + +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 msgid "" "Type the characters you see in the picture below. Letters are not case-" "sensitive." @@ -3982,34 +3978,30 @@ "Geben Sie die Zeichen ein, die im Bild unten angezeigt werden. Groß-/" "Kleinschreibung wird nicht berücksichtigt." -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "_E-Mail:" -msgstr "E-_Mail:" - #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 msgid "_Password:" msgstr "_Passwort:" -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Öffentlich" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:307 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "Die Albenliste konnte nicht geholt werden" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:391 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" msgstr "Picasa-Webalbum" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:478 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "Konto" -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:133 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 msgid "Could not load the file" msgstr "Datei konnte nicht geladen werden" @@ -4021,39 +4013,27 @@ msgid "Upload images to Picasa Web Albums" msgstr "Bilder zu Picasa-Webalben übertragen" -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: jpeg, jpg." -msgstr "Zulässige Werte: jpeg, jpg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:2 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Zulässige Werte: none (keine), deflate (packen) sowie jpeg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:3 -msgid "Possible values are: tiff, tif." -msgstr "Zulässige Werte: tiff, tif." - #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "_Optimieren" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 msgid "_Default extension:" msgstr "Stan_dard-Erweiterung:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "_Progressiv" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 msgid "_Quality:" msgstr "_Qualität:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 msgid "_Smoothing:" msgstr "_Glätten:" +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "_Optimieren" + +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progressiv" + #: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 msgid "Compression _level:" msgstr "Kompressions_grad:" @@ -4066,48 +4046,48 @@ msgid "_RLE compression" msgstr "_RLE-Kompression" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "Kompression" - #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "_Normal (Entpacken)" +msgid "_No compression" +msgstr "_Keine Kompression" #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "Auflösung" +msgid "No_rmal (Deflate)" +msgstr "_Normal (Entpacken)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 msgid "_Loss compression (JPEG)" msgstr "_Verlustbehaftete Kompression (JPEG)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_No compression" -msgstr "_Keine Kompression" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +msgid "Compression" +msgstr "Kompression" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 msgid "dpi" msgstr "DPI" -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:527 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +msgid "Resolution" +msgstr "Auflösung" + +#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 msgid "JPEG" msgstr "JPEG" -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 +#: ../extensions/pixbuf_savers/gth-png-saver.c:140 msgid "PNG" msgstr "PNG" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 #: ../gthumb/gth-buffer-data.c:84 msgid "Insufficient memory" msgstr "Nicht ausreichender Speicher" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 msgid "TGA" msgstr "TGA" -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:542 +#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 msgid "TIFF" msgstr "TIFF" @@ -4121,30 +4101,30 @@ "Speichern von Bildern in häufig genutzten Formaten wie JPEG, PNG und TIFF" #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "Das Laden von Bildern im Raw-Format ermöglichen." - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" msgstr "Unterstützung für Raw-Format" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Das Laden von Bildern im Raw-Format ermöglichen." + +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_Y:" msgstr "_Y:" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." msgstr "Rote Augen entfernen …" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "Rote Augen entfernen" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:470 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" msgstr "Den durch Blitzgeräte hervorgerufenen Rote-Augen-Effekt entfernen" @@ -4156,146 +4136,134 @@ msgid "Tool to remove the red-eye effect from a photo." msgstr "Werkzeug zum Entfernen des Rote-Augen-Effekts aus einem Foto." -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "" -"Possible values include: general::unsorted, file::name, file::size, file::" -"mtime, exif::photo::datetimeoriginal" -msgstr "" -"Mögliche Werte sind unter anderen: general::unsorted, file::name, file::" -"size, file::mtime, exif::photo::datetimeoriginal" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "Zulässige Werte: 0 (keine), 1 (niedriger) sowie 2 (höher)." - #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -msgid "add" -msgstr "hinzufügen" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "digits" msgstr "Ziffern" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "format:" msgstr "Format:" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 msgid "remove" msgstr "entfernen" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, no-c-format -msgid "%A{ identifier }" -msgstr "%A{ Bezeichner }" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "hinzufügen" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, no-c-format -msgid "%M{ format }" -msgstr "%M{ Format }" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Umbenennen" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" msgstr "_Groß-/Kleinschreibung:" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 -msgid "Edit template" -msgstr "Vorlage bearbeiten" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 +msgid "Edit template" +msgstr "Vorlage bearbeiten" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Der ursprüngliche Dateiname" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "Die ursprüngliche Erweiterung" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "Die ursprüngliche Zählnummer" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Re_verse Order" -msgstr "_Reihenfolge umkehren" +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ Format }" #: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -msgid "Rename" -msgstr "Umbenennen" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 -msgid "The digitalization date" -msgstr "Das Datum der Digitalisierung" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 msgid "The modification date" msgstr "Der Änderungszeitpunkt" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -msgid "The original enumerator" -msgstr "Die ursprüngliche Zählnummer" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 -msgid "The original extension" -msgstr "Die ursprüngliche Erweiterung" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "Das Datum der Digitalisierung" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "The original filename" -msgstr "Der ursprüngliche Dateiname" +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ Bezeichner }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "_Vorlage:" -#: ../extensions/rename_series/dlg-rename-series.c:64 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "_Reihenfolge umkehren" + +#: ../extensions/rename_series/dlg-rename-series.c:58 msgid "Enumerator" msgstr "Zählnummer" -#: ../extensions/rename_series/dlg-rename-series.c:65 +#: ../extensions/rename_series/dlg-rename-series.c:59 msgid "Original filename" msgstr "Der ursprüngliche Dateiname" -#: ../extensions/rename_series/dlg-rename-series.c:66 +#: ../extensions/rename_series/dlg-rename-series.c:60 msgid "Original extension" msgstr "Die ursprüngliche Erweiterung" -#: ../extensions/rename_series/dlg-rename-series.c:67 +#: ../extensions/rename_series/dlg-rename-series.c:61 msgid "Original enumerator" msgstr "Die ursprüngliche Zählnummer" -#: ../extensions/rename_series/dlg-rename-series.c:68 +#: ../extensions/rename_series/dlg-rename-series.c:62 msgid "Modification date" msgstr "Der Änderungszeitpunkt" -#: ../extensions/rename_series/dlg-rename-series.c:69 +#: ../extensions/rename_series/dlg-rename-series.c:63 msgid "Digitalization date" msgstr "Das Datum der Digitalisierung" -#: ../extensions/rename_series/dlg-rename-series.c:70 +#: ../extensions/rename_series/dlg-rename-series.c:64 msgid "File attribute" msgstr "Dateiattribut" -#: ../extensions/rename_series/dlg-rename-series.c:556 -#: ../extensions/rename_series/dlg-rename-series.c:687 +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 msgid "Could not rename the files" msgstr "Dateien konnten nicht umbenannt werden" -#: ../extensions/rename_series/dlg-rename-series.c:784 +#: ../extensions/rename_series/dlg-rename-series.c:780 msgid "Could not save the template" msgstr "Die Vorlage konnte nicht gespeichert werden" -#: ../extensions/rename_series/dlg-rename-series.c:802 +#: ../extensions/rename_series/dlg-rename-series.c:798 msgid "Edit Template" msgstr "Vorlage bearbeiten" -#: ../extensions/rename_series/dlg-rename-series.c:859 +#: ../extensions/rename_series/dlg-rename-series.c:856 msgid "Old Name" msgstr "Alter Name" -#: ../extensions/rename_series/dlg-rename-series.c:870 +#: ../extensions/rename_series/dlg-rename-series.c:867 msgid "New Name" msgstr "Neuer Name" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:944 msgid "Keep original case" msgstr "Groß-/Kleinschreibung beibehalten" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:945 msgid "Convert to lower-case" msgstr "In Kleinschreibung umwandeln" -#: ../extensions/rename_series/dlg-rename-series.c:947 +#: ../extensions/rename_series/dlg-rename-series.c:946 msgid "Convert to upper-case" msgstr "In Großschreibung umwandeln" @@ -4319,40 +4287,36 @@ msgid "Resize the selected images" msgstr "Die Größe der gewählten Bilder ändern" -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "Zulässige Werte: pixels (Pixel), percentage (Prozentsatz)." - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Format" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Bildgröße ändern" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 msgid "New dimensions" msgstr "Neue Abmessungen" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "Resize Images" -msgstr "Bildgröße ändern" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "_Höhe:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" msgstr "Ursprüngliches Seitenverhältnis _beibehalten" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Format" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "pixel" msgstr "Pixel" -#: ../extensions/resize_images/dlg-resize-images.c:166 +#: ../extensions/resize_images/dlg-resize-images.c:168 msgid "Resizing images" msgstr "Bildgröße wird geändert" -#: ../extensions/resize_images/dlg-resize-images.c:408 +#: ../extensions/resize_images/dlg-resize-images.c:412 msgid "Keep the original format" msgstr "Originalformat beibehalten" @@ -4381,23 +4345,23 @@ msgid "Find files" msgstr "Dateien suchen" -#: ../extensions/search/callbacks.c:133 +#: ../extensions/search/callbacks.c:132 msgid "Search again" msgstr "Neue Suche" #. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/callbacks.c:174 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "Suchen" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:195 +#: ../extensions/search/gth-search-editor.c:111 +#: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "alle folgenden Regeln" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:196 +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "eine der folgenden Regeln" @@ -4406,15 +4370,15 @@ msgid "Files found until now: %s" msgstr "Bis jetzt gefundene Dateien: %s" -#: ../extensions/search/gth-search-task.c:270 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "Suche läuft …" -#: ../extensions/search/gth-search-task.c:276 +#: ../extensions/search/gth-search-task.c:277 msgid "Cancel the operation" msgstr "Den Vorgang abbrechen" -#: ../extensions/search/search.extension.in.in.h:1 +#: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." msgstr "Dateisuchwerkzeug." @@ -4426,59 +4390,59 @@ msgid "View as a slideshow" msgstr "Als Diaschau betrachten" -#: ../extensions/slideshow/callbacks.c:406 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "Diaschau" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -msgid "Add files to the playlist" -msgstr "Dateien zur Wiedergabeliste hinzufügen" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "Wiedergabeliste" +msgid "_Personalize" +msgstr "_Personalisieren" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "_Zufällige Reihenfolge" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "Die gewählten Dateien entfernen" +msgid "_Transition effect:" +msgstr "Überblendungseffek_t:" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "_Automatisch ändern, alle" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "Nach Ende der Vorführung _neu beginnen" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "_Personalisieren" +msgid "R_andom order" +msgstr "_Zufällige Reihenfolge" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "Nach Ende der Vorführung _neu beginnen" +msgid "Playlist" +msgstr "Wiedergabeliste" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 -msgid "_Transition effect:" -msgstr "Überblendungseffek_t:" +msgid "Add files to the playlist" +msgstr "Dateien zur Wiedergabeliste hinzufügen" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Die gewählten Dateien entfernen" #: ../extensions/slideshow/gth-slideshow.c:229 msgid "Playing slideshow" msgstr "Diaschau wird abgespielt" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow-preferences.c:183 msgid "Choose the files to play" msgstr "Abzuspielende Dateien auswählen" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:192 msgid "Audio files" msgstr "Audiodateien" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:258 msgid "Random" msgstr "Zufällig" @@ -4544,12 +4508,12 @@ msgstr "Index" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "Nächstes" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:105 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "Vorheriges" @@ -4574,169 +4538,169 @@ msgid "View the previous page" msgstr "Die vorherige Seite anzeigen" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Alle Bilder in einem einzigen Bild" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 +msgid "Adapts to the window width" +msgstr "An die Fensterbreite anpassen" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Web-Album" + #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 #, no-c-format msgid "%P" msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 -msgid "Adapts to the window width" -msgstr "An die Fensterbreite anpassen" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 -msgid "All images on a single image" -msgstr "Alle Bilder in einem einzigen Bild" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Originale an den Zielort kopieren" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 -msgid "Image Attributes" -msgstr "Bild-Attribute" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Ve_rkleinern, wenn größer als:" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "Image Page" -msgstr "Bildseite" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "_Adapt to the window width " +msgstr "An die Fensterbreite _anpassen" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 msgid "Index Page" msgstr "Indexseite" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Show the description, if available" -msgstr "Die Beschreibung anzeigen, falls verfügbar" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Show the following attributes:" -msgstr "Folgende Attribute anzeigen:" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "Vorschaubilderbeschriftung" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 msgid "The current image number" msgstr "Die aktuelle Bildnummer" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -msgid "The file comment" -msgstr "Der Dateikommentar" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "The total number of images" msgstr "Gesamtanzahl der Bilder" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "Thumbnail Caption" -msgstr "Vorschaubilderbeschriftung" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +msgid "The file comment" +msgstr "Der Dateikommentar" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 -msgid "Web Album" -msgstr "Web-Album" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "Bildseite" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "_Adapt to the window width " -msgstr "An die Fensterbreite _anpassen" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "Die Beschreibung anzeigen, falls verfügbar" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "_Copy originals to destination" -msgstr "_Originale an den Zielort kopieren" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "Folgende Attribute anzeigen:" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -msgid "_Resize if larger than:" -msgstr "Ve_rkleinern, wenn größer als:" +msgid "Image Attributes" +msgstr "Bild-Attribute" -#: ../extensions/webalbums/gth-web-exporter.c:1812 +#: ../extensions/webalbums/gth-web-exporter.c:1802 msgid "Could not show the destination" msgstr "Das Ziel konnte nicht angezeigt werden" -#: ../extensions/webalbums/gth-web-exporter.c:1848 +#: ../extensions/webalbums/gth-web-exporter.c:1838 msgid "The album has been created successfully." msgstr "Das Album wurde erfolgreich angelegt." -#: ../extensions/webalbums/gth-web-exporter.c:2116 -#: ../extensions/webalbums/gth-web-exporter.c:2143 +#: ../extensions/webalbums/gth-web-exporter.c:2106 +#: ../extensions/webalbums/gth-web-exporter.c:2133 msgid "Saving thumbnails" msgstr "Miniatur-Vorschaubilder werden gespeichert" -#: ../extensions/webalbums/gth-web-exporter.c:2171 +#: ../extensions/webalbums/gth-web-exporter.c:2161 msgid "Saving HTML pages: Images" msgstr "HTML-Seiten werden gespeichert: Bilder" -#: ../extensions/webalbums/gth-web-exporter.c:2229 +#: ../extensions/webalbums/gth-web-exporter.c:2219 msgid "Saving HTML pages: Indexes" msgstr "HTML-Seiten werden gespeichert: Indizes" -#: ../extensions/webalbums/gth-web-exporter.c:2512 +#: ../extensions/webalbums/gth-web-exporter.c:2502 msgid "Copying original images" msgstr "Originalbilder werden kopiert" -#: ../extensions/webalbums/gth-web-exporter.c:2938 +#: ../extensions/webalbums/gth-web-exporter.c:2929 msgid "Could not find the style folder" msgstr "Der Stilvorlagen-Ordner konnte nicht gefunden werden" -#: ../extensions/webalbums/gth-web-exporter.c:2971 +#: ../extensions/webalbums/gth-web-exporter.c:2967 msgid "Could not create a temporary folder" msgstr "Es konnte kein temporärer Ordner angelegt werden" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 -msgid "Create static web albums." -msgstr "Statische Web-Alben anlegen." - -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Web Albums" msgstr "Web-Alben" -#: ../gthumb/dlg-personalize-filters.c:236 +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 +msgid "Create static web albums." +msgstr "Statische Web-Alben anlegen." + +#: ../gthumb/dlg-personalize-filters.c:237 msgid "Filter" msgstr "Filter" -#: ../gthumb/dlg-personalize-filters.c:314 +#: ../gthumb/dlg-personalize-filters.c:315 msgid "Could not save the filter" msgstr "Filter konnten nicht gespeichert werden" -#: ../gthumb/dlg-personalize-filters.c:357 +#: ../gthumb/dlg-personalize-filters.c:358 msgid "New Filter" msgstr "Neuer Filter" -#: ../gthumb/dlg-personalize-filters.c:386 +#: ../gthumb/dlg-personalize-filters.c:387 msgid "Edit Filter" msgstr "Filter bearbeiten" -#: ../gthumb/dlg-preferences-extensions.c:68 ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:269 msgid "All" msgstr "Alle" -#: ../gthumb/dlg-preferences-extensions.c:69 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" msgstr "Aktiviert" -#: ../gthumb/dlg-preferences-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" msgstr "Deaktiviert" -#: ../gthumb/dlg-preferences-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" msgstr "Betrachter" -#: ../gthumb/dlg-preferences-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "Metadaten" -#: ../gthumb/dlg-preferences-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "Dateiwerkzeuge" -#: ../gthumb/dlg-preferences-extensions.c:76 +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "Werkzeuge zur Dateiauflistung" -#: ../gthumb/dlg-preferences-extensions.c:77 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "Importierer" -#: ../gthumb/dlg-preferences-extensions.c:78 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" msgstr "Exportierer" -#: ../gthumb/dlg-preferences-extensions.c:215 +#: ../gthumb/dlg-preferences-extensions.c:216 msgid "Could not activate the extension" msgstr "Die Erweiterung konnte nicht aktiviert werden" -#: ../gthumb/dlg-preferences-extensions.c:225 +#: ../gthumb/dlg-preferences-extensions.c:226 msgid "Could not deactivate the extension" msgstr "Die Erweiterung konnte nicht deaktiviert werden" @@ -4790,8 +4754,8 @@ #: ../gthumb/eggfileformatchooser.c:681 #, c-format msgid "" -"The program was not able to find out the file format you want to use for `%" -"s'. Please make sure to use a known extension for that file or manually " +"The program was not able to find out the file format you want to use for `" +"%s'. Please make sure to use a known extension for that file or manually " "choose a file format from the list below." msgstr "" "Das Programm war nicht in der Lage, das von Ihnen für »%s« zu verwendende " @@ -4837,7 +4801,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2756 +#: ../gthumb/glib-utils.c:2844 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4849,13 +4813,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2765 +#: ../gthumb/glib-utils.c:2853 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:361 +#: ../gthumb/gth-browser-actions-callbacks.c:391 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4864,23 +4828,21 @@ msgstr "" "gThumb ist freie Software, Sie können sie weitergeben und/oder verändern, " "solange Sie sich an die Regeln der GNU General Public License halten, so wie " -"sie von der Free Software Foundation festgelegt wurden; entweder in Version " -"2 der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Version." +"sie von der Free Software Foundation festgelegt wurden; entweder in Version 2 " +"der Lizenz oder (nach Ihrem Ermessen) in jeder folgenden Version." -#: ../gthumb/gth-browser-actions-callbacks.c:365 +#: ../gthumb/gth-browser-actions-callbacks.c:395 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -"details." +"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR " +"A PARTICULAR PURPOSE. See the GNU General Public License for more details." msgstr "" -"gThumb wurde mit dem Ziel veröffentlicht, dass Sie es nützlich finden, " -"jedoch OHNE JEDWEDE GARANTIE, sogar ohne eine implizite Garantie der " -"VERKAUFBARKEIT oder der NUTZBARKEIT FÜR EINEN SPEZIELLEN ZWECK. Schauen Sie " -"für weitere Informationen bitte in der GNU General Public License (GNU GPL) " -"nach." +"gThumb wurde mit dem Ziel veröffentlicht, dass Sie es nützlich finden, jedoch " +"OHNE JEDWEDE GARANTIE, sogar ohne eine implizite Garantie der VERKAUFBARKEIT " +"oder der NUTZBARKEIT FÜR EINEN SPEZIELLEN ZWECK. Schauen Sie für weitere " +"Informationen bitte in der GNU General Public License (GNU GPL) nach." -#: ../gthumb/gth-browser-actions-callbacks.c:369 +#: ../gthumb/gth-browser-actions-callbacks.c:399 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." @@ -4889,303 +4851,312 @@ "gThumb erhalten haben. Falls nicht, schauen Sie unter ." -#: ../gthumb/gth-browser-actions-callbacks.c:388 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "An image viewer and browser for GNOME." msgstr "Ein Bildbetrachter und Browser für GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:391 +#: ../gthumb/gth-browser-actions-callbacks.c:421 msgid "translator_credits" msgstr "" "Christian Neumair \n" "Hendrik Richter \n" "Maren Reinecke \n" "Jochen Skulj \n" -"Mario Blättermann \n" +"Mario Blättermann \n" "Christian Kirbach \n" "Paul Seyfert \n" "Wolfgang Stöggl " -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_Datei" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "_Bearbeiten" -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "_Gehe zu" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "_Hilfe" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" msgstr "Ö_ffnen mit" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" msgstr "I_mportieren von" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" msgstr "E_xportieren nach" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" msgstr "Neues _Fenster" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" msgstr "Ein weiteres Fenster öffnen" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Öffnen" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "In neuem Fenster öffnen" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "Verschiedene Einstellungen bearbeiten" -#: ../gthumb/gth-browser-actions-entries.h:85 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." msgstr "_Sortieren nach …" -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." msgstr "_Filter …" -#: ../gthumb/gth-browser-actions-entries.h:96 +#: ../gthumb/gth-browser-actions-entries.h:108 msgid "Stop loading the current location" msgstr "Den aktuellen Ort nicht weiter laden" -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:114 msgid "Reload the current location" msgstr "Den aktuellen Ort neu laden" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" msgstr "Das vorherige Bild anzeigen" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "Das nächste Bild anzeigen" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "In den Vollbildmodus wechseln" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" msgstr "Vollbild verlassen" -#: ../gthumb/gth-browser-actions-entries.h:126 ../gthumb/gth-browser.c:3628 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3575 msgid "Go to the previous visited location" msgstr "Zum zuvor besuchten Ort wechseln" -#: ../gthumb/gth-browser-actions-entries.h:131 ../gthumb/gth-browser.c:3649 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3593 msgid "Go to the next visited location" msgstr "Zum nächsten besuchten Ort wechseln" -#: ../gthumb/gth-browser-actions-entries.h:136 ../gthumb/gth-browser.c:3670 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3611 msgid "Go up one level" msgstr "Eine Ebene höher gehen" -#: ../gthumb/gth-browser-actions-entries.h:145 ../gthumb/gth-browser.c:667 +#: ../gthumb/gth-browser-actions-entries.h:167 ../gthumb/gth-browser.c:672 msgid "_Delete History" msgstr "Chronik _vergessen" -#: ../gthumb/gth-browser-actions-entries.h:146 +#: ../gthumb/gth-browser-actions-entries.h:168 msgid "Delete the list of visited locations" msgstr "Die Liste besuchter Orte leeren" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "View the folders" msgstr "Die Ordner anzeigen" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "Show information about gthumb" msgstr "Informationen zu gThumb anzeigen" -#: ../gthumb/gth-browser-actions-entries.h:160 +#: ../gthumb/gth-browser-actions-entries.h:185 msgid "Contents" msgstr "Inhalte" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Display the gthumb Manual" msgstr "Das Handbuch von gThumb anzeigen" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "_Keyboard Shortcuts" msgstr "_Tastenkürzel" -#: ../gthumb/gth-browser-actions-entries.h:174 +#: ../gthumb/gth-browser-actions-entries.h:200 msgid "_Toolbar" msgstr "_Werkzeugleiste" -#: ../gthumb/gth-browser-actions-entries.h:175 +#: ../gthumb/gth-browser-actions-entries.h:201 msgid "View or hide the toolbar of this window" msgstr "Die Werkzeugleiste dieses Fensters anzeigen/verbergen" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:205 msgid "_Statusbar" msgstr "_Statusleiste" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:206 msgid "View or hide the statusbar of this window" msgstr "Die Statusleiste dieses Fensters anzeigen/verbergen" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:210 msgid "_Filterbar" msgstr "_Filterleiste" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:211 msgid "View or hide the filterbar of this window" msgstr "Die Filterleiste dieses Fensters anzeigen/verbergen" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:215 msgid "_Sidebar" msgstr "_Seitenleiste" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:216 msgid "View or hide the sidebar of this window" msgstr "Die Seitenleiste dieses Fensters anzeigen/verbergen" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:220 msgid "_Thumbnail Pane" msgstr "_Vorschauleiste" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:221 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Die Vorschauleiste im Ansichtsmodus anzeigen/verbergen" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:225 msgid "_Thumbnails" msgstr "_Miniatur-Vorschaubilder" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:226 msgid "View thumbnails" msgstr "Miniatur-Vorschaubilder anzeigen" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:230 msgid "_Hidden Files" msgstr "_Verborgene Dateien" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:231 msgid "Show hidden files and folders" msgstr "Verborgene Dateien und Ordner anzeigen" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:241 msgid "View file properties" msgstr "Die Eigenschaften der Datei anzeigen" -#: ../gthumb/gth-browser-actions-entries.h:214 +#: ../gthumb/gth-browser-actions-entries.h:245 msgid "Edit" msgstr "Bearbeiten" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:246 msgid "Edit file" msgstr "Datei bearbeiten" -#: ../gthumb/gth-browser.c:363 +#: ../gthumb/gth-browser-actions-entries.h:250 +msgid "_Fit Window to Image" +msgstr "Bild auf die Fenstergr_öße anpassen" + +#: ../gthumb/gth-browser-actions-entries.h:251 +msgid "Resize the window to the size of the image" +msgstr "Die Größe des Fensters an die Bildgröße anpassen" + +#: ../gthumb/gth-browser.c:369 #, c-format msgid "Open %s" msgstr "%s öffnen" -#: ../gthumb/gth-browser.c:503 +#: ../gthumb/gth-browser.c:509 msgid "[modified]" msgstr "[geändert]" -#: ../gthumb/gth-browser.c:991 +#: ../gthumb/gth-browser.c:996 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d Datei ausgewählt (%s)" msgstr[1] "%d Dateien ausgewählt (%s)" -#: ../gthumb/gth-browser.c:1026 +#: ../gthumb/gth-browser.c:1031 #, c-format msgid "%s of free space" msgstr "%s des freien Platzes" -#: ../gthumb/gth-browser.c:1235 ../gthumb/gth-browser.c:1809 -#: ../gthumb/gth-browser.c:5778 ../gthumb/gth-browser.c:5797 -#: ../gthumb/gth-browser.c:5822 +#: ../gthumb/gth-browser.c:1240 ../gthumb/gth-browser.c:1799 +#: ../gthumb/gth-browser.c:5883 ../gthumb/gth-browser.c:5902 +#: ../gthumb/gth-browser.c:5927 #, c-format msgid "Could not load the position \"%s\"" msgstr "Die Position »%s« konnte nicht geladen werden" -#: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:1932 +#: ../gthumb/gth-browser.c:1895 ../gthumb/gth-browser.c:1922 #, c-format msgid "No suitable module found for %s" msgstr "Kein passendes Modul für %s gefunden" -#: ../gthumb/gth-browser.c:2052 +#: ../gthumb/gth-browser.c:2042 #, c-format msgid "Save changes to file '%s'?" msgstr "Die Änderungen an Datei »%s« speichern?" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2047 msgid "If you don't save, changes to the file will be permanently lost." msgstr "" "Wenn Sie nicht speichern, gehen die Änderungen an dieser Datei permanent " "verloren" -#: ../gthumb/gth-browser.c:2058 +#: ../gthumb/gth-browser.c:2048 msgid "Do _Not Save" msgstr "_Nicht speichern" -#: ../gthumb/gth-browser.c:2863 ../gthumb/gth-source-tree.c:178 +#: ../gthumb/gth-browser.c:2818 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Name konnte nicht geändert werden" -#: ../gthumb/gth-browser.c:3309 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3247 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Geändert" -#: ../gthumb/gth-browser.c:3629 ../gthumb/gth-browser.c:3650 +#: ../gthumb/gth-browser.c:3576 ../gthumb/gth-browser.c:3594 msgid "View the list of visited locations" msgstr "Die Liste besuchter Orte anzeigen" -#: ../gthumb/gth-browser.c:3671 +#: ../gthumb/gth-browser.c:3612 msgid "View the list of upper locations" msgstr "Die Liste der oberen Orte anzeigen" -#: ../gthumb/gth-browser.c:5779 +#: ../gthumb/gth-browser.c:5884 #, c-format msgid "File type not supported" msgstr "Der Dateityp wird nicht unterstützt" -#: ../gthumb/gth-browser.c:5823 +#: ../gthumb/gth-browser.c:5928 #, c-format msgid "No suitable module found" msgstr "Kein passendes Modul gefunden" -#: ../gthumb/gth-extensions.c:228 +#: ../gthumb/gth-extensions.c:203 #, c-format msgid "Could not open the module `%s`: %s" msgstr "Modul »%s« konnte nicht geöffnet werden: %s" -#: ../gthumb/gth-extensions.c:831 +#: ../gthumb/gth-extensions.c:733 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Die Erweiterung »%1$s« wird von der Erweiterung »%2$s« benötigt" -#: ../gthumb/gth-file-source-vfs.c:116 +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Persönlicher Ordner" -#: ../gthumb/gth-file-source-vfs.c:121 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" msgstr "Dateisystem" -#: ../gthumb/gth-file-source-vfs.c:730 +#: ../gthumb/gth-file-source-vfs.c:739 msgid "" "The files cannot be moved to the Trash. Do you want to delete them " "permanently?" @@ -5193,23 +5164,23 @@ "Die Dateien können nicht in den Müll verschoben werden. Sollen die Dateien " "dauerhaft gelöscht werden?" -#: ../gthumb/gth-file-source-vfs.c:741 +#: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" msgstr "Die Dateien konnten nicht in den Müll verschoben werden" -#: ../gthumb/gth-file-source-vfs.c:785 +#: ../gthumb/gth-file-source-vfs.c:797 #, c-format msgid "Are you sure you want to move \"%s\" to trash?" msgstr "Soll »%s« wirklich in den Müll verschoben werden?" -#: ../gthumb/gth-file-source-vfs.c:788 +#: ../gthumb/gth-file-source-vfs.c:801 #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" msgstr[0] "Soll %'d ausgewählte Datei in den Müll verschoben werden?" msgstr[1] "Sollen %'d ausgewählte Dateien in den Müll verschoben werden?" -#: ../gthumb/gth-file-source-vfs.c:829 +#: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" msgid_plural "" @@ -5221,80 +5192,80 @@ msgid "Hide the filterbar" msgstr "Die Filterleiste verbergen" -#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" -#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "MB" -#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:279 ../gthumb/gth-filter-editor-dialog.c:207 +#: ../gthumb/gth-filter.c:289 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "Dateien" -#: ../gthumb/gth-filter-editor-dialog.c:254 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" msgstr "Aufsteigend" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" msgstr "Absteigend" -#: ../gthumb/gth-filter-editor-dialog.c:545 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "Keine Begrenzung angegeben" -#: ../gthumb/gth-folder-tree.c:862 +#: ../gthumb/gth-folder-tree.c:857 msgid "Loading..." msgstr "Ladevorgang …" -#: ../gthumb/gth-folder-tree.c:1133 +#: ../gthumb/gth-folder-tree.c:1100 msgid "(Open Parent)" msgstr "Vorgänger öffnen" -#: ../gthumb/gth-histogram-view.c:800 +#: ../gthumb/gth-histogram-view.c:826 msgid "Linear scale" msgstr "Lineare Darstellung" -#: ../gthumb/gth-histogram-view.c:812 +#: ../gthumb/gth-histogram-view.c:838 msgid "Logarithmic scale" msgstr "Logarithmische Darstellung" -#: ../gthumb/gth-histogram-view.c:832 +#: ../gthumb/gth-histogram-view.c:858 msgid "Channel:" msgstr "Kanal:" -#: ../gthumb/gth-histogram-view.c:864 +#: ../gthumb/gth-histogram-view.c:890 msgid "Value" msgstr "Wert" -#: ../gthumb/gth-histogram-view.c:870 +#: ../gthumb/gth-histogram-view.c:896 msgid "Red" msgstr "Rot" -#: ../gthumb/gth-histogram-view.c:876 +#: ../gthumb/gth-histogram-view.c:902 msgid "Green" msgstr "Grün" -#: ../gthumb/gth-histogram-view.c:882 +#: ../gthumb/gth-histogram-view.c:908 msgid "Blue" msgstr "Blau" -#: ../gthumb/gth-histogram-view.c:888 +#: ../gthumb/gth-histogram-view.c:914 msgid "Alpha" msgstr "Alpha" -#: ../gthumb/gth-histogram-view.c:895 +#: ../gthumb/gth-histogram-view.c:921 msgid "RGB" msgstr "RGB" @@ -5387,12 +5358,12 @@ msgid "Saving file information" msgstr "Dateiinformationen werden gespeichert" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-tags-entry.c:388 #, c-format msgid "Create tag «%s»" msgstr "Schlagwort »%s« anlegen" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:743 msgid "Show all the tags" msgstr "Alle Schlagwörter zeigen" @@ -5458,18 +5429,18 @@ msgid "is not" msgstr "ist nicht" -#: ../gthumb/gth-test-category.c:374 ../gthumb/gth-test-simple.c:800 -#: ../gthumb/gth-test-simple.c:826 ../gthumb/gth-test-simple.c:847 -#: ../gthumb/gth-test-simple.c:873 +#: ../gthumb/gth-test-category.c:386 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "Die Testdefinition ist unvollständig" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:251 msgid "Add a new rule" msgstr "Neue Regel hinzufügen" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:262 msgid "Remove this rule" msgstr "Diese Regel entfernen" @@ -5513,11 +5484,11 @@ msgid "is after" msgstr "ist nach" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:474 msgid "Today" msgstr "Heute" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:482 msgid "Now" msgstr "Jetzt" @@ -5529,52 +5500,51 @@ msgid "Close _All Windows" msgstr "_Alle Fenster schließen" -#: ../gthumb/gtk-utils.c:704 +#: ../gthumb/gtk-utils.c:551 msgid "Could not display help" msgstr "Hilfe konnte nicht angezeigt werden" -#: ../gthumb/gtk-utils.c:991 ../gthumb/gtk-utils.c:1000 +#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 msgid "Could not launch the application" msgstr "Anwendung konnte nicht gestartet werden" -#: ../gthumb/gtk-utils.c:1103 +#: ../gthumb/gtk-utils.c:978 msgid "_Copy Here" msgstr "Hierher _kopieren" -#: ../gthumb/gtk-utils.c:1108 +#: ../gthumb/gtk-utils.c:983 msgid "_Move Here" msgstr "Hierher _verschieben" -#: ../gthumb/gtk-utils.c:1113 +#: ../gthumb/gtk-utils.c:988 msgid "_Link Here" msgstr "_Verknüpfung hierher erstellen" -#: ../gthumb/gtk-utils.c:1122 +#: ../gthumb/gtk-utils.c:997 msgid "Cancel" msgstr "Abbrechen" -#: ../gthumb/main.c:72 +#: ../gthumb/main.c:59 msgid "Open a new window" msgstr "In neuem Fenster öffnen" -#: ../gthumb/main.c:76 +#: ../gthumb/main.c:63 msgid "Start in fullscreen mode" msgstr "Im Vollbildmodus starten" -#: ../gthumb/main.c:80 +#: ../gthumb/main.c:67 msgid "Automatically start a slideshow" msgstr "Automatisch eine Diaschau beginnen" -#: ../gthumb/main.c:84 +#: ../gthumb/main.c:71 msgid "Automatically import digital camera photos" msgstr "Fotos von Digitalkameras automatisch importieren" -#: ../gthumb/main.c:88 +#: ../gthumb/main.c:75 msgid "Show version" msgstr "Version anzeigen" -#. command line options -#: ../gthumb/main.c:539 +#: ../gthumb/main.c:344 msgid "- Image browser and viewer" msgstr "- Bildbrowser und Betrachter" @@ -5584,3 +5554,9 @@ msgstr "" "Es konnte kein passendes Modul zum Speichern des Bildes als »%s« gefunden " "werden" + +#~ msgid "Choose another tag" +#~ msgstr "Wählen Sie ein anderes Schlagwort" + +#~ msgid "New tag" +#~ msgstr "Neues Schlagwort" diff -Nru gthumb-2.14.3/po/es.po gthumb-3.0.0/po/es.po --- gthumb-2.14.3/po/es.po 2011-12-04 18:37:03.000000000 +0000 +++ gthumb-3.0.0/po/es.po 2012-03-31 09:41:56.000000000 +0000 @@ -6,120 +6,128 @@ # Daniel Baeyens , 2002. # Pablo Gonzalo del Campo , 2002-2003. # Francisco Javier F. Serrador , 2003, 2004, 2005, 2006. -# Daniel Mustieles , 2008, 2009, 2010, 2011. # Jorge González , 2007, 2008, 2009, 2010, 2011. +# Daniel Mustieles , 2008, 2009, 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: gthumb.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-11-17 17:52+0000\n" -"PO-Revision-Date: 2011-12-03 12:22+0100\n" -"Last-Translator: Jorge González \n" -"Language-Team: Español; Castellano \n" +"POT-Creation-Date: 2012-03-28 16:29+0000\n" +"PO-Revision-Date: 2012-03-28 18:26+0200\n" +"Last-Translator: Daniel Mustieles \n" +"Language-Team: Español \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "El archivo no es un archivo .desktop válido" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "No se reconoce la versión «%s» del archivo desktop" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "Iniciando %s" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "La aplicación no acepta documentos en la línea de comandos" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "Opción de lanzamiento no reconocida: %d" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "" "No se pueden pasar los URI de documentos a entradas de escritorio «Type=Link»" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "No es un elemento lanzable" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "Desactivar la conexión con el gestor de sesiones" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "Especificar el archivo que contiene la configuración guardada" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "ARCHIVO" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "Especificar el ID de gestión de la sesión" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "ID" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "Opciones de gestión de la sesión:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "Mostrar las opciones de gestión de la sesión" -#: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "Visor de imágenes" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "Muestre y organice sus imágenes" - #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:3 ../data/gthumb-import.desktop.in.in.h:3 -#: ../gthumb/gth-browser.c:523 ../gthumb/gth-main.c:229 -#: ../gthumb/gth-progress-dialog.c:443 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:529 +#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Visor de imágenes" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "Visor de imágenes gThumb" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Muestre y organice sus imágenes" + #: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "Importar las fotos de la tarjeta de su cámara" +msgid "Import with gThumb" +msgstr "Importar con gThumb" #: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "Herramienta para importar fotos" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "Herramienta de gThumb para importar fotos" -#: ../data/gthumb.schemas.in.h:1 +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Importar las fotos de la tarjeta de su cámara" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "" "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " "to generate thumbnails for all images." @@ -127,84 +135,71 @@ "Las imágenes mayores que este tamaño (en bytes) no serán miniaturizadas. Use " "0 si quiere generar miniaturas para todas las imágenes" -#: ../data/gthumb.schemas.in.h:2 -msgid "" -"Possible values are: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." -msgstr "" -"Los valores posibles son: «actual_size», «fit», «keep_prev», " -"«fit_if_larger», «fit_width_if_larger»." - -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "Los valores posibles son: «high», «low»." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "Los valores posibles son: «light», «midtone», «dark»." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "Los valores posibles son: «list», «thumbnails»." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "Los valores posibles son: «small», «medium», «large»." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" +msgstr "Indica si redimensionar la ventana al tamaño de la imagen" -#: ../data/gthumb.schemas.in.h:7 -msgid "" -"Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "" -"Los valores posibles son: «system», «text_below», «text_beside», " -"«text_only», «icons_only»." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Abrir archivos en la ventana activa" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "Los valores posibles son: «white», «black», «checked», «none»." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +msgid "Whether to reset the scrollbars position after changing image" +msgstr "" +"Indica si se deben restaurar las posiciones de la barras de desplazamiento " +"tras cambiar la imagen" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to always use a black background." msgstr "Indica si se debe usar siempre fondo negro." -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Los valores posibles son: «jpeg», «jpg»." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Los valores posibles son: «tiff», «tif»." + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" msgstr "" -"Indica si se deben restaurar las posiciones de la barra de desplazamiento " -"tras cambiar la imagen" +"Los posibles valores incluyen: general::unsorted, file::name, file::size, " +"file::mtime, exif::photo::datetimeoriginal" #: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "_Extensiones:" + +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "Más extensiones…" -#: ../data/ui/extensions-preferences.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:3 msgid "Some extensions are configurable." msgstr "Algunas extensiones son configurables" -#: ../data/ui/extensions-preferences.ui.h:3 -msgid "_Extensions:" -msgstr "_Extensiones:" - #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "Nombre del filt_ro:" -#. limit label -#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 -msgid "_Limit to" -msgstr "_Limitar a" - -#: ../data/ui/filter-editor.ui.h:3 +#: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "C_oincide" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:270 +#: ../gthumb/gth-filter.c:342 +msgid "_Limit to" +msgstr "_Limitar a" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "seleccionados por" @@ -213,69 +208,74 @@ msgid "Mean:" msgstr "Media:" -#: ../data/ui/histogram-info.ui.h:2 +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Desv. Est.:" + +#: ../data/ui/histogram-info.ui.h:4 msgid "Median:" msgstr "Mediana:" +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Píxeles:" + #. After the colon there is a percentile. -#: ../data/ui/histogram-info.ui.h:4 +#: ../data/ui/histogram-info.ui.h:8 msgctxt "Pixels" msgid "Max:" msgstr "Máx:" #. After the colon there is the percentile of selected pixels. -#: ../data/ui/histogram-info.ui.h:6 +#: ../data/ui/histogram-info.ui.h:10 msgctxt "Pixels" msgid "Selected:" msgstr "Seleccionados:" -#. After the colon there is the total number of pixels -#: ../data/ui/histogram-info.ui.h:8 -msgid "Pixels:" -msgstr "Píxeles:" - -#. Short for "Standard deviation". Try to keep it short in the translation. -#: ../data/ui/histogram-info.ui.h:10 -msgid "Std dev:" -msgstr "Desv. Est.:" +#: ../data/ui/location.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +msgid "_Location:" +msgstr "_Lugar:" #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "No sobreescribir el archivo an_tiguo" +msgid "Overwrite the old file with the new one?" +msgstr "¿Sobreescribir el archivo anterior con el nuevo?" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Archivo antiguo:" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "Nombre del archivo:" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Tamaño:" + +#: ../data/ui/overwrite-dialog.ui.h:5 msgid "Modified:" msgstr "Modificado:" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "Archivo nuevo:" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "Archivo antiguo:" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "Sob_reescribir el archivo antiguo" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "Sobreescribir _todos los archivos" - #: ../data/ui/overwrite-dialog.ui.h:8 -msgid "Overwrite the old file with the new one?" -msgstr "¿Sobreescribir el archivo anterior con el nuevo?" +msgid "Do not overwrite _the old file" +msgstr "No sobreescribir el archivo an_tiguo" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "Size:" -msgstr "Tamaño:" +msgid "Overwrite _all files" +msgstr "Sobreescribir _todos los archivos" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -298,185 +298,181 @@ msgstr "_otros filtros:" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Activar elementos con una pulsación doble" +msgid "below the folder list" +msgstr "bajo la lista de carpetas" #: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Activar elementos con una sola pulsación" +msgid "on the right" +msgstr "a la derecha" #: ../data/ui/preferences.ui.h:3 -msgid "Appearance" -msgstr "Apariencia" +msgid "gThumb Preferences" +msgstr "Preferencias de gThumb" #: ../data/ui/preferences.ui.h:4 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "Solicitar co_nfirmación antes de borrar archivos o catálogos" +msgid "_Toolbar style:" +msgstr "Es_tilo de la barra de herramientas:" #: ../data/ui/preferences.ui.h:5 -msgid "Ask whether to save _modified files" -msgstr "Preguntar si se deben guardar los archivos _modificados" +msgid "T_humbnails in viewer:" +msgstr "Miniaturas en el visor:" -#: ../data/ui/preferences.ui.h:6 ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Negro" +#: ../data/ui/preferences.ui.h:6 +msgid "System settings" +msgstr "Configuración del sistema" -#: ../data/ui/preferences.ui.h:7 ../gthumb/dlg-preferences-extensions.c:72 -#: ../gthumb/gth-browser-actions-entries.h:150 -msgid "Browser" -msgstr "Navegador" +#: ../data/ui/preferences.ui.h:7 +msgid "Text below icons" +msgstr "Texto debajo de los iconos" #: ../data/ui/preferences.ui.h:8 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 -msgid "Caption" -msgstr "Descripción" +msgid "Text beside icons" +msgstr "Texto junto a los iconos" -#: ../data/ui/preferences.ui.h:9 ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "Cuadriculado" +#: ../data/ui/preferences.ui.h:9 +msgid "Icons only" +msgstr "Sólo iconos" #: ../data/ui/preferences.ui.h:10 -msgid "Choose startup folder" -msgstr "Elija la carpeta de inicio" +msgid "Text only" +msgstr "Sólo texto" #: ../data/ui/preferences.ui.h:11 -msgid "D_etermine image type from content (slower)" -msgstr "De_terminar el tipo de imagen por su contenido (lento)" +msgid "on the bottom" +msgstr "abajo" -#: ../data/ui/preferences.ui.h:12 ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Ajustar a la anchura si es mayor" +#: ../data/ui/preferences.ui.h:12 +msgid "on the side" +msgstr "en el lateral" -#: ../data/ui/preferences.ui.h:13 ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Ajustar a la ventana" +#: ../data/ui/preferences.ui.h:13 +msgid "File _properties in browser:" +msgstr "_Propiedades del archivo en el examinador:" -#: ../data/ui/preferences.ui.h:14 ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Ajustar a la ventana si es mayor" +#: ../data/ui/preferences.ui.h:14 +msgid "Appearance" +msgstr "Apariencia" #: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "Seguir el comportamiento de Nautilus" +msgid "Go to last _visited location" +msgstr "Ir a la última _ubicación visitada" #: ../data/ui/preferences.ui.h:16 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:393 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "General" +msgid "Go to this _folder:" +msgstr "Ir a esta _carpeta:" #: ../data/ui/preferences.ui.h:17 -msgid "Go to last _visited location" -msgstr "Ir a la última _ubicación visitada" +msgid "Choose startup folder" +msgstr "Elija la carpeta de inicio" #: ../data/ui/preferences.ui.h:18 -msgid "Go to this _folder:" -msgstr "Ir a esta _carpeta:" +msgid "Set to C_urrent" +msgstr "Establecer al act_ual" -#: ../data/ui/preferences.ui.h:19 ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Sólo iconos" +#: ../data/ui/preferences.ui.h:19 +msgid "_Reuse the active window to open files" +msgstr "_Reutilizar la ventana activa para abrir archivos" -#: ../data/ui/preferences.ui.h:20 ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Mantener la ampliación anterior" +#: ../data/ui/preferences.ui.h:20 +msgid "On startup:" +msgstr "Al iniciar:" #: ../data/ui/preferences.ui.h:21 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-crop.c:448 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 -#: ../extensions/file_tools/gth-file-tool-rotate.c:414 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "Ninguna" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "Solicitar co_nfirmación antes de borrar archivos o catálogos" #: ../data/ui/preferences.ui.h:22 -msgid "On startup:" -msgstr "Al iniciar:" +msgid "Ask whether to save _modified files" +msgstr "Preguntar si se deben guardar los archivos _modificados" #: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:192 +msgid "_Store metadata inside files if possible" +msgstr "Guardas los _metadatos dentro de los archivos si es posible" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 msgid "Other" msgstr "Otro" -#: ../data/ui/preferences.ui.h:24 -msgid "Set image to actual size" -msgstr "Mostrar la imagen con su tamaño normal" - #: ../data/ui/preferences.ui.h:25 -msgid "Set to C_urrent" -msgstr "Establecer al act_ual" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "General" -#. Set widgets data. -#: ../data/ui/preferences.ui.h:26 ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Configuración del sistema" +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Descripción" #: ../data/ui/preferences.ui.h:27 -msgid "T_humbnails in viewer:" -msgstr "Miniaturas en el visor:" - -#: ../data/ui/preferences.ui.h:28 ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Texto debajo de los iconos" - -#: ../data/ui/preferences.ui.h:29 ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Texto junto a los iconos" +msgid "Thumbnail _size:" +msgstr "Tamaño de las miniat_uras:" -#: ../data/ui/preferences.ui.h:30 ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Sólo texto" +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" #: ../data/ui/preferences.ui.h:31 -msgid "Thumbnail _size:" -msgstr "Tamaño de las miniat_uras:" +msgid "95" +msgstr "95" -#: ../data/ui/preferences.ui.h:32 ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Blanco" +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" #: ../data/ui/preferences.ui.h:33 -msgid "_Store metadata inside files if possible" -msgstr "Guardas los _metadatos dentro de los archivos si es posible" +msgid "128" +msgstr "128" #: ../data/ui/preferences.ui.h:34 -msgid "_Toolbar style:" -msgstr "Es_tilo de la barra de herramientas:" +msgid "164" +msgstr "164" #: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "Preferencias de gThumb" +msgid "200" +msgstr "200" #: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "abajo" +msgid "256" +msgstr "256" #: ../data/ui/preferences.ui.h:37 -msgid "on the side" -msgstr "en el lateral" +msgid "D_etermine image type from content (slower)" +msgstr "De_terminar el tipo de imagen por su contenido (lento)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Navegador" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "Ordenar por" #: ../data/ui/sort-order.ui.h:2 -msgid "_Inverse order" -msgstr "Orden in_verso" - -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" msgstr "Or_denar por:" +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "Orden in_verso" + #: ../extensions/23hq/23hq.extension.in.in.h:1 msgid "23" msgstr "23" @@ -485,23 +481,23 @@ msgid "Upload images to 23hq.com" msgstr "Subir imágenes a 23hq.com" -#: ../extensions/23hq/callbacks.c:67 +#: ../extensions/23hq/callbacks.c:68 msgid "_23..." msgstr "_23…" -#: ../extensions/23hq/callbacks.c:68 +#: ../extensions/23hq/callbacks.c:69 msgid "Upload photos to 23" msgstr "Subir fotos a 23" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -msgid "Add bookmarks support." -msgstr "_Añadir soporte para marcadores." - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "Marcadores" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "_Añadir soporte para marcadores." + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 @@ -527,6 +523,7 @@ #: ../extensions/rename_series/rename_series.extension.in.in.h:3 #: ../extensions/resize_images/resize_images.extension.in.in.h:3 #: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" @@ -561,13 +558,13 @@ msgstr "_Marcadores:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "_Ubicación" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "_Nombre" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Ubicación" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "No se pudo quitar el marcador" @@ -601,16 +598,16 @@ msgstr "La carpeta actual y sus s_ubcarpetas" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "Origen" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "Archivos _seleccionados" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Origen" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Grabar al disco" @@ -627,9 +624,9 @@ #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 -#: ../extensions/file_manager/actions.c:65 -#: ../extensions/list_tools/gth-script-editor-dialog.c:319 -#: ../gthumb/gth-filter-editor-dialog.c:491 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format msgid "No name specified" msgstr "No se especificó ningún nombre" @@ -637,7 +634,7 @@ #: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 #: ../extensions/catalogs/dlg-add-to-catalog.c:281 #: ../extensions/catalogs/dlg-add-to-catalog.c:401 -#: ../extensions/file_manager/actions.c:72 +#: ../extensions/file_manager/actions.c:75 #, c-format msgid "Invalid name. The following characters are not allowed: %s" msgstr "Nombre no válido. Los siguientes caracteres no están permitidos: %s" @@ -645,7 +642,8 @@ #: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 #: ../extensions/catalogs/dlg-add-to-catalog.c:338 #: ../extensions/catalogs/dlg-add-to-catalog.c:448 -#: ../extensions/file_manager/actions.c:103 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 msgid "Name already used" msgstr "El nombre ya está en uso" @@ -662,7 +660,7 @@ #: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 #: ../extensions/catalogs/dlg-add-to-catalog.c:474 -#: ../extensions/file_manager/actions.c:133 +#: ../extensions/file_manager/actions.c:136 msgid "C_reate" msgstr "C_rear" @@ -680,7 +678,7 @@ msgid "Could not remove the catalog" msgstr "No se pudo quitar el catálogo " -#: ../extensions/catalogs/actions.c:361 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" msgstr "¿Seguro que quiere quitar «%s»?" @@ -698,8 +696,7 @@ msgstr "Ir a la carpeta que contiene el archivo seleccionado" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/edit_metadata/callbacks.c:116 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:86 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Otro…" @@ -742,29 +739,29 @@ #: ../extensions/catalogs/callbacks.c:497 #: ../extensions/catalogs/callbacks.c:502 -#: ../extensions/photo_importer/dlg-photo-importer.c:359 -#: ../extensions/photo_importer/dlg-photo-importer.c:399 -#: ../gthumb/gth-file-list.c:45 ../gthumb/gth-folder-tree.c:874 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(Vacío)" -#: ../extensions/catalogs/callbacks.c:695 +#: ../extensions/catalogs/callbacks.c:697 msgid "Catalog Properties" msgstr "Propiedades del catálogo" -#: ../extensions/catalogs/callbacks.c:709 +#: ../extensions/catalogs/callbacks.c:711 msgid "Organize" msgstr "Organizar" -#: ../extensions/catalogs/callbacks.c:710 +#: ../extensions/catalogs/callbacks.c:712 msgid "Automatically organize files by date" msgstr "Organizar los archivos automáticamente por fecha" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1024 +#: ../extensions/catalogs/gth-catalog.c:1025 msgid "Catalogs" msgstr "Catálogos" @@ -781,114 +778,114 @@ msgstr "C_atálogos:" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "_Biblioteca nueva" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "Catálogo _nuevo" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "_Biblioteca nueva" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:922 -#: ../extensions/webalbums/gth-web-exporter.c:1852 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1842 msgid "_View the destination" msgstr "_Ver el destino" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "Catálogo" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:201 +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "Propiedades" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Nombre:" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "_Fecha:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "_Nombre:" +msgid "Catalog" +msgstr "Catálogo" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -msgid "Catalog _Preview:" -msgstr "_Vista previa del catálogo:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 -msgid "Organization:" -msgstr "Organización:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "Organizar archivos" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" msgstr "Organizando archivos" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Organización:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Select All" msgstr "Seleccionar todo" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "No seleccionar nada" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "_Vista previa del catálogo:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:470 -#: ../gthumb/gth-main-default-tests.c:264 +#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Fecha en que se tomó la foto" #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -#: ../gthumb/gth-main-default-tests.c:256 +#: ../gthumb/gth-main-default-tests.c:292 msgid "File modified date" msgstr "Fecha de modificación del archivo" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "Ignorar catálogos con un único archivo" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "Poner archivos sueltos en el catálogo:" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "Simples" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:261 +#: ../extensions/comments/main.c:159 msgid "Tag" msgstr "Etiqueta" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 -#: ../gthumb/gth-main-default-tests.c:284 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "etiqueta" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "Etiqueta (empotrada)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "Ag_rupar archivos por:" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "_Incluir sub-carpetas" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Ignorar catálogos con un único archivo" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Poner archivos sueltos en el catálogo:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "etiqueta" +msgid "Singles" +msgstr "Simples" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -896,7 +893,7 @@ msgstr "No se pudieron añadir los archivos al catálogo" #: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/search/gth-search-task.c:352 +#: ../extensions/search/gth-search-task.c:356 msgid "Could not create the catalog" msgstr "No se pudo crear el catálogo" @@ -904,7 +901,7 @@ msgid "Could not save the catalog" msgstr "No se pudo guardar el catálogo" -#: ../extensions/catalogs/dlg-catalog-properties.c:166 +#: ../extensions/catalogs/dlg-catalog-properties.c:159 msgid "Could not load the catalog" msgstr "No se pudo cargar el catálogo" @@ -914,52 +911,53 @@ "Los archivos se organizarán en catálogos. No se moverá ningún archivo del " "disco." -#: ../extensions/catalogs/gth-catalog.c:1145 ../extensions/comments/main.c:43 +#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Etiquetas" -#: ../extensions/catalogs/gth-file-source-catalogs.c:848 +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 #, c-format msgid "The catalog '%s' already exists, do you want to overwrite it?" msgstr "El catálogo «%s» ya existe. ¿Quiere sobreescribirlo?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:850 +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 #, c-format msgid "The library '%s' already exists, do you want to overwrite it?" msgstr "La biblioteca «%s» ya existe. ¿Quiere sobreescribirla?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:858 +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 msgid "Over_write" msgstr "Sobr_eescribir" -#: ../extensions/catalogs/gth-file-source-catalogs.c:976 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 msgid "Cannot move the files" msgstr "No se pueden mover los archivos" -#: ../extensions/catalogs/gth-file-source-catalogs.c:978 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 msgid "Cannot copy the files" msgstr "No se pueden mover los archivos" -#: ../extensions/catalogs/gth-file-source-catalogs.c:983 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 msgid "Invalid destination." msgstr "Destino no válido." -#: ../extensions/catalogs/gth-file-source-catalogs.c:1030 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format msgid "Copying files to '%s'" msgstr "Copiando archivos a «%s»" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1283 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 msgid "Could not remove the files from the catalog" msgstr "No se pudieron quitar los archivos del catálogo" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1341 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:683 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:711 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1214 -#: ../extensions/search/gth-search.c:295 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Formato de archivo no válido" @@ -984,86 +982,91 @@ msgid "Change the files date" msgstr "Cambiar la fecha de los archivos" -#: ../extensions/change_date/data/gthumb_change_date.schemas.in.h:1 -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "Valores posibles: «pixels», «percentage»." - #: ../extensions/change_date/data/ui/change-date.ui.h:1 -msgid "+" -msgstr "+" +msgid "Change Date" +msgstr "Cambiar fecha" #: ../extensions/change_date/data/ui/change-date.ui.h:2 -msgid "-" -msgstr "-" +msgid "Change the following values:" +msgstr "Cambiar los siguientes siguientes:" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -msgid "A_djust by" -msgstr "Aju_star por" +msgid "_Last modified date" +msgstr "_Última fecha de modificación" #: ../extensions/change_date/data/ui/change-date.ui.h:4 -msgid "Change Date" -msgstr "Cambiar fecha" +msgid "Co_mment date" +msgstr "Fecha del co_mentario" #: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Change the following values:" -msgstr "Cambiar los siguientes siguientes:" +msgid "Exif DateTimeOriginal tag" +msgstr "Etiqueta EXIF de fecha y hora originales" #: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Change to:" msgstr "Cambiar a:" #: ../extensions/change_date/data/ui/change-date.ui.h:7 -msgid "Co_mment date" -msgstr "Fecha del co_mentario" +msgid "The _following date:" +msgstr "La s_iguiente fecha:" #: ../extensions/change_date/data/ui/change-date.ui.h:8 -msgid "Date p_hoto was taken" -msgstr "Fecha en que se _tomó la foto" - -#: ../extensions/change_date/data/ui/change-date.ui.h:9 -msgid "Exif DateTimeOriginal tag" -msgstr "Etiqueta EXIF de fecha y hora originales" - -#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "Fecha de _modificación del archivo" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File c_reation date" msgstr "Fecha de c_reación del archivo" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 -msgid "The _following date:" -msgstr "La s_iguiente fecha:" +#: ../extensions/change_date/data/ui/change-date.ui.h:10 +msgid "Date p_hoto was taken" +msgstr "Fecha en que se _tomó la foto" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 -msgid "_Last modified date" -msgstr "_Última fecha de modificación" +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "A_djust by" +msgstr "Aju_star por" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "hours" msgstr "horas" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "minutes" msgstr "minutos" -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "segundos" -#: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "Añadir comentarios y etiquetas a cualquier tipo de archivo." +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +msgid "+" +msgstr "+" -#: ../extensions/comments/comments.extension.in.in.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:16 +msgid "-" +msgstr "-" + +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Importar metadatos empotrados" + +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "" +"Importar los metadatos almacenados dentro de archivos en el sistema de " +"comentarios de gThumb" + +#: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "Comentarios y etiquetas" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Añadir comentarios y etiquetas a cualquier tipo de archivo." + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Preferencias" @@ -1071,37 +1074,37 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Sincronizar con los metadatos empotrados" -#: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:111 +#: ../extensions/comments/main.c:34 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Comentario" -#: ../extensions/comments/main.c:39 ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Título" -#: ../extensions/comments/main.c:40 ../extensions/comments/main.c:245 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:16 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Descripción" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:253 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:151 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Lugar" -#: ../extensions/comments/main.c:42 ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:43 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Fecha" -#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Puntuación" @@ -1126,7 +1129,7 @@ msgstr "Crear un mural de fotos" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" msgstr "Hoja de contacto" @@ -1137,24 +1140,32 @@ "seleccionados." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid "Background" -msgstr "Fondo" +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-crop.c:454 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Ninguna" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -msgid "C_olor:" -msgstr "C_olor:" +msgid "Simple" +msgstr "Simple" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Caption:" -msgstr "Descripción:" +msgid "Simple with shadow" +msgstr "Simple con sombra" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 -msgid "Frame" -msgstr "Marco" +msgid "Shadow only" +msgstr "Sólo sombra" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 +msgid "Slide" +msgstr "Diapositiva" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 msgid "Inward Shadow" msgstr "Sombra hacia adentro" @@ -1162,242 +1173,244 @@ msgid "Outward Shadow" msgstr "Sombra hacia afuera" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 -msgid "Select a color" -msgstr "Seleccionar un color" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -msgid "Select a font" -msgstr "Seleccionar una tipografía" +msgid "Background" +msgstr "Fondo" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -msgid "Shadow only" -msgstr "Sólo sombra" +msgid "_Solid color" +msgstr "Color _sólido" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -msgid "Simple" -msgstr "Simple" +msgid "_Gradient" +msgstr "_Gradiente" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -msgid "Simple with shadow" -msgstr "Simple con sombra" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +msgid "_Horizontal:" +msgstr "_Horizontal:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -msgid "Slide" -msgstr "Diapositiva" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 +msgid "_Vertical:" +msgstr "_Vertical:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#: ../extensions/rename_series/dlg-rename-series.c:63 -msgid "Text" -msgstr "Texto" +msgid "Select a color" +msgstr "Seleccionar un color" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "_Footer:" -msgstr "_Pie:" +msgid "Frame" +msgstr "Marco" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -msgid "_Gradient" -msgstr "_Gradiente" +msgid "_Style:" +msgstr "E_stilo:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "_Header:" -msgstr "Cab_ecera:" +msgid "C_olor:" +msgstr "C_olor:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Horizontal:" -msgstr "_Horizontal:" +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Texto" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "Cab_ecera:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -msgid "_Solid color" -msgstr "Color _sólido" +msgid "Select a font" +msgstr "Seleccionar una tipografía" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 -msgid "_Style:" -msgstr "E_stilo:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "_Pie:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "_Vertical:" -msgstr "_Vertical:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Descripción:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "El número de la página actual" -#. translate only the text in the curly brackets #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, no-c-format -msgid "%D{ format }" -msgstr "%D{ formato }" +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "El número total de páginas" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -msgid "All images on a single page" -msgstr "Todas las imágenes en una sola página" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:6 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:10 -msgid "Choose destination folder" -msgstr "seleccionar la carpeta de destino" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Código especial" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -msgid "Columns:" -msgstr "Columnas:" +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ formato }" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -msgid "Create _HTML image map" -msgstr "Crear un mapa de imagen para un _HTML" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -msgid "Create a new theme" -msgstr "Crear un tema nuevo" +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "La fecha actual" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -msgid "Delete the selected theme" -msgstr "Eliminar el tema seleccionado" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "_Destino:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 -msgid "Edit the selected theme" -msgstr "Editar el tema seleccionado" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "seleccionar la carpeta de destino" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 msgid "File_name:" msgstr "_Nombre del archivo:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Images per page:" -msgstr "Imágenes por página:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Nuevo dígito enumerador" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +msgid "Create _HTML image map" +msgstr "Crear un mapa de imagen para un _HTML" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Layout" -msgstr "Distribución" +#: ../extensions/pixbuf_savers/preferences.c:134 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Guardando" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 -msgid "New enumerator digit" -msgstr "Nuevo dígito enumerador" +msgid "Create a new theme" +msgstr "Crear un tema nuevo" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -msgid "Re_verse order" -msgstr "Orden in_verso" +msgid "Edit the selected theme" +msgstr "Editar el tema seleccionado" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -msgid "S_ort:" -msgstr "_Orden:" +msgid "Delete the selected theme" +msgstr "Eliminar el tema seleccionado" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "Saving" -msgstr "Guardando" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:20 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -msgid "Special code" -msgstr "Código especial" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Tema" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -msgid "Sq_uared" -msgstr "C_uadrado" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Columnas:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -msgid "The current date" -msgstr "La fecha actual" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Imágenes por página:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "The current page number" -msgstr "El número de la página actual" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Todas las imágenes en una sola página" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The total number of pages" -msgstr "El número total de páginas" +msgid "_All pages with the same size" +msgstr "Tod_as las páginas con el mismo tamaño" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "Theme" -msgstr "Tema" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Distribución" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 -msgid "Thumbnails" -msgstr "Miniaturas" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "_Orden:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 -msgid "_All pages with the same size" -msgstr "Tod_as las páginas con el mismo tamaño" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "Orden in_verso" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "_Destination:" -msgstr "_Destino:" +msgid "_Size:" +msgstr "_Tamaño:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "C_uadrado" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -msgid "_Size:" -msgstr "_Tamaño:" +msgid "Thumbnails" +msgstr "Miniaturas" -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" msgstr "Mural de fotos" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:483 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:495 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:509 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 msgid "Could not save the theme" msgstr "No se pudo guardar el tema" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:654 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 msgid "Could not delete the theme" msgstr "No se pudo eliminar el tema" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 msgid "Creating images" msgstr "Crear imágenes" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 msgid "Generating thumbnails" msgstr "Generando miniaturas" @@ -1409,15 +1422,15 @@ msgid "Footer" msgstr "Pie" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:197 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 msgid "Theme Properties" msgstr "Propiedades del tema" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:212 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 msgid "Copy _From" msgstr "Copiar _desde" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:348 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 msgid "New theme" msgstr "Tema nuevo" @@ -1437,34 +1450,34 @@ msgid "Save images in a different format" msgstr "Guardar las imágenes en un formato diferente" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 msgid "Convert Format" msgstr "Convertir formato" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Formato nuevo" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "Destino" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "Formato nuevo" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Use the original image folder" msgstr "_Usar la carpeta de imágenes original" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/dlg-convert-format.c:93 msgid "Converting images" msgstr "Convirtiendo imágenes" -#: ../extensions/desktop_background/actions.c:203 +#: ../extensions/desktop_background/actions.c:162 msgid "Could not show the desktop background properties" msgstr "No se pudieron mostrar las propiedades del fondo del escritorio" -#: ../extensions/desktop_background/actions.c:269 -#: ../extensions/desktop_background/actions.c:287 +#: ../extensions/desktop_background/actions.c:228 +#: ../extensions/desktop_background/actions.c:246 msgid "Could not set the desktop background" msgstr "No se pudo establecer el fondo del escritorio" @@ -1481,7 +1494,7 @@ msgid "Desktop background" msgstr "Fondo de escritorio" -#: ../extensions/edit_metadata/actions.c:129 +#: ../extensions/edit_metadata/actions.c:66 msgid "" "Are you sure you want to permanently delete the metadata of the selected " "files?" @@ -1489,47 +1502,47 @@ "¿Está seguro de que quiere eliminar permanentemente los metadatos de los " "archivos seleccionados?" -#: ../extensions/edit_metadata/actions.c:136 +#: ../extensions/edit_metadata/actions.c:73 msgid "If you delete the metadata, it will be permanently lost." msgstr "Si elimina los metadatos, se perderán definitivamente." -#: ../extensions/edit_metadata/callbacks.c:108 +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "E_tiquetas" -#: ../extensions/edit_metadata/callbacks.c:112 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" msgstr "Editar el comentario y otra información de los archivos seleccionados" -#: ../extensions/edit_metadata/callbacks.c:117 -msgid "Choose another tag" -msgstr "Seleccionar otra etiqueta" +#: ../extensions/edit_metadata/callbacks.c:107 +msgid "Set the tags of the selected files" +msgstr "Establecer las etiquetas de los archivos seleccionados" -#: ../extensions/edit_metadata/callbacks.c:121 +#: ../extensions/edit_metadata/callbacks.c:112 msgid "Delete Metadata" msgstr "Eliminar metadatos" -#: ../extensions/edit_metadata/callbacks.c:122 +#: ../extensions/edit_metadata/callbacks.c:113 msgid "Delete the comment and the embedded metadata of the selected files" msgstr "" "Eliminar el comentario y los metadatos empotrados de los archivos " "seleccionados" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "D_escripción:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Lugar:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "E_tiquetas:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "_Lugar:" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "P_untuación:" @@ -1538,71 +1551,79 @@ msgid "_Title:" msgstr "Tít_ulo:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:63 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "No se pudieron guardar los metadatos del archivo" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:150 -#: ../gthumb/gth-overwrite-dialog.c:166 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "No se puede leer la información del archivo" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Editar metadatos" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Allow to edit files metadata." msgstr "Permitir la edición de los metadatos de los archivos." -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 -msgid "Edit metadata" -msgstr "Editar metadatos" +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "Metadatos de %s" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d archivo" +msgstr[1] "%d archivos" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:467 +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +msgid "Sa_ve and Close" +msgstr "_Guardar y cerrar" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Guardar sólo ca_mpos alterados" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:547 msgid "No date" msgstr "Sin fecha" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:468 +#: ../extensions/edit_metadata/gth-edit-general-page.c:548 msgid "The following date" msgstr "La siguiente fecha" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:469 -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Fecha actual" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:471 +#: ../extensions/edit_metadata/gth-edit-general-page.c:551 msgid "Last modified date" msgstr "Última fecha de modificación" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:472 +#: ../extensions/edit_metadata/gth-edit-general-page.c:552 msgid "File creation date" msgstr "Fecha de creación del archivo" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:553 msgid "Do not modify" msgstr "No modificar" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:105 -msgid "Save only cha_nged fields" -msgstr "Guardar sólo ca_mpos alterados" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:161 -#, c-format -msgid "%s Metadata" -msgstr "Metadatos de %s" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:165 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:332 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d archivo" -msgstr[1] "%d archivos" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Etiqueta nueva" +msgid "%s Tags" +msgstr "%s etiquetas" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 msgid "Assign Tags" msgstr "Asignar etiquetas" @@ -1628,54 +1649,53 @@ msgstr "Extensión de ejemplo." #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "_Título por línea:" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "_Derecho:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "_País:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Codi_go:" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "Crédi_tos:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -#| msgid "State/Provence:" -msgid "State/Province:" -msgstr "Estado/Provincia:" - #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_Byline:" -msgstr "_Firmante:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Origen:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_City:" -msgstr "_Ciudad:" +msgid "_Urgency:" +msgstr "_Urgencia:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -msgid "_Code:" -msgstr "_Codi_go:" +msgid "_Object Name:" +msgstr "N_ombre del objeto:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "_Título por línea:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Language:" -msgstr "_Idioma:" +msgid "_Byline:" +msgstr "_Firmante:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -msgid "_Object Name:" -msgstr "N_ombre del objeto:" +msgid "_City:" +msgstr "_Ciudad:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -msgid "_Source:" -msgstr "_Origen:" +msgid "_Language:" +msgstr "_Idioma:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 -msgid "_Urgency:" -msgstr "_Urgencia:" +msgid "State/Province:" +msgstr "Estado/Provincia:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1729,11 +1749,11 @@ msgid "XMP Attached" msgstr "XMP adjunto" -#: ../extensions/exiv2_tools/main.c:255 +#: ../extensions/exiv2_tools/main.c:256 msgid "date photo was taken" msgstr "fecha en la que se tomó la foto" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" msgstr "Compartir" @@ -1746,77 +1766,76 @@ msgstr "Subir fotos a Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -msgid "1024 x 1024" -msgstr "1024 x 1024" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +msgid "Export to Flickr" +msgstr "Exportar a Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -msgid "1280 x 1280" -msgstr "1280 x 1280" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "Su_bir" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -msgid "1600 x 1600" -msgstr "1600 x 1600" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +msgid "_Account:" +msgstr "C_uenta:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -msgid "2048 x 2048" -msgstr "2048 x 2048" - -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -msgid "720 x 720" -msgstr "720 x 720" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Editar cuentas" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "A_lbum:" msgstr "Á_lbum:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "Add a new album" msgstr "Añadir un álbum nuevo" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +msgid "Resize the images if larger than this size" +msgstr "Redimensionar las imágenes si son más grandes que este tamaño" + #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "Editar cuentas" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +msgid "_Resize to:" +msgstr "_Redimensionar a:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "Exportar a Flickr" +msgid "720 x 720" +msgstr "720 x 720" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 -#| msgid "Resize the images if larger then this size" -msgid "Resize the images if larger than this size" -msgstr "Redimensionar la imagen si es más grande que este tamaño" +msgid "1024 x 1024" +msgstr "1024 x 1024" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -msgid "_Account:" -msgstr "C_uenta:" +msgid "1280 x 1280" +msgstr "1280 x 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "_Redimensionar a:" +msgid "1600 x 1600" +msgstr "1600 x 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "Su_bir" +msgid "2048 x 2048" +msgstr "2048 x 2048" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 msgid "A_ccount:" msgstr "C_uenta:" @@ -1828,27 +1847,23 @@ msgid "A_ccounts:" msgstr "Cue_ntas:" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "Private" -msgstr "Privado" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 -msgid "Private photos, visible to friends" -msgstr "Fotos privadas, visibles para los amigos" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Fotos públicas" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 -msgid "_Location:" -msgstr "_Lugar:" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +msgid "Private photos, visible to friends" +msgstr "Fotos privadas, visibles para los amigos" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Privado" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 msgid "_Visibility:" msgstr "_Visibilidad:" @@ -1859,18 +1874,18 @@ msgstr "Autorizar…" #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Cuando haya terminado, pulse el botón «Continuar»." + +#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 #: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 msgid "C_ontinue" msgstr "Continuar" -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker_utils/flickr-authentication.c:435 -#: ../extensions/oauth/oauth-authentication.c:450 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Cuando haya terminado, pulse el botón «Continuar»." - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1882,34 +1897,34 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1851 +#: ../extensions/webalbums/gth-web-exporter.c:1841 msgid "_Open in the Browser" msgstr "Abrir en el na_vegador" -#: ../extensions/facebook/dlg-export-to-facebook.c:128 -#: ../extensions/facebook/dlg-export-to-facebook.c:333 -#: ../extensions/facebook/facebook-authentication.c:219 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:234 -#: ../extensions/flicker_utils/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 #: ../extensions/photobucket/dlg-export-to-photobucket.c:376 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:377 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "No se pudo conectar con el servidor" -#: ../extensions/facebook/dlg-export-to-facebook.c:180 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 msgid "Could not upload the files" msgstr "No se pudieron subir los archivos" -#: ../extensions/facebook/dlg-export-to-facebook.c:410 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 #: ../extensions/photobucket/dlg-export-to-photobucket.c:462 @@ -1917,79 +1932,79 @@ msgid "Could not create the album" msgstr "No se pudo crear el álbum" -#: ../extensions/facebook/dlg-export-to-facebook.c:479 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 #: ../extensions/photobucket/dlg-export-to-photobucket.c:534 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 msgid "New Album" msgstr "Álbum nuevo" -#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1816 +#: ../extensions/image_print/gth-image-print-job.c:1789 #: ../extensions/photobucket/dlg-export-to-photobucket.c:614 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 msgid "No valid file selected." msgstr "No se seleccionó ningún un archivo válido." -#: ../extensions/facebook/dlg-export-to-facebook.c:559 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 #: ../extensions/photobucket/dlg-export-to-photobucket.c:615 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 msgid "Could not export the files" msgstr "No se pudieron exportar los archivos" -#: ../extensions/facebook/dlg-export-to-facebook.c:567 -#: ../extensions/find_duplicates/gth-find-duplicates.c:284 -#: ../extensions/find_duplicates/gth-find-duplicates.c:376 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:255 +#: ../extensions/find_duplicates/gth-find-duplicates.c:347 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 #: ../extensions/photobucket/dlg-export-to-photobucket.c:623 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:800 -#: ../gthumb/gth-browser.c:990 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:1005 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d archivo (%s)" msgstr[1] "%d archivos (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:589 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:590 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:643 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 #, c-format msgid "Export to %s" msgstr "Exportar a %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:229 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:229 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:229 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "Nueva autenticación…" -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker_utils/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." msgstr "Seleccionar c_uenta…" -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker_utils/flickr-authentication.c:434 -#: ../extensions/oauth/oauth-authentication.c:449 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 #, c-format msgid "" "Return to this window when you have finished the authorization process on %s" msgstr "" "Volver a esta ventana cuando haya finalizado el proceso de autorización en %s" -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker_utils/flickr-authentication.c:514 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" msgstr "gThumb requiere su autorización para subir las fotos a %s" -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker_utils/flickr-authentication.c:515 -#: ../extensions/oauth/oauth-authentication.c:530 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 #, c-format msgid "" "Click 'Authorize' to open your web browser and authorize gthumb to upload " @@ -2000,31 +2015,31 @@ "fotos a %s. Cuando haya terminado, vuelva a esta ventana para completar la " "autorización." -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker_utils/flickr-authentication.c:615 -#: ../extensions/oauth/oauth-authentication.c:632 +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:681 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Seleccionar cuenta" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker_utils/flickr-authentication.c:724 -#: ../extensions/oauth/oauth-authentication.c:741 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:742 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Editar cuentas" -#: ../extensions/facebook/facebook-connection.c:304 -#: ../extensions/facebook/facebook-connection.c:464 -#: ../extensions/facebook/facebook-service.c:191 -#: ../extensions/facebook/facebook-service.c:294 -#: ../extensions/facebook/facebook-service.c:497 -#: ../extensions/flicker_utils/flickr-connection.c:295 -#: ../extensions/flicker_utils/flickr-connection.c:442 -#: ../extensions/flicker_utils/flickr-service.c:224 -#: ../extensions/flicker_utils/flickr-service.c:427 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:195 +#: ../extensions/flicker_utils/flickr-service.c:398 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2032,17 +2047,17 @@ msgid "Unknown error" msgstr "Error desconocido" -#: ../extensions/facebook/facebook-connection.c:339 -#: ../extensions/facebook/facebook-connection.c:490 -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-connection.c:321 -#: ../extensions/flicker_utils/flickr-connection.c:468 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 -#: ../extensions/picasaweb/google-connection.c:373 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" msgstr "Conectando con el servidor" @@ -2054,78 +2069,78 @@ msgid "Upload images to Facebook" msgstr "Subir imágenes a Facebook" -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "Obteniendo información de la cuenta" -#: ../extensions/facebook/facebook-service.c:425 -#: ../extensions/flicker_utils/flickr-service.c:352 -#: ../extensions/photobucket/photobucket-service.c:236 -#: ../extensions/picasaweb/picasa-web-service.c:238 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:209 msgid "Getting the album list" msgstr "Obteniendo la lista de álbumes" -#: ../extensions/facebook/facebook-service.c:554 -#: ../extensions/flicker_utils/flickr-service.c:455 -#: ../extensions/flicker_utils/flickr-service.c:575 -#: ../extensions/flicker_utils/flickr-service.c:613 -#: ../extensions/photobucket/photobucket-service.c:345 -#: ../extensions/picasaweb/picasa-web-service.c:329 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:426 +#: ../extensions/flicker_utils/flickr-service.c:546 +#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:300 msgid "Creating the new album" msgstr "Creando un álbum nuevo" -#: ../extensions/facebook/facebook-service.c:613 -#: ../extensions/flicker_utils/flickr-service.c:663 -#: ../extensions/photobucket/photobucket-service.c:402 -#: ../extensions/picasaweb/picasa-web-service.c:386 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:357 #, c-format msgid "Could not upload '%s': %s" msgstr "No se pudo subir «%s»: %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:699 -#: ../extensions/flicker_utils/flickr-service.c:774 -#: ../extensions/photobucket/photobucket-service.c:459 -#: ../extensions/picasaweb/picasa-web-service.c:441 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:412 #, c-format msgid "Uploading '%s'" msgstr "Subiendo «%s»" -#: ../extensions/facebook/facebook-service.c:915 -#: ../extensions/flicker_utils/flickr-service.c:943 -#: ../extensions/photobucket/photobucket-service.c:628 -#: ../extensions/picasaweb/picasa-web-service.c:634 +#: ../extensions/facebook/facebook-service.c:886 +#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:605 msgid "Uploading the files to the server" msgstr "Subiendo los archivos al servidor" -#: ../extensions/facebook/facebook-service.c:1032 -#: ../extensions/flicker_utils/flickr-service.c:1106 -#: ../extensions/picasaweb/picasa-web-service.c:747 +#: ../extensions/facebook/facebook-service.c:1003 +#: ../extensions/flicker_utils/flickr-service.c:1077 +#: ../extensions/picasaweb/picasa-web-service.c:718 msgid "Getting the photo list" msgstr "Obteniendo la lista de fotos" -#: ../extensions/file_manager/actions.c:130 +#: ../extensions/file_manager/actions.c:133 msgid "New folder" msgstr "Carpeta nueva" -#: ../extensions/file_manager/actions.c:131 +#: ../extensions/file_manager/actions.c:134 msgid "Enter the folder name:" msgstr "Introduzca el nombre de la carpeta:" -#: ../extensions/file_manager/actions.c:397 +#: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:847 +#: ../extensions/file_manager/callbacks.c:842 msgid "Could not move the files" msgstr "No se pudieron mover los archivos" -#: ../extensions/file_manager/actions.c:398 +#: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:848 +#: ../extensions/file_manager/callbacks.c:843 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." @@ -2133,11 +2148,11 @@ "No se pueden mover los archivos a la ubicación actual, como alternativa " "puede elegir copiarlos." -#: ../extensions/file_manager/actions.c:555 +#: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "No se pudo abrir la ubicación" -#: ../extensions/file_manager/actions.c:688 +#: ../extensions/file_manager/actions.c:696 msgid "" "The folder is not empty, do you want to delete the folder and its content " "permanently?" @@ -2145,45 +2160,45 @@ "La carpeta no está vacía. ¿Quiere borrar la carpeta y su contenido " "permanentemente?" -#: ../extensions/file_manager/actions.c:704 +#: ../extensions/file_manager/actions.c:712 msgid "Could not delete the folder" msgstr "No se pudo eliminar la carpeta" -#: ../extensions/file_manager/actions.c:765 +#: ../extensions/file_manager/actions.c:773 msgid "" "The folder cannot be moved to the Trash. Do you want to delete it " "permanently?" msgstr "" "No se puede mover la carpeta a la papelera. ¿Quiere borrarla permanentemente?" -#: ../extensions/file_manager/actions.c:772 +#: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" msgstr "No se pudo mover la carpeta a la papelera" -#: ../extensions/file_manager/actions.c:808 -#: ../gthumb/gth-file-source-vfs.c:826 +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" msgstr "¿Seguro que quiere eliminar permanentemente «%s»?" -#: ../extensions/file_manager/actions.c:818 -#: ../gthumb/gth-file-source-vfs.c:839 +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "Si elimina un archivo, se perderá definitivamente." -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Move To" msgstr "Mover a" -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Copy To" msgstr "Copiar a" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Move" msgstr "Mover" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Copy" msgstr "Copiar" @@ -2207,7 +2222,7 @@ #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 -#: ../gthumb/gth-file-source-vfs.c:800 +#: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" msgstr "Mo_ver a la papelera" @@ -2227,7 +2242,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "_Renombrar" @@ -2269,9 +2284,9 @@ msgid "Move the selected files to another folder" msgstr "Mover los archivos seleccionados a otra carpeta" -#: ../extensions/file_manager/callbacks.c:1009 -#: ../extensions/find_duplicates/gth-find-duplicates.c:610 -#: ../gthumb/gth-browser.c:4945 ../gthumb/gth-browser.c:4979 +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:581 +#: ../gthumb/gth-browser.c:4940 ../gthumb/gth-browser.c:4974 msgid "Could not perform the operation" msgstr "No se pudo efectuar la operación" @@ -2288,451 +2303,451 @@ msgstr "Eliminando archivos" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "_Brillo:" +msgid "_Preview" +msgstr "_Vista previa" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "Niveles de color" +msgid "B_rightness:" +msgstr "_Brillo:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "Con_traste:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "Cian-_rojo:" +msgid "_Saturation:" +msgstr "_Saturación:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "_Gamma:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "_Magenta-verde:" +msgid "Cyan-_Red:" +msgstr "Cian-_rojo:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Preview" -msgstr "_Vista previa" +msgid "_Magenta-Green:" +msgstr "_Magenta-verde:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 -msgid "_Reset" -msgstr "_Reiniciar" +msgid "_Yellow-Blue:" +msgstr "A_marillo-azul:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -msgid "_Saturation:" -msgstr "_Saturación:" +msgid "Color Levels" +msgstr "Niveles de color" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 -msgid "_Yellow-Blue:" -msgstr "A_marillo-azul:" - -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "_Reiniciar" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "Proporción de aspecto" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +msgid "_Position:" +msgstr "_Posición:" +#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "C_rop" -msgstr "Recor_tar" +msgid "×" +msgstr "×" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "Center" -msgstr "Centrar" +msgid "_Grid:" +msgstr "_Rejilla:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:6 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "I_nvertir la proporción de la imagen" - -#. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -msgid "M_ultiple of:" -msgstr "_Múltiple de:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 msgid "Maximize" msgstr "Maximizar" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +msgid "Center" +msgstr "Centrar" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "Selection" msgstr "Selección" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 -msgid "_Grid:" -msgstr "_Rejilla:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "I_nvert aspect ratio" +msgstr "I_nvertir la proporción de la imagen" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 -msgid "_Position:" -msgstr "_Posición:" +#. after the colon there is a control to select the size in pixels +#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +msgid "M_ultiple of:" +msgstr "_Múltiple de:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 msgid "px" msgstr "px" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "Aspect ratio" +msgstr "Proporción de aspecto" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "C_rop" +msgstr "Recor_tar" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "A_ncho:" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +msgid "Heigh_t:" +msgstr "Al_tura:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Set the image size to this value" +msgstr "Establecer el tamaño de la imagen a este valor" #: ../extensions/file_tools/data/ui/resize-options.ui.h:4 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Dimensiones" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "Al_tura:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 msgid "High _quality" msgstr "Alta _calidad" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "New dimensions:" -msgstr "Dimensiones nuevas:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 #: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "Options" msgstr "Opciones" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" msgstr "Dimensiones originales:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "Factor de escala:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -msgid "Set the image size to this value" -msgstr "Establecer el tamaño de la imagen a este valor" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 -msgid "_Width:" -msgstr "A_ncho:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Dimensiones nuevas:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "píxeles" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 msgid "Align" msgstr "Alinear" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -msgid "Alignment" -msgstr "Alineación" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 msgid "Angle" msgstr "Angulo" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Point 1:" +msgstr "Punto 1:" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -msgid "Bounding box" -msgstr "Cuadro delimitador" +msgid "Point 2:" +msgstr "Punto 2:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -msgid "Crop borders" -msgstr "Recortar bordes" +msgid "Keep aspect ratio" +msgstr "Mantener proporción de aspecto" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "" -"Draw a line on the image \n" -"to set the alignment." -msgstr "" -"Dibujar una línea en la imagen \n" -"para establecer la alineación." +msgid "Image size" +msgstr "Tamaño de la imagen" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 msgid "Grid:" msgstr "Cuadrícula:" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Pick a background color" +msgstr "Escoger un color de fondo" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -msgid "Image size" -msgstr "Tamaño de la imagen" +msgid "_Transparent" +msgstr "_Transparente" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "Keep aspect ratio" -msgstr "Mantener proporción de aspecto" +msgid "_Background:" +msgstr "_Fondo:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -msgid "Original size" -msgstr "Tamaño original" +msgid "Reset" +msgstr "Restablecer" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Dibujar una línea en la imagen \n" +"para establecer la alineación." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 msgid "Parallel" msgstr "Paralelo" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 msgid "Perpendicular" msgstr "Perpendicular" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 -msgid "Pick a background color" -msgstr "Escoger un color de fondo" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 -msgid "Point 1:" -msgstr "Punto 1:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 -msgid "Point 2:" -msgstr "Punto 2:" +msgid "Alignment" +msgstr "Alineación" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -msgid "Reset" -msgstr "Restablecer" +msgid "Original size" +msgstr "Tamaño original" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 -msgid "_Background:" -msgstr "_Fondo:" +msgid "Bounding box" +msgstr "Cuadro delimitador" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 -msgid "_Transparent" -msgstr "_Transparente" +msgid "Crop borders" +msgstr "Recortar bordes" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -msgid "Amount:" -msgstr "Cantidad:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Vista previa:" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 -msgid "Radius:" -msgstr "Radio:" - -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 msgid "Threshold:" msgstr "Umbral:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Radio:" + #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 -msgid "_Preview:" -msgstr "_Vista previa:" +msgid "Amount:" +msgstr "Cantidad:" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 -msgid "Basic tools to modify images." -msgstr "Herramientas básicas para modificar imágenes." - -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Image tools" msgstr "Herramientas de imagen" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +msgid "Basic tools to modify images." +msgstr "Herramientas básicas para modificar imágenes." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors..." msgstr "Ajustar colores…" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors" msgstr "Ajustar colores" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:528 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Cambiar el brillo, contraste, saturación y nivel gamma de la imagen" -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 msgid "Square" msgstr "Cuadrado" -#: ../extensions/file_tools/gth-file-tool-crop.c:423 -#: ../extensions/file_tools/gth-file-tool-resize.c:494 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:499 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (Imagen)" -#: ../extensions/file_tools/gth-file-tool-crop.c:426 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:503 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (Pantalla)" -#: ../extensions/file_tools/gth-file-tool-crop.c:430 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:508 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:431 -#: ../extensions/file_tools/gth-file-tool-resize.c:504 +#: ../extensions/file_tools/gth-file-tool-crop.c:433 +#: ../extensions/file_tools/gth-file-tool-resize.c:509 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, libro)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:505 +#: ../extensions/file_tools/gth-file-tool-crop.c:434 +#: ../extensions/file_tools/gth-file-tool-resize.c:510 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:506 +#: ../extensions/file_tools/gth-file-tool-crop.c:435 +#: ../extensions/file_tools/gth-file-tool-resize.c:511 msgid "3:2 (Postcard)" msgstr "3:2 (Postal)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:507 +#: ../extensions/file_tools/gth-file-tool-crop.c:436 +#: ../extensions/file_tools/gth-file-tool-resize.c:512 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:437 +#: ../extensions/file_tools/gth-file-tool-resize.c:513 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:438 +#: ../extensions/file_tools/gth-file-tool-resize.c:514 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:439 +#: ../extensions/file_tools/gth-file-tool-resize.c:515 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/rename_series/gth-template-selector.c:260 +#: ../extensions/file_tools/gth-file-tool-crop.c:440 +#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Personalizado" -#: ../extensions/file_tools/gth-file-tool-crop.c:449 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:455 +#: ../extensions/file_tools/gth-file-tool-rotate.c:416 msgid "Rule of Thirds" msgstr "Regla de los tercios" -#: ../extensions/file_tools/gth-file-tool-crop.c:450 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:456 +#: ../extensions/file_tools/gth-file-tool-rotate.c:417 msgid "Golden Sections" msgstr "Secciones doradas" -#: ../extensions/file_tools/gth-file-tool-crop.c:451 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:457 +#: ../extensions/file_tools/gth-file-tool-rotate.c:418 msgid "Center Lines" msgstr "Centrar líneas" -#: ../extensions/file_tools/gth-file-tool-crop.c:452 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:458 +#: ../extensions/file_tools/gth-file-tool-rotate.c:419 msgid "Uniform" msgstr "Uniformar" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop..." msgstr "Recortar…" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop" msgstr "Recortar" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:65 -#: ../extensions/file_tools/gth-file-tool-negative.c:65 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 msgid "Applying changes" msgstr "Aplicando cambios" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:189 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 msgid "Desaturate" msgstr "Desaturar" -#: ../extensions/file_tools/gth-file-tool-enhance.c:116 +#: ../extensions/file_tools/gth-file-tool-enhance.c:119 msgid "White balance correction" msgstr "Corrección del balance de blancos" -#: ../extensions/file_tools/gth-file-tool-enhance.c:339 +#: ../extensions/file_tools/gth-file-tool-enhance.c:342 msgid "Enhance Colors" msgstr "Realzar colores" -#: ../extensions/file_tools/gth-file-tool-enhance.c:340 +#: ../extensions/file_tools/gth-file-tool-enhance.c:343 msgid "Automatic white balance correction" msgstr "Corrección automática del balance de blancos" -#: ../extensions/file_tools/gth-file-tool-equalize.c:83 +#: ../extensions/file_tools/gth-file-tool-equalize.c:86 msgid "Equalizing image histogram" msgstr "Ecualizando el histograma de la imagen" -#: ../extensions/file_tools/gth-file-tool-equalize.c:261 +#: ../extensions/file_tools/gth-file-tool-equalize.c:275 msgid "Equalize" msgstr "Ecualizar" -#: ../extensions/file_tools/gth-file-tool-equalize.c:262 +#: ../extensions/file_tools/gth-file-tool-equalize.c:276 msgid "Equalize image histogram" msgstr "Ecualizar el histograma de la imagen" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Voltear" -#: ../extensions/file_tools/gth-file-tool-flip.c:74 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 msgid "Flip the image vertically" msgstr "Voltea la imagen verticalmente" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Reflejar" -#: ../extensions/file_tools/gth-file-tool-mirror.c:74 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 msgid "Mirror the image horizontally" msgstr "Espejar la imagen horizontalmente" -#: ../extensions/file_tools/gth-file-tool-negative.c:183 +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Negativo" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Rehacer" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize..." msgstr "Redimensionar…" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize" msgstr "Redimensionar" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate..." msgstr "Rotar…" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate" msgstr "Rotar" -#: ../extensions/file_tools/gth-file-tool-rotate.c:597 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Freely rotate the image" msgstr "Rotar libremente la imagen" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Rotar a la izquierda" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 msgid "Rotate the image by 90 degrees counterclockwise" msgstr "Rotar la imagen 90 grados en sentido antihorario" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Rotar a la derecha" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 msgid "Rotate the image by 90 degrees clockwise" msgstr "Rotar la imagen 90 grados en sentido horario" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Guardar como" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Guardar" @@ -2740,15 +2755,15 @@ msgid "Sharpening image" msgstr "Enfocando la imagen" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus..." msgstr "Realzar foco…" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus" msgstr "Realzar foco" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Deshacer" @@ -2765,38 +2780,38 @@ msgstr "_Carpetas" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Buscar duplicados" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 msgid "Duplicates:" msgstr "Duplicados:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 msgid "Files:" msgstr "Archivos:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -msgid "No duplicates found." -msgstr "No se encontraron duplicados." - #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -msgid "Search for Duplicates" -msgstr "Buscar duplicados" - -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 -#: ../gthumb/gth-browser-actions-entries.h:32 +#: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "_Ver" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "No se encontraron duplicados." + #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 msgid "Find Duplicates" msgstr "Buscar duplicados" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "Iniciar _en:" -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" msgstr "_Filtro:" @@ -2824,23 +2839,23 @@ msgid "no file" msgstr "ningún archivo" -#: ../extensions/find_duplicates/gth-find-duplicates.c:426 -#: ../extensions/find_duplicates/gth-find-duplicates.c:521 +#: ../extensions/find_duplicates/gth-find-duplicates.c:397 +#: ../extensions/find_duplicates/gth-find-duplicates.c:492 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d duplicado" msgstr[1] "%d duplicados" -#: ../extensions/find_duplicates/gth-find-duplicates.c:565 +#: ../extensions/find_duplicates/gth-find-duplicates.c:536 msgid "Search completed" msgstr "Búsqueda completada" -#: ../extensions/find_duplicates/gth-find-duplicates.c:577 +#: ../extensions/find_duplicates/gth-find-duplicates.c:548 msgid "Searching for duplicates" msgstr "Buscando duplicados" -#: ../extensions/find_duplicates/gth-find-duplicates.c:580 +#: ../extensions/find_duplicates/gth-find-duplicates.c:551 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2849,19 +2864,19 @@ msgstr[0] "%d archivo restante" msgstr[1] "%d archivos restantes" -#: ../extensions/find_duplicates/gth-find-duplicates.c:663 +#: ../extensions/find_duplicates/gth-find-duplicates.c:634 msgid "Getting the file list" msgstr "Obteniendo la lista de archivos" -#: ../extensions/find_duplicates/gth-find-duplicates.c:769 +#: ../extensions/find_duplicates/gth-find-duplicates.c:740 msgid "Duplicates" msgstr "Duplicados" -#: ../extensions/find_duplicates/gth-find-duplicates.c:1023 +#: ../extensions/find_duplicates/gth-find-duplicates.c:997 msgid "Select" msgstr "Seleccionar" -#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:63 +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr…" @@ -2869,7 +2884,7 @@ msgid "Download photos from Flickr" msgstr "Descargar fotos de Flickr" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "Subir fotos a Flickr" @@ -2881,135 +2896,128 @@ msgid "Upload images to Flickr" msgstr "Subir imágenes a Flickr" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Espacio libre:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "Ocul_tar de las búsquedas públicas" - -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -msgid "Moderate content" -msgstr "Moderar contenido" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "Conjunt_o de fotos:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "Fotos privadas" +msgid "_Privacy:" +msgstr "_Privacidad:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "Fotos privadas, visibles para la familia" +msgid "Hi_de from public searches" +msgstr "Ocul_tar de las búsquedas públicas" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Seguridad:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Private photos, visible to family and friends" msgstr "Fotos privadas, visibles para la familia y los amigos" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 -msgid "Restricted content" -msgstr "Contenido restringido" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 -msgid "Safe content" -msgstr "Contenido seguro" +msgid "Private photos, visible to family" +msgstr "Fotos privadas, visibles para la familia" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos" +msgstr "Fotos privadas" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 -msgid "_Privacy:" -msgstr "_Privacidad:" +msgid "Safe content" +msgstr "Contenido seguro" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 -msgid "_Safety:" -msgstr "_Seguridad:" +msgid "Moderate content" +msgstr "Moderar contenido" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Restricted content" +msgstr "Contenido restringido" + +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "_Import" msgstr "_Importar" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:357 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:827 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "No se pudo obtener la lista de fotos" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:394 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:559 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:861 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1024 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 msgid "No album selected" msgstr "No se seleccionó ningún álbum" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:577 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 #, c-format msgid "Import from %s" msgstr "Importar desde %s" -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1118 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 #: ../gthumb/gth-browser.c:2008 msgid "Could not save the file" msgstr "No se pudo guardar el archivo" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "No se pudo hacer la captura de pantalla" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1266 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 msgid "Save Image" msgstr "Guardar imagen" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Captura de pantalla" -#. this is an empty time +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Más lento" + #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "--:--" -msgstr "--:--" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +msgid "Play" +msgstr "Reproducir" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 -msgid "Change volume level" -msgstr "Cambiar el nivel del volumen" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Faster" msgstr "Más rápido" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:657 -msgid "Play" -msgstr "Reproducir" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Slower" -msgstr "Más lento" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Time:" msgstr "Hora:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--:--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Toggle volume" msgstr "Modificar volumen" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 -msgctxt "time" -msgid "/" -msgstr "/" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Cambiar el nivel del volumen" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 -#: ../extensions/photo_importer/dlg-photo-importer.c:614 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Elegir una carpeta" @@ -3021,29 +3029,29 @@ msgid "Play audio and video files." msgstr "Reproducir archivos de vídeo y de sonido." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:94 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Capturar pantalla" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:95 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Capturar la pantalla" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:634 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 msgid "Playing video" msgstr "Reproduciendo vídeo" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:647 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Pause" msgstr "Pausar" #: ../extensions/gstreamer_tools/main.c:31 -#: ../gthumb/gth-main-default-tests.c:211 +#: ../gthumb/gth-main-default-tests.c:247 msgid "Video" msgstr "Vídeo" #: ../extensions/gstreamer_tools/main.c:32 -#: ../gthumb/gth-main-default-tests.c:218 +#: ../gthumb/gth-main-default-tests.c:254 msgid "Audio" msgstr "Sonido" @@ -3052,7 +3060,7 @@ msgstr "Artista" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "Álbum" @@ -3074,13 +3082,13 @@ msgstr "Tasa de fotogramas:" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 -#: ../extensions/image_viewer/gth-image-viewer-page.c:222 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Anchura" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "Altura" @@ -3102,10 +3110,10 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1321 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 #: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:429 -#: ../extensions/webalbums/gth-web-exporter.c:2456 +#: ../extensions/webalbums/dlg-web-exporter.c:442 +#: ../extensions/webalbums/gth-web-exporter.c:2446 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3118,94 +3126,94 @@ msgid "Print the selected images" msgstr "Imprimir las imágenes seleccionadas" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 msgid "Centered" msgstr "Centrado" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 -msgid "Image" -msgstr "Imagen" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Left" -msgstr "Izquierda" - #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Position:" -msgstr "Posición:" +msgid "The total number of files" +msgstr "El número total de archivos" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 -msgid "Preview" -msgstr "Vista previa" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -msgid "Rotation:" -msgstr "Rotación:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 msgid "The event description" msgstr "La descripción del evento" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "_Filas:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Imagen" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Posición:" + #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "The total number of files" -msgstr "El número total de archivos" +msgid "Left" +msgstr "Izquierda" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "Arriba" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Rotación:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "Unidad:" #: ../extensions/image_print/data/ui/print-layout.ui.h:28 -msgid "_Rows:" -msgstr "_Filas:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 -msgid "inches" -msgstr "pulgadas" +msgid "Preview" +msgstr "Vista previa" #: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "milímetros" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 -msgid "Fonts" -msgstr "Tipografías" +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "pulgadas" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 msgid "Select Caption Font" msgstr "Seleccionar la tipografía del título" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -msgid "Select Footer Font" -msgstr "Seleccionar la tipografía del pie" - #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" msgstr "Seleccionar la tipografía de la cabecera" -#: ../extensions/image_print/gth-image-print-job.c:997 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Seleccionar la tipografía del pie" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Tipografías" + +#: ../extensions/image_print/gth-image-print-job.c:971 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Página %d de %d" -#: ../extensions/image_print/gth-image-print-job.c:1761 -#: ../extensions/image_print/gth-image-print-job.c:1888 -#: ../extensions/image_print/gth-image-print-job.c:1925 +#: ../extensions/image_print/gth-image-print-job.c:1734 +#: ../extensions/image_print/gth-image-print-job.c:1861 +#: ../extensions/image_print/gth-image-print-job.c:1898 msgid "Could not print" msgstr "No se pudo imprimir" -#: ../extensions/image_print/gth-image-print-job.c:1823 -#: ../gthumb/gth-main-default-tests.c:204 +#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Imágenes" -#: ../extensions/image_print/gth-image-print-job.c:1890 -#: ../gthumb/gth-image-loader.c:233 ../gthumb/gth-image-loader.c:306 +#: ../extensions/image_print/gth-image-print-job.c:1863 +#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 msgid "No suitable loader available for this file type" msgstr "No hay disponible ningún cargador para este tipo de archivo" @@ -3216,19 +3224,19 @@ msgstr "Cargando «%s»" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2695 +#: ../extensions/webalbums/gth-web-exporter.c:2685 msgid "Loading images" msgstr "Cargando las imágenes" #: ../extensions/image_print/image_print.extension.in.in.h:1 -msgid "Allow to print images choosing the page layout." -msgstr "Permitir imprimir imágenes seleccionando la orientación de la página." - -#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Image print" msgstr "Impresión de la imagen" -#: ../extensions/image_print/preferences.c:76 +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "Permitir imprimir imágenes seleccionando la orientación de la página." + +#: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "Imprimir" @@ -3236,30 +3244,30 @@ msgid "Rotate the selected images 90° to the right" msgstr "Rotar las imágenes seleccionadas 90 grados a la derecha" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" msgstr "Rotar las imágenes seleccionadas 90 grados a la izquierda" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Rotar físicamente" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" msgstr "Rotar las imágenes seleccionadas de acuerdo a la orientación empotrada" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" msgstr "Reiniciar la orientación EXIF" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" msgstr "Reiniciar la orientación empotrada sin rotar las imágenes" #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2349 -#: ../extensions/webalbums/gth-web-exporter.c:2433 +#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Guardando las imágenes" @@ -3271,12 +3279,12 @@ msgid "Rotate images without data loss." msgstr "Rotar imágenes sin pérdida de calidad" -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "Problema al transformar la imagen: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" "This transformation may introduce small image distortions along one or more " "edges, because the image dimensions are not multiples of 8.\n" @@ -3301,213 +3309,213 @@ "transformables. Para un uso practico, este modo da los mejores resultados de " "apariencia, pero la transformación no es estrictamente sin pérdidas." -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" msgstr "Recor_tar" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "_Aceptar distorsión" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -msgid "" -"Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, " -"fit-width, fit-width-if-larger." -msgstr "" -"Los valores posibles son: «actual_size», «keep-prev», «fit-size», «fit-size-" -"if-larger», «fit-width», «fit-width-if-larger»." - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -msgid "Whether to resize the window to fit the size of the image" -msgstr "Indica si redimensionar la ventana al tamaño de la imagen" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "Después de cargar una imagen:" +msgid "Set to actual size" +msgstr "Establecer al tamaño actual" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Alta" +msgid "Keep previous zoom" +msgstr "Mantener la ampliación anterior" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Baja" +msgid "Fit to window" +msgstr "Ajustar a la ventana" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "Ajustar a la ventana si es mayor" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 -msgid "Reset scrollbar positions" -msgstr "Restaurar las posiciones de las barras de desplazamiento" +msgid "Fit to width" +msgstr "Ajustar a la anchura" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 -msgid "Transparency _type:" -msgstr "Tipo de _transparencia:" +msgid "Fit to width if larger" +msgstr "Ajustar a la anchura si es mayor" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Restaurar las posiciones de las barras de desplazamiento" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "Después de cargar una imagen:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "Calidad de la _ampliación:" -#: ../extensions/image_viewer/gth-image-histogram.c:74 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "Tipo de _transparencia:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Alta" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Baja" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Blanco" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Negro" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Cuadriculado" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "Histograma" -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 msgid "Copy Image" msgstr "Copiar imagen" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 msgid "Copy the image to the clipboard" msgstr "Copiar la imagen al portapapeles" -#: ../extensions/image_viewer/gth-image-viewer-page.c:197 +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 msgid "Paste Image" msgstr "Pegar imagen" -#: ../extensions/image_viewer/gth-image-viewer-page.c:198 +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 msgid "Paste the image from the clipboard" msgstr "Pega la imagen desde el portapapeles" -#: ../extensions/image_viewer/gth-image-viewer-page.c:202 +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "Ampliar" -#: ../extensions/image_viewer/gth-image-viewer-page.c:203 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Ampliar" -#: ../extensions/image_viewer/gth-image-viewer-page.c:207 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Reducir" -#: ../extensions/image_viewer/gth-image-viewer-page.c:208 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Reducir" -#: ../extensions/image_viewer/gth-image-viewer-page.c:212 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:213 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Tamaño actual" -#: ../extensions/image_viewer/gth-image-viewer-page.c:217 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Ajustar" -#: ../extensions/image_viewer/gth-image-viewer-page.c:218 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Ampliar hasta ajustarse a la ventana" -#: ../extensions/image_viewer/gth-image-viewer-page.c:223 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Ampliar hasta ajustarse a la anchura" -#: ../extensions/image_viewer/gth-image-viewer-page.c:230 -msgid "_Fit Window to Image" -msgstr "_Ajustar ventana a la imagen" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:231 -msgid "Resize the window to the size of the image" -msgstr "Redimensionar la ventana al tamaño de la imagen" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -msgid "Basic image viewing." -msgstr "Vista básica de la imagen." - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Visor de imágenes" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Establecer al tamaño actual" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Ajustar a la anchura" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Vista básica de la imagen." -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Visor" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "Los valores posibles son: «none», «file_date», «current_date»" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "Los valores posibles son: yyyymmdd, yyyymm, yyyy" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:3 -msgid "The day of the month" -msgstr "El día del mes" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "_Destino" -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "La hora" +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "Subcarpeta _automática" -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "Los minutos" +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +msgid "as _single subfolder" +msgstr "como una sola subca_rpeta" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "El mes" +msgid "The year" +msgstr "El año" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "Los segundos" +msgid "The month" +msgstr "El mes" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "El año" +msgid "The day of the month" +msgstr "El día del mes" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -msgid "_Automatic subfolder" -msgstr "Subcarpeta _automática" +msgid "The hour" +msgstr "La hora" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "_Destino" +msgid "The minutes" +msgstr "Los minutos" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -msgid "as _single subfolder" -msgstr "como una sola subca_rpeta" +msgid "The seconds" +msgstr "Los segundos" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "Destino no válido" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "ejemplo: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:326 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Fecha del archivo" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:336 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "año-mes-día" -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "año-mes" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "año" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "formato personalizado" #: ../extensions/importer/gth-import-task.c:442 #: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:643 +#: ../extensions/importer/gth-import-task.c:648 msgid "Importing files" msgstr "Importando archivos" @@ -3519,25 +3527,25 @@ msgid "The selected files are already present in the destination." msgstr "Los archivos seleccionados ya existen en el destino." -#: ../extensions/importer/gth-import-task.c:619 -#: ../gthumb/gth-file-source-vfs.c:685 +#: ../extensions/importer/gth-import-task.c:622 +#: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "No se pudieron eliminar los archivos" -#: ../extensions/importer/gth-import-task.c:620 +#: ../extensions/importer/gth-import-task.c:623 msgid "Delete operation not supported." msgstr "La operación de borrado no está soportada." -#: ../extensions/importer/gth-import-task.c:704 +#: ../extensions/importer/gth-import-task.c:709 msgid "Last imported" msgstr "Último importado" -#: ../extensions/importer/gth-import-task.c:839 +#: ../extensions/importer/gth-import-task.c:815 msgid "No file specified." msgstr "No se especificó ningún archivo." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:876 +#: ../extensions/importer/gth-import-task.c:852 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3546,17 +3554,15 @@ "No hay espacio libre suficiente en «%s».\n" "se requieren %s , pero sólo hay %s disponibles." -#: ../extensions/list_tools/callbacks.c:65 ../gthumb/gth-filterbar.c:303 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 msgid "Personalize..." msgstr "Personalizar…" -#: ../extensions/list_tools/callbacks.c:238 -#: ../extensions/list_tools/callbacks.c:249 +#: ../extensions/list_tools/callbacks.c:320 msgid "Tools" msgstr "Herramientas" -#: ../extensions/list_tools/callbacks.c:240 -#: ../extensions/list_tools/callbacks.c:251 +#: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" msgstr "Conjunto de herramientas para múltiples archivos" @@ -3565,97 +3571,97 @@ msgstr "_Omitir" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "Co_mandos:" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "Comandos" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "Co_mandos:" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, no-c-format -msgid "%E" -msgstr "%E" +msgid "_Wait for the command to finish" +msgstr "_Esperar a que el comando termine" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "_Ejecutar el comando una vez por cada archivo" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format -msgid "%N" -msgstr "%N" +msgid "_Terminal command (shell script)" +msgstr "_Terminal de comandos (shell script)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "A_tajo:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +msgid "The file uri" +msgstr "El URI del archivo" -#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:7 -#, no-c-format -msgid "%ask{ message }{ default value }" -msgstr "%ask{ mensaje }{ valor predeterminado }" +msgid "The file path" +msgstr "La ruta del archivo" -#. Translate only 'attribute name' -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#, no-c-format -msgid "%attr{ attribute name }" -msgstr "%attr{ nombre del atributo }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "El nombre base del archivo" -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:13 -#, no-c-format -msgid "%quote{ text }" -msgstr "%quote{ texto }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "La ruta de la carpeta padre" +#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:14 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 -msgid "A file attribute" -msgstr "El atributo de un archivo" +#, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "%ask{ mensaje }{ valor predeterminado }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:15 msgid "Ask an input value" msgstr "Pedir un valor de entrada" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:17 -msgid "E_xecute command once for every file" -msgstr "_Ejecutar el comando una vez por cada archivo" - +#. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 -msgid "Quote the text " -msgstr "Entrecomillar el texto " +#, no-c-format +msgid "%attr{ attribute name }" +msgstr "%attr{ nombre del atributo }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:19 -msgid "Sh_ortcut:" -msgstr "A_tajo:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "El atributo de un archivo" #: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -msgid "The file basename" -msgstr "El nombre base del archivo" +#, no-c-format +msgid "%N" +msgstr "%N" #: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" msgstr "El nombre del archivo sin extensión" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -msgid "The file extension" -msgstr "La extensión del archivo" - #: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -msgid "The file path" -msgstr "La ruta del archivo" +#, no-c-format +msgid "%E" +msgstr "%E" #: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -msgid "The file uri" -msgstr "El URI del archivo" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "The parent folder path" -msgstr "La ruta de la carpeta padre" +msgid "The file extension" +msgstr "La extensión del archivo" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "_Command:" -msgstr "Coman_do:" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ texto }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "_Terminal command (shell script)" -msgstr "_Terminal de comandos (shell script)" +msgid "Quote the text " +msgstr "Entrecomillar el texto " #: ../extensions/list_tools/data/ui/script-editor.ui.h:30 -msgid "_Wait for the command to finish" -msgstr "_Esperar a que el comando termine" +msgid "_Command:" +msgstr "Coman_do:" #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" @@ -3666,7 +3672,7 @@ msgstr "Atajo" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "Mostrar" @@ -3687,32 +3693,32 @@ msgstr "" "¿Está seguro de que quiere eliminar permanentemente el comando seleccionado?" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" msgstr "Introducir un valor:" -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:570 -#: ../extensions/webalbums/gth-web-exporter.c:582 -#: ../extensions/webalbums/gth-web-exporter.c:590 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:560 +#: ../extensions/webalbums/gth-web-exporter.c:572 +#: ../extensions/webalbums/gth-web-exporter.c:580 msgid "Malformed command" msgstr "Comando mal formado" -#: ../extensions/list_tools/gth-script-editor-dialog.c:176 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "ninguna" -#: ../extensions/list_tools/gth-script-editor-dialog.c:182 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "tecla %d en el teclado numérico" -#: ../extensions/list_tools/gth-script-editor-dialog.c:325 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "No se especificó ningún comando" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "El comando finalizó anormalmente con estado %d" @@ -3725,33 +3731,33 @@ msgid "Scripting and batch manipulation of files." msgstr "Scripting y manipulación de archivos por lotes." -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "S" msgstr "S" -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "N" msgstr "N" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "W" msgstr "O" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "E" msgstr "E" -#: ../extensions/map_view/gth-map-view.c:196 +#: ../extensions/map_view/gth-map-view.c:205 #: ../extensions/map_view/map_view.extension.in.in.h:1 msgid "Map" msgstr "Mapa" #. No GPS label -#: ../extensions/map_view/gth-map-view.c:265 +#: ../extensions/map_view/gth-map-view.c:276 msgid "The geographical position information is not available for this image." msgstr "" "La información de posición geográfica no está disponible para esta imagen." @@ -3769,39 +3775,39 @@ msgstr "Subir fotos a Photobucket" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -msgid "1 megabyte file size" -msgstr "tamaño de archivo de 1 megabyte" +msgid "Tiny ( 100 x 75 )" +msgstr "Diminuta (100 x 75)" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "Pantalla de 15\" (800 x 600)" +msgid "Small ( 160 x 120 )" +msgstr "Pequeña (160 x 120)" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "Pantalla de 17\" (1024 x 768)" +msgid "Medium ( 320 x 240 )" +msgstr "Mediana (320 x 240)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 msgid "Large ( 640 x 480 )" msgstr "Grande (640 x 480)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "Mediana (320 x 240)" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "Pantalla de 15\" (800 x 600)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 -msgid "Small ( 160 x 120 )" -msgstr "Pequeña (160 x 120)" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "Pantalla de 17\" (1024 x 768)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "Diminuta (100 x 75)" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +msgid "1 megabyte file size" +msgstr "tamaño de archivo de 1 megabyte" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 msgid "_Scramble filenames" msgstr "Me_zclar nombres de archivos" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "Contened_or:" @@ -3862,60 +3868,60 @@ msgstr "Importar fotos y otros archivos desde una carpeta" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "Después de importar desde un dispositivo:" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 msgid "_Rotate the images physically" msgstr "_Rotar las imágenes físicamente" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "Después de importar desde un dispositivo:" + #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../gthumb/gth-filterbar.c:413 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:414 msgid "S_how:" msgstr "M_ostrar:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -msgid "_Delete the imported files from the source" -msgstr "_Borrar los archivos importados del origen" - #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "_Etiquetas:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "_Evento:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Tags:" -msgstr "_Etiquetas:" +msgid "_Delete the imported files from the source" +msgstr "_Borrar los archivos importados del origen" -#: ../extensions/photo_importer/dlg-photo-importer.c:222 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:173 +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 msgid "Could not import the files" msgstr "No se pudieron importar los archivos" #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:294 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "Archivos que importar: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:334 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" msgstr "No se pudo abrir la carpeta" -#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 #: ../gthumb/gth-browser.c:1921 msgid "Getting folder listing..." msgstr "Obteniendo la lista de carpetas…" -#: ../extensions/photo_importer/dlg-photo-importer.c:410 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "Vaciar" -#: ../extensions/photo_importer/dlg-photo-importer.c:580 +#: ../extensions/photo_importer/dlg-photo-importer.c:586 msgid "Import from Removable Device" msgstr "Importar desde un dispositivo extraíble" -#: ../extensions/photo_importer/dlg-photo-importer.c:612 +#: ../extensions/photo_importer/dlg-photo-importer.c:618 msgid "Import from Folder" msgstr "Importar desde carpeta" @@ -3928,7 +3934,7 @@ msgstr "Importar fotos desde dispositivos extraíbles." #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." msgstr "Álbum web de _Picasa…" @@ -3936,27 +3942,31 @@ msgid "Download photos from Picasa Web Album" msgstr "Descargar fotos de un álbum web de Picasa" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" msgstr "Subir fotos a álbum web de Picasa" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "Exportar a álbumes web de Picasa" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "Álbu_mes" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 msgid "Import from Picasa Web Album" msgstr "Importar de álbumes web de Picasa" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 msgid "_Album:" msgstr "Á_lbum:" #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 +msgid "_E-Mail:" +msgstr "Correo-_e:" + +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 msgid "" "Type the characters you see in the picture below. Letters are not case-" "sensitive." @@ -3964,34 +3974,30 @@ "Escriba los caracteres que ve en la siguiente imagen. No es sensible a la " "capitalización." -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "_E-Mail:" -msgstr "Correo-_e:" - #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 msgid "_Password:" msgstr "Contrase_ña:" -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Público" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:307 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "No se pudo obtener la lista de álbumes" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:391 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" msgstr "Álbum web de Picasa" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:478 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "Cuenta" -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:133 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 msgid "Could not load the file" msgstr "No se pudo cargar el archivo" @@ -4003,39 +4009,27 @@ msgid "Upload images to Picasa Web Albums" msgstr "Subir imágenes a álbumes web Picasa" -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: jpeg, jpg." -msgstr "Los valores posibles son: «jpeg», «jpg»." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:2 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Los valores posibles son: «none», «deflate», «jpeg»." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:3 -msgid "Possible values are: tiff, tif." -msgstr "Los valores posibles son: «tiff», «tif»." - #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "Opti_mizar" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 msgid "_Default extension:" msgstr "Extensión pre_determinada:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "_Progresivo" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 msgid "_Quality:" msgstr "_Calidad:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 msgid "_Smoothing:" msgstr "_Suavizado:" +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_mizar" + +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progresivo" + #: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 msgid "Compression _level:" msgstr "Nive_l de compresión:" @@ -4048,48 +4042,48 @@ msgid "_RLE compression" msgstr "Compresión _RLE" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "Compresión" - #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "No_rmal (sin compresión)" +msgid "_No compression" +msgstr "_Sin compresión" #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "Resolución" +msgid "No_rmal (Deflate)" +msgstr "No_rmal (sin compresión)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 msgid "_Loss compression (JPEG)" msgstr "C_ompresión con pérdida (JPEG)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_No compression" -msgstr "_Sin compresión" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +msgid "Compression" +msgstr "Compresión" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 msgid "dpi" msgstr "dpi" -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:527 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +msgid "Resolution" +msgstr "Resolución" + +#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 msgid "JPEG" msgstr "JPEG" -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 +#: ../extensions/pixbuf_savers/gth-png-saver.c:140 msgid "PNG" msgstr "PNG" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 #: ../gthumb/gth-buffer-data.c:84 msgid "Insufficient memory" msgstr "Memoria insuficiente" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 msgid "TGA" msgstr "TGA" -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:542 +#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 msgid "TIFF" msgstr "TIFF" @@ -4102,30 +4096,30 @@ msgstr "Guardar imágenes en formatos comunes tales como JPEG, PNG y TIFF" #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "Permitir cargar imágenes en formato raw." - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" msgstr "Soporte para formato raw" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Permitir cargar imágenes en formato raw." + +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_Y:" msgstr "_Y:" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." msgstr "Quitar ojos rojos…" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "Quitar ojos rojos" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:470 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" msgstr "Quitar el efecto «ojos rojos» producido por el flash de las cámaras" @@ -4137,146 +4131,134 @@ msgid "Tool to remove the red-eye effect from a photo." msgstr "Herramienta para eliminar el efecto ojos rojos de una foto." -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "" -"Possible values include: general::unsorted, file::name, file::size, file::" -"mtime, exif::photo::datetimeoriginal" -msgstr "" -"Los posibles valores incluyen: general::unsorted, file::name, file::size, " -"file::mtime, exif::photo::datetimeoriginal" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "Los valores posibles son: 0 (ninguno), 1 (inferior), 2 (superior)" - #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -msgid "add" -msgstr "añadir" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "digits" msgstr "dígitos" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "format:" msgstr "formato:" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 msgid "remove" msgstr "quitar" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, no-c-format -msgid "%A{ identifier }" -msgstr "%A{ identificador }" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "añadir" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, no-c-format -msgid "%M{ format }" -msgstr "%M{ formato }" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Renombrar" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" msgstr "Capi_talización:" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 msgid "Edit template" msgstr "Editar plantilla" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Re_verse Order" -msgstr "Orden in_verso" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "El nombre original del archivo" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -msgid "Rename" -msgstr "Renombrar" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "La extensión original" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 -msgid "The digitalization date" -msgstr "La fecha de la digitalización" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "El enumerador original" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ formato }" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 msgid "The modification date" msgstr "La fecha de modificación" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -msgid "The original enumerator" -msgstr "El enumerador original" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 -msgid "The original extension" -msgstr "La extensión original" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "La fecha de la digitalización" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "The original filename" -msgstr "El nombre original del archivo" +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ identificador }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "Plan_tilla:" -#: ../extensions/rename_series/dlg-rename-series.c:64 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "Orden in_verso" + +#: ../extensions/rename_series/dlg-rename-series.c:58 msgid "Enumerator" msgstr "Enumerador" -#: ../extensions/rename_series/dlg-rename-series.c:65 +#: ../extensions/rename_series/dlg-rename-series.c:59 msgid "Original filename" msgstr "Nombre original del archivo" -#: ../extensions/rename_series/dlg-rename-series.c:66 +#: ../extensions/rename_series/dlg-rename-series.c:60 msgid "Original extension" msgstr "Extensión original" -#: ../extensions/rename_series/dlg-rename-series.c:67 +#: ../extensions/rename_series/dlg-rename-series.c:61 msgid "Original enumerator" msgstr "Enumerador original" -#: ../extensions/rename_series/dlg-rename-series.c:68 +#: ../extensions/rename_series/dlg-rename-series.c:62 msgid "Modification date" msgstr "Fecha de modificación" -#: ../extensions/rename_series/dlg-rename-series.c:69 +#: ../extensions/rename_series/dlg-rename-series.c:63 msgid "Digitalization date" msgstr "Fecha de la digitalización" -#: ../extensions/rename_series/dlg-rename-series.c:70 +#: ../extensions/rename_series/dlg-rename-series.c:64 msgid "File attribute" msgstr "Atributo del archivo" -#: ../extensions/rename_series/dlg-rename-series.c:556 -#: ../extensions/rename_series/dlg-rename-series.c:687 +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 msgid "Could not rename the files" msgstr "No se pudieron renombrar los archivos" -#: ../extensions/rename_series/dlg-rename-series.c:784 +#: ../extensions/rename_series/dlg-rename-series.c:780 msgid "Could not save the template" msgstr "No se pudo guardar la plantilla" -#: ../extensions/rename_series/dlg-rename-series.c:802 +#: ../extensions/rename_series/dlg-rename-series.c:798 msgid "Edit Template" msgstr "Editar plantilla" -#: ../extensions/rename_series/dlg-rename-series.c:859 +#: ../extensions/rename_series/dlg-rename-series.c:856 msgid "Old Name" msgstr "Nombre antiguo" -#: ../extensions/rename_series/dlg-rename-series.c:870 +#: ../extensions/rename_series/dlg-rename-series.c:867 msgid "New Name" msgstr "Nombre nuevo" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:944 msgid "Keep original case" msgstr "Mantener la capitalización original" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:945 msgid "Convert to lower-case" msgstr "Convertir a minúsculas" -#: ../extensions/rename_series/dlg-rename-series.c:947 +#: ../extensions/rename_series/dlg-rename-series.c:946 msgid "Convert to upper-case" msgstr "Convertir a mayúsculas" @@ -4300,36 +4282,36 @@ msgid "Resize the selected images" msgstr "Redimensionar las imágenes seleccionadas" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Formato" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Redimensionar imágenes" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 msgid "New dimensions" msgstr "Dimensiones nuevas" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "Resize Images" -msgstr "Redimensionar imágenes" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "A_ltura:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" msgstr "Man_tener la proporción de aspecto original" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Formato" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "pixel" msgstr "píxel" -#: ../extensions/resize_images/dlg-resize-images.c:166 +#: ../extensions/resize_images/dlg-resize-images.c:168 msgid "Resizing images" msgstr "Redimensionando imágenes" -#: ../extensions/resize_images/dlg-resize-images.c:408 +#: ../extensions/resize_images/dlg-resize-images.c:412 msgid "Keep the original format" msgstr "Mantener el formato original" @@ -4358,23 +4340,23 @@ msgid "Find files" msgstr "Buscar archivos" -#: ../extensions/search/callbacks.c:133 +#: ../extensions/search/callbacks.c:132 msgid "Search again" msgstr "Buscar de nuevo" #. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/callbacks.c:174 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "Buscar" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:195 +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "todas las siguientes reglas" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:196 +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "cualquiera de las siguientes reglas" @@ -4383,18 +4365,56 @@ msgid "Files found until now: %s" msgstr "Archivos encontrados hasta ahora: %s" -#: ../extensions/search/gth-search-task.c:270 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "Buscando…" -#: ../extensions/search/gth-search-task.c:276 +#: ../extensions/search/gth-search-task.c:277 msgid "Cancel the operation" msgstr "Cancelar la operación" -#: ../extensions/search/search.extension.in.in.h:1 +#: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." msgstr "Herramienta de búsqueda de archivos." +#: ../extensions/selections/callbacks.c:62 +msgid "Add to _Selection" +msgstr "Añadir a _selección" + +#: ../extensions/selections/callbacks.c:65 +msgid "Selection 1" +msgstr "Selección 1" + +#: ../extensions/selections/callbacks.c:70 +msgid "Selection 2" +msgstr "Selección 2" + +#: ../extensions/selections/callbacks.c:75 +msgid "Selection 3" +msgstr "Selección 3" + +#: ../extensions/selections/callbacks.c:180 +#, c-format +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" +"Use Alt+%d para añadir archivos a esta selección, Ctrl+%d para ver esta " +"selección." + +#: ../extensions/selections/gth-selections-manager.c:239 +#, c-format +msgid "Selection %d" +msgstr "Selección %d" + +#: ../extensions/selections/gth-selections-manager.c:242 +#: ../extensions/selections/selections.extension.in.in.h:1 +msgid "Selections" +msgstr "Selecciones" + +#: ../extensions/selections/selections.extension.in.in.h:2 +msgid "Advanced file selection." +msgstr "Selección de archivos avanzadas" + #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" msgstr "Mo_strar diapositivas" @@ -4403,59 +4423,59 @@ msgid "View as a slideshow" msgstr "Ver como diapositivas" -#: ../extensions/slideshow/callbacks.c:406 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "Mostrar diapositivas" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -msgid "Add files to the playlist" -msgstr "Añadir archivos a la lista de reproducción" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "Lista de reproducción" +msgid "_Personalize" +msgstr "_Personalizar" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "Orden alea_torio" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "Quitar los archivos seleccionados" +msgid "_Transition effect:" +msgstr "Efecto de _transición:" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "_Cambiar automáticamente, cada" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "Reinicia_r al finalizar" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "_Personalizar" +msgid "R_andom order" +msgstr "Orden alea_torio" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "Reinicia_r al finalizar" +msgid "Playlist" +msgstr "Lista de reproducción" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 -msgid "_Transition effect:" -msgstr "Efecto de _transición:" +msgid "Add files to the playlist" +msgstr "Añadir archivos a la lista de reproducción" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Quitar los archivos seleccionados" #: ../extensions/slideshow/gth-slideshow.c:229 msgid "Playing slideshow" msgstr "Reproduciendo las diapositivas" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 msgid "Choose the files to play" msgstr "Seleccionar los archivos que reproducir" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 msgid "Audio files" msgstr "Archivos de sonido" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 msgid "Random" msgstr "Aleatorio" @@ -4521,12 +4541,12 @@ msgstr "Índice" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "Siguiente" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:105 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "Anterior" @@ -4551,169 +4571,176 @@ msgid "View the previous page" msgstr "Ver la página anterior" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Todas las imágenes en una sola imagen" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 +msgid "Adapts to the window width" +msgstr "Adaptarse a la anchura de la ventana" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Álbum web" + #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 #, no-c-format msgid "%P" msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 -msgid "Adapts to the window width" -msgstr "Adaptarse a la anchura de la ventana" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 -msgid "All images on a single image" -msgstr "Todas las imágenes en una sola imagen" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Copiar originales al destino" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 -msgid "Image Attributes" -msgstr "Atributos de la imagen" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "Red_imensionar si son más grandes que:" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "Image Page" -msgstr "Página de imagen" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "_Adapt to the window width " +msgstr "A_daptarse a la anchura de la ventana" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 msgid "Index Page" msgstr "Página índice" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Show the description, if available" -msgstr "Mostrar la descripción, si está disponible" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Show the following attributes:" -msgstr "Mostrar los siguientes atributos:" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "Descripción de miniaturas" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 msgid "The current image number" msgstr "El número de la imagen actual" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -msgid "The file comment" -msgstr "El comentario del archivo" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "The total number of images" msgstr "El número total de imágenes" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "Thumbnail Caption" -msgstr "Descripción de miniaturas" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +msgid "The file comment" +msgstr "El comentario del archivo" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 -msgid "Web Album" -msgstr "Álbum web" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "Página de imagen" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "_Adapt to the window width " -msgstr "A_daptarse a la anchura de la ventana" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "Mostrar la descripción, si está disponible" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "_Copy originals to destination" -msgstr "_Copiar originales al destino" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "Mostrar los siguientes atributos:" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -msgid "_Resize if larger than:" -msgstr "Red_imensionar si son más grandes que:" +msgid "Image Attributes" +msgstr "Atributos de la imagen" -#: ../extensions/webalbums/gth-web-exporter.c:1812 +#: ../extensions/webalbums/gth-web-exporter.c:1802 msgid "Could not show the destination" msgstr "No se pudo mostrar el destino" -#: ../extensions/webalbums/gth-web-exporter.c:1848 +#: ../extensions/webalbums/gth-web-exporter.c:1838 msgid "The album has been created successfully." msgstr "El álbum se creó correctamente." -#: ../extensions/webalbums/gth-web-exporter.c:2116 -#: ../extensions/webalbums/gth-web-exporter.c:2143 +#: ../extensions/webalbums/gth-web-exporter.c:2106 +#: ../extensions/webalbums/gth-web-exporter.c:2133 msgid "Saving thumbnails" msgstr "Guardando las miniaturas" -#: ../extensions/webalbums/gth-web-exporter.c:2171 +#: ../extensions/webalbums/gth-web-exporter.c:2161 msgid "Saving HTML pages: Images" msgstr "Guardando las páginas HTML: Imágenes" -#: ../extensions/webalbums/gth-web-exporter.c:2229 +#: ../extensions/webalbums/gth-web-exporter.c:2219 msgid "Saving HTML pages: Indexes" msgstr "Guardando las páginas HTML: Índices" -#: ../extensions/webalbums/gth-web-exporter.c:2512 +#: ../extensions/webalbums/gth-web-exporter.c:2502 msgid "Copying original images" msgstr "Copiando imágenes originales" -#: ../extensions/webalbums/gth-web-exporter.c:2938 +#: ../extensions/webalbums/gth-web-exporter.c:2929 msgid "Could not find the style folder" msgstr "No se pudo encontrar la carpeta de estilos" -#: ../extensions/webalbums/gth-web-exporter.c:2971 +#: ../extensions/webalbums/gth-web-exporter.c:2967 msgid "Could not create a temporary folder" msgstr "No se pudo crear una carpeta temporal" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Álbumes web" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Create static web albums." msgstr "Creando álbumes web estáticos." -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 -msgid "Web Albums" -msgstr "Álbumes web" +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1250 +#: ../gthumb/gth-browser.c:1809 ../gthumb/gth-browser.c:5900 +#: ../gthumb/gth-browser.c:5919 ../gthumb/gth-browser.c:5943 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "No se pudo cargar la posición «%s»" -#: ../gthumb/dlg-personalize-filters.c:236 +#: ../gthumb/dlg-personalize-filters.c:237 msgid "Filter" msgstr "Filtro" -#: ../gthumb/dlg-personalize-filters.c:314 +#: ../gthumb/dlg-personalize-filters.c:315 msgid "Could not save the filter" msgstr "No se pudo guardar el filtro" -#: ../gthumb/dlg-personalize-filters.c:357 +#: ../gthumb/dlg-personalize-filters.c:358 msgid "New Filter" msgstr "Filtro nuevo" -#: ../gthumb/dlg-personalize-filters.c:386 +#: ../gthumb/dlg-personalize-filters.c:387 msgid "Edit Filter" msgstr "Editar filtro" -#: ../gthumb/dlg-preferences-extensions.c:68 ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 msgid "All" msgstr "Todas" -#: ../gthumb/dlg-preferences-extensions.c:69 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" msgstr "Activado" -#: ../gthumb/dlg-preferences-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" msgstr "Desactivado" -#: ../gthumb/dlg-preferences-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" msgstr "Visores" -#: ../gthumb/dlg-preferences-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "Metadatos" -#: ../gthumb/dlg-preferences-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "Herramientas de archivos" -#: ../gthumb/dlg-preferences-extensions.c:76 +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "Herramientas de listas" -#: ../gthumb/dlg-preferences-extensions.c:77 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "Importadores" -#: ../gthumb/dlg-preferences-extensions.c:78 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" msgstr "Exportadores" -#: ../gthumb/dlg-preferences-extensions.c:215 +#: ../gthumb/dlg-preferences-extensions.c:216 msgid "Could not activate the extension" msgstr "No se pudo activar la extensión" -#: ../gthumb/dlg-preferences-extensions.c:225 +#: ../gthumb/dlg-preferences-extensions.c:226 msgid "Could not deactivate the extension" msgstr "No se pudo desactivar la extensión" @@ -4743,7 +4770,7 @@ msgid "File _Format: %s" msgstr "_Formato del archivo: %s" -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:197 +#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 msgid "All Files" msgstr "Todos los archivos" @@ -4766,12 +4793,12 @@ #: ../gthumb/eggfileformatchooser.c:681 #, c-format msgid "" -"The program was not able to find out the file format you want to use for `" -"%s'. Please make sure to use a known extension for that file or manually " +"The program was not able to find out the file format you want to use for `%" +"s'. Please make sure to use a known extension for that file or manually " "choose a file format from the list below." msgstr "" -"El programa no pudo encontrar el formato de archivo que quiere usar para " -"«%s». Asegúrese de usar una extensión de archivo conocida para el archivo o " +"El programa no pudo encontrar el formato de archivo que quiere usar para «%" +"s». Asegúrese de usar una extensión de archivo conocida para el archivo o " "elija manualmente un formato de archivo de la lista de abajo." #: ../gthumb/eggfileformatchooser.c:688 @@ -4779,30 +4806,30 @@ msgstr "No se reconoció el formato de archivo" #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1355 +#: ../gthumb/gio-utils.c:1351 #, c-format msgid "%s of %s" msgstr "%s de %s" -#: ../gthumb/gio-utils.c:1390 +#: ../gthumb/gio-utils.c:1386 #, c-format msgid "Moving \"%s\" to \"%s\"" msgstr "Moviendo «%s» a «%s»" -#: ../gthumb/gio-utils.c:1392 +#: ../gthumb/gio-utils.c:1388 #, c-format msgid "Copying \"%s\" to \"%s\"" msgstr "Copiando «%s» a «%s»" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Moving files" msgstr "Moviendo archivos" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Copying files" msgstr "Copiando archivos" -#: ../gthumb/gio-utils.c:1734 +#: ../gthumb/gio-utils.c:1751 msgid "Getting file information" msgstr "Obteniendo información del archivo" @@ -4812,7 +4839,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2749 +#: ../gthumb/glib-utils.c:2945 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4824,13 +4851,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2758 +#: ../gthumb/glib-utils.c:2954 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:361 +#: ../gthumb/gth-browser-actions-callbacks.c:400 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4842,7 +4869,7 @@ "Software Foundation; ya sea en la versión 2 de la Licencia, como (a su " "elección) cualquier otra versión posterior." -#: ../gthumb/gth-browser-actions-callbacks.c:365 +#: ../gthumb/gth-browser-actions-callbacks.c:404 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -4854,7 +4881,7 @@ "PARA UN PROPÓSITO DETERMINADO. Vea la Licencia Pública General de GNU para " "más detalles." -#: ../gthumb/gth-browser-actions-callbacks.c:369 +#: ../gthumb/gth-browser-actions-callbacks.c:408 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." @@ -4862,11 +4889,11 @@ "Debería haber recibido una copia de la Licencia Pública General GNU junto " "con gthumb. Si no la recibió, consulte http://www.gnu.org/licenses/." -#: ../gthumb/gth-browser-actions-callbacks.c:388 +#: ../gthumb/gth-browser-actions-callbacks.c:427 msgid "An image viewer and browser for GNOME." msgstr "Un visor y navegador de imágenes para GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:391 +#: ../gthumb/gth-browser-actions-callbacks.c:430 msgid "translator_credits" msgstr "" "Daniel Mustieles , 2008, 2009, 2010\n" @@ -4876,222 +4903,232 @@ "Daniel Baeyens , 2002\n" "QA: Jorge González , 2008, 2009, 2010" -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_Archivo" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "_Editar" -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "_Ir a" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "Ay_uda" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" msgstr "Abrir _con" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" msgstr "I_mportar desde" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" msgstr "E_xportar a" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" msgstr "_Ventana nueva" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" msgstr "Abrir otra ventana" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Abrir" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "Abrir en ventana nueva" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "Editar varias preferencias" -#: ../gthumb/gth-browser-actions-entries.h:85 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." msgstr "_Ordenar por…" -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." msgstr "_Filtro…" -#: ../gthumb/gth-browser-actions-entries.h:96 +#: ../gthumb/gth-browser-actions-entries.h:108 msgid "Stop loading the current location" msgstr "Deja de cargar el lugar actual" -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:114 msgid "Reload the current location" msgstr "Recargar la ubicación actual" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" msgstr "Ver la imagen anterior" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "Ver la próxima imagen" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "Cambiar a pantalla completa" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" msgstr "Salir de «Pantalla completa»" -#: ../gthumb/gth-browser-actions-entries.h:126 ../gthumb/gth-browser.c:3647 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3587 msgid "Go to the previous visited location" msgstr "Ir a la ubicación visitada previamente" -#: ../gthumb/gth-browser-actions-entries.h:131 ../gthumb/gth-browser.c:3668 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3605 msgid "Go to the next visited location" msgstr "Ir a la siguiente ubicación visitada" -#: ../gthumb/gth-browser-actions-entries.h:136 ../gthumb/gth-browser.c:3689 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3623 msgid "Go up one level" msgstr "Subir un nivel" -#: ../gthumb/gth-browser-actions-entries.h:145 ../gthumb/gth-browser.c:667 +#: ../gthumb/gth-browser-actions-entries.h:161 +msgid "_Location..." +msgstr "_Ubicación…" + +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "Especificar una ubicación que abrir" + +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:672 msgid "_Delete History" msgstr "_Borrar histórico" -#: ../gthumb/gth-browser-actions-entries.h:146 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "Delete the list of visited locations" msgstr "Borrar la lista de lugares visitados" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "View the folders" msgstr "Ver las carpetas" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Show information about gthumb" msgstr "Mostrar información acerca de gThumb" -#: ../gthumb/gth-browser-actions-entries.h:160 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "Contents" msgstr "Índice" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:192 msgid "Display the gthumb Manual" msgstr "Mostrar el manual de gThumb" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:197 msgid "_Keyboard Shortcuts" msgstr "Combinaciones de _teclas" -#: ../gthumb/gth-browser-actions-entries.h:174 +#: ../gthumb/gth-browser-actions-entries.h:206 msgid "_Toolbar" msgstr "Barra de herramien_tas" -#: ../gthumb/gth-browser-actions-entries.h:175 +#: ../gthumb/gth-browser-actions-entries.h:207 msgid "View or hide the toolbar of this window" msgstr "Mostrar u ocultar la barra de herramientas de esta ventana" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:211 msgid "_Statusbar" msgstr "Barra de e_stado" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "View or hide the statusbar of this window" msgstr "Mostrar u ocultar la barra de estado de esta ventana" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:216 msgid "_Filterbar" msgstr "Barra de _filtros" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "View or hide the filterbar of this window" msgstr "Mostrar u ocultar la barra de filtros de esta ventana" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:221 msgid "_Sidebar" msgstr "Barra _lateral" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "View or hide the sidebar of this window" msgstr "Mostrar u ocultar la barra lateral de esta ventana" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:226 msgid "_Thumbnail Pane" msgstr "Panel de minia_turas" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Mostrar u ocultar el panel de miniaturas en el modo visor" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:231 msgid "_Thumbnails" msgstr "Minia_turas" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "View thumbnails" msgstr "Ver las miniaturas" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:236 msgid "_Hidden Files" msgstr "Archivos _ocultos" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "Show hidden files and folders" msgstr "Mostrar archivos y carpetas ocultos" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:242 +#: ../gthumb/gth-browser-actions-entries.h:247 msgid "View file properties" msgstr "Ver las propiedades del archivo" -#: ../gthumb/gth-browser-actions-entries.h:214 +#: ../gthumb/gth-browser-actions-entries.h:251 msgid "Edit" msgstr "Editar" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:252 msgid "Edit file" msgstr "Editar archivo" -#: ../gthumb/gth-browser.c:363 +#: ../gthumb/gth-browser-actions-entries.h:256 +msgid "_Fit Window to Image" +msgstr "_Ajustar ventana a la imagen" + +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Resize the window to the size of the image" +msgstr "Redimensionar la ventana al tamaño de la imagen" + +#: ../gthumb/gth-browser.c:369 #, c-format msgid "Open %s" msgstr "Abrir %s" -#: ../gthumb/gth-browser.c:503 +#: ../gthumb/gth-browser.c:509 msgid "[modified]" msgstr "[modificada]" -#: ../gthumb/gth-browser.c:991 +#: ../gthumb/gth-browser.c:1006 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d archivo seleccionado (%s)" msgstr[1] "%d archivos seleccionados (%s)" -#: ../gthumb/gth-browser.c:1026 +#: ../gthumb/gth-browser.c:1041 #, c-format msgid "%s of free space" msgstr "%s de espacio libre" -#: ../gthumb/gth-browser.c:1235 ../gthumb/gth-browser.c:1809 -#: ../gthumb/gth-browser.c:5797 ../gthumb/gth-browser.c:5816 -#: ../gthumb/gth-browser.c:5841 -#, c-format -msgid "Could not load the position \"%s\"" -msgstr "No se pudo cargar la posición «%s»" - #: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:1932 #, c-format msgid "No suitable module found for %s" @@ -5110,52 +5147,51 @@ msgid "Do _Not Save" msgstr "_No guardar" -#: ../gthumb/gth-browser.c:2863 ../gthumb/gth-browser.c:2883 -#: ../gthumb/gth-source-tree.c:178 ../gthumb/gth-source-tree.c:200 +#: ../gthumb/gth-browser.c:2829 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "No se pudo cambiar el nombre" -#: ../gthumb/gth-browser.c:3328 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3258 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Modificado" -#: ../gthumb/gth-browser.c:3648 ../gthumb/gth-browser.c:3669 +#: ../gthumb/gth-browser.c:3588 ../gthumb/gth-browser.c:3606 msgid "View the list of visited locations" msgstr "Ver la lista de lugares visitados" -#: ../gthumb/gth-browser.c:3690 +#: ../gthumb/gth-browser.c:3624 msgid "View the list of upper locations" msgstr "Ver la lista de lugares anteriores" -#: ../gthumb/gth-browser.c:5798 +#: ../gthumb/gth-browser.c:5901 #, c-format msgid "File type not supported" msgstr "Tipo de archivo no soportado" -#: ../gthumb/gth-browser.c:5842 +#: ../gthumb/gth-browser.c:5944 #, c-format msgid "No suitable module found" msgstr "No se encontró un modulo adecuado" -#: ../gthumb/gth-extensions.c:228 +#: ../gthumb/gth-extensions.c:203 #, c-format msgid "Could not open the module `%s`: %s" msgstr "No se pudo abrir el módulo «%s»: %s" -#: ../gthumb/gth-extensions.c:831 +#: ../gthumb/gth-extensions.c:744 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "La extensión «%2$s» requiere la extensión «%1$s»" -#: ../gthumb/gth-file-source-vfs.c:116 +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Carpeta personal" -#: ../gthumb/gth-file-source-vfs.c:121 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" msgstr "Sistema de archivos" -#: ../gthumb/gth-file-source-vfs.c:730 +#: ../gthumb/gth-file-source-vfs.c:739 msgid "" "The files cannot be moved to the Trash. Do you want to delete them " "permanently?" @@ -5163,16 +5199,16 @@ "No se pueden mover los archivos a la papelera. ¿Quiere eliminarlos " "permanentemente?" -#: ../gthumb/gth-file-source-vfs.c:741 +#: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" msgstr "No se pudieron mover los archivos a la papelera" -#: ../gthumb/gth-file-source-vfs.c:785 +#: ../gthumb/gth-file-source-vfs.c:797 #, c-format msgid "Are you sure you want to move \"%s\" to trash?" msgstr "¿Seguro que quiere mover «%s» a la papelera?" -#: ../gthumb/gth-file-source-vfs.c:788 +#: ../gthumb/gth-file-source-vfs.c:801 #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" @@ -5180,7 +5216,7 @@ msgstr[1] "" "¿Seguro que quiere mover a la papelera los %'d archivos seleccionados?" -#: ../gthumb/gth-file-source-vfs.c:829 +#: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" msgid_plural "" @@ -5192,84 +5228,84 @@ "¿Está seguro de que quiere eliminar permanentemente los %'d archivos " "seleccionados?" -#: ../gthumb/gth-filterbar.c:405 +#: ../gthumb/gth-filterbar.c:406 msgid "Hide the filterbar" msgstr "Ocultar la barra de filtros" -#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" -#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" -msgstr "MiB" +msgstr "MB" -#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" -msgstr "GiB" +msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:279 ../gthumb/gth-filter-editor-dialog.c:207 +#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "archivos" -#: ../gthumb/gth-filter-editor-dialog.c:254 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" msgstr "ascendente" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" msgstr "descendiente" -#: ../gthumb/gth-filter-editor-dialog.c:545 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "No se especificó ningún límite" -#: ../gthumb/gth-folder-tree.c:848 +#: ../gthumb/gth-folder-tree.c:857 msgid "Loading..." msgstr "Cargando…" -#: ../gthumb/gth-folder-tree.c:1119 +#: ../gthumb/gth-folder-tree.c:1100 msgid "(Open Parent)" msgstr "(Abrir padre)" -#: ../gthumb/gth-histogram-view.c:800 +#: ../gthumb/gth-histogram-view.c:826 msgid "Linear scale" msgstr "Escala lineal" -#: ../gthumb/gth-histogram-view.c:812 +#: ../gthumb/gth-histogram-view.c:838 msgid "Logarithmic scale" msgstr "Escala logarítmica" -#: ../gthumb/gth-histogram-view.c:832 +#: ../gthumb/gth-histogram-view.c:858 msgid "Channel:" msgstr "Canal:" -#: ../gthumb/gth-histogram-view.c:864 +#: ../gthumb/gth-histogram-view.c:890 msgid "Value" msgstr "Valor" -#: ../gthumb/gth-histogram-view.c:870 +#: ../gthumb/gth-histogram-view.c:896 msgid "Red" msgstr "Rojo" -#: ../gthumb/gth-histogram-view.c:876 +#: ../gthumb/gth-histogram-view.c:902 msgid "Green" msgstr "Verde" -#: ../gthumb/gth-histogram-view.c:882 +#: ../gthumb/gth-histogram-view.c:908 msgid "Blue" msgstr "Azul" -#: ../gthumb/gth-histogram-view.c:888 +#: ../gthumb/gth-histogram-view.c:914 msgid "Alpha" msgstr "Alfa" -#: ../gthumb/gth-histogram-view.c:895 +#: ../gthumb/gth-histogram-view.c:921 msgid "RGB" msgstr "RGB" @@ -5286,7 +5322,7 @@ msgstr "Nombre" #: ../gthumb/gth-main-default-metadata.c:40 -#: ../gthumb/gth-main-default-tests.c:248 +#: ../gthumb/gth-main-default-tests.c:284 msgid "Size" msgstr "Tamaño" @@ -5326,23 +5362,23 @@ msgid "dimensions" msgstr "dimensiones" -#: ../gthumb/gth-main-default-tests.c:225 +#: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Soporte" -#: ../gthumb/gth-main-default-tests.c:232 +#: ../gthumb/gth-main-default-tests.c:268 msgid "Text Files" msgstr "Archivos de texto" -#: ../gthumb/gth-main-default-tests.c:240 +#: ../gthumb/gth-main-default-tests.c:276 msgid "Filename" msgstr "Nombre del archivo" -#: ../gthumb/gth-main-default-tests.c:272 +#: ../gthumb/gth-main-default-tests.c:308 msgid "Title (embedded)" msgstr "Título (empotrado)" -#: ../gthumb/gth-main-default-tests.c:278 +#: ../gthumb/gth-main-default-tests.c:316 msgid "Description (embedded)" msgstr "Descripción (empotrada)" @@ -5354,7 +5390,7 @@ msgid "No options available for this file type" msgstr "No hay opciones disponibles para este tipo de archivo" -#: ../gthumb/gth-progress-dialog.c:142 +#: ../gthumb/gth-progress-dialog.c:144 msgid "Cancel operation" msgstr "Cancelar operación" @@ -5362,60 +5398,60 @@ msgid "Saving file information" msgstr "Guardando la información del archivo" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-tags-entry.c:388 #, c-format msgid "Create tag «%s»" msgstr "Crear etiqueta «%s»" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:735 msgid "Show all the tags" msgstr "Mostrar todas las etiquetas" -#: ../gthumb/gth-tags-file.c:234 +#: ../gthumb/gth-tags-file.c:236 msgid "Holidays" msgstr "Vacaciones" -#: ../gthumb/gth-tags-file.c:235 +#: ../gthumb/gth-tags-file.c:237 msgid "Temporary" msgstr "Temporal" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:238 msgid "Screenshots" msgstr "Capturas de pantallas" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:239 msgid "Science" msgstr "Ciencia" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:240 msgid "Favorite" msgstr "Favorita" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:241 msgid "Important" msgstr "Importante" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:242 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:243 msgid "Games" msgstr "Juegos" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:244 msgid "Party" msgstr "Fiesta" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:245 msgid "Birthday" msgstr "Cumpleaños" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:246 msgid "Astronomy" msgstr "Astronomía" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:247 msgid "Family" msgstr "Familia" @@ -5433,18 +5469,18 @@ msgid "is not" msgstr "no es" -#: ../gthumb/gth-test-category.c:374 ../gthumb/gth-test-simple.c:800 -#: ../gthumb/gth-test-simple.c:826 ../gthumb/gth-test-simple.c:847 -#: ../gthumb/gth-test-simple.c:873 +#: ../gthumb/gth-test-category.c:394 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "La prueba de definición está incompleto" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:252 msgid "Add a new rule" msgstr "Añadir una nueva regla" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:263 msgid "Remove this rule" msgstr "Quitar esta regla" @@ -5488,11 +5524,11 @@ msgid "is after" msgstr "está después" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:477 msgid "Today" msgstr "Hoy" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:485 msgid "Now" msgstr "Ahora" @@ -5504,52 +5540,51 @@ msgid "Close _All Windows" msgstr "Cerrar _todas las ventanas" -#: ../gthumb/gtk-utils.c:704 +#: ../gthumb/gtk-utils.c:551 msgid "Could not display help" msgstr "No se pudo mostrar la ayuda" -#: ../gthumb/gtk-utils.c:991 ../gthumb/gtk-utils.c:1000 +#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 msgid "Could not launch the application" msgstr "No se pudo lanzar la aplicación" -#: ../gthumb/gtk-utils.c:1103 +#: ../gthumb/gtk-utils.c:978 msgid "_Copy Here" msgstr "_Copiar aquí" -#: ../gthumb/gtk-utils.c:1108 +#: ../gthumb/gtk-utils.c:983 msgid "_Move Here" msgstr "_Mover aquí" -#: ../gthumb/gtk-utils.c:1113 +#: ../gthumb/gtk-utils.c:988 msgid "_Link Here" msgstr "En_lazar aquí" -#: ../gthumb/gtk-utils.c:1122 +#: ../gthumb/gtk-utils.c:997 msgid "Cancel" msgstr "Cancelar" -#: ../gthumb/main.c:72 +#: ../gthumb/main.c:59 msgid "Open a new window" msgstr "Abrir una ventana nueva" -#: ../gthumb/main.c:76 +#: ../gthumb/main.c:63 msgid "Start in fullscreen mode" msgstr "Iniciar en modo de pantalla completa" -#: ../gthumb/main.c:80 +#: ../gthumb/main.c:67 msgid "Automatically start a slideshow" msgstr "Iniciar una secuencia automáticamente" -#: ../gthumb/main.c:84 +#: ../gthumb/main.c:71 msgid "Automatically import digital camera photos" msgstr "Importar automáticamente fotos de la cámara digital" -#: ../gthumb/main.c:88 +#: ../gthumb/main.c:75 msgid "Show version" msgstr "Mostrar versión" -#. command line options -#: ../gthumb/main.c:539 +#: ../gthumb/main.c:344 msgid "- Image browser and viewer" msgstr "- Explorador de imágenes y visor" @@ -5559,6 +5594,79 @@ msgstr "" "No se pudo encontrar un módulo adecuado para guardar la imagen como «%s»" +#~ msgid "Choose another tag" +#~ msgstr "Seleccionar otra etiqueta" + +#~ msgid "New tag" +#~ msgstr "Etiqueta nueva" + +#~ msgid "" +#~ "Possible values are: actual_size, fit, keep_prev, fit_if_larger, " +#~ "fit_width_if_larger." +#~ msgstr "" +#~ "Los valores posibles son: «actual_size», «fit», «keep_prev», «fit_if_larger», " +#~ "«fit_width_if_larger»." + +#~ msgid "Possible values are: high, low." +#~ msgstr "Los valores posibles son: «high», «low»." + +#~ msgid "Possible values are: light, midtone, dark." +#~ msgstr "Los valores posibles son: «light», «midtone», «dark»." + +#~ msgid "Possible values are: list, thumbnails." +#~ msgstr "Los valores posibles son: «list», «thumbnails»." + +#~ msgid "Possible values are: small, medium, large." +#~ msgstr "Los valores posibles son: «small», «medium», «large»." + +#~ msgid "" +#~ "Possible values are: system, text_below, text_beside, text_only, " +#~ "icons_only." +#~ msgstr "" +#~ "Los valores posibles son: «system», «text_below», «text_beside», «text_only», " +#~ "«icons_only»." + +#~ msgid "Possible values: pixels, percentage" +#~ msgstr "Valores posibles: «pixels», «percentage»." + +#~ msgid "" +#~ "Possible values are: actual-size, keep-prev, fit-size, fit-size-if-" +#~ "larger, fit-width, fit-width-if-larger." +#~ msgstr "" +#~ "Los valores posibles son: «actual_size», «keep-prev», «fit-size», «fit-size-" +#~ "if-larger», «fit-width», «fit-width-if-larger»." + +#~ msgid "Possible values are: none, file_date, current_date" +#~ msgstr "Los valores posibles son: «none», «file_date», «current_date»" + +#~ msgid "Possible values are: yyyymmdd, yyyymm, yyyy" +#~ msgstr "Los valores posibles son: yyyymmdd, yyyymm, yyyy" + +#~ msgid "Possible values are: none, deflate, jpeg." +#~ msgstr "Los valores posibles son: «none», «deflate», «jpeg»." + +#~ msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" +#~ msgstr "Los valores posibles son: 0 (ninguno), 1 (inferior), 2 (superior)" + +#~ msgid "Activate items with a double click" +#~ msgstr "Activar elementos con una pulsación doble" + +#~ msgid "Activate items with a single click" +#~ msgstr "Activar elementos con una sola pulsación" + +#~ msgid "Follow Nautilus behaviour" +#~ msgstr "Seguir el comportamiento de Nautilus" + +#~ msgid "Set image to actual size" +#~ msgstr "Mostrar la imagen con su tamaño normal" + +#~ msgid "×" +#~ msgstr "×" + +#~ msgctxt "time" +#~ msgid "/" +#~ msgstr "/" + #~ msgid " " #~ msgstr " " @@ -5725,33 +5833,6 @@ #~ msgid "Upload to Flickr" #~ msgstr "Subir a Flickr" -#~ msgid "112" -#~ msgstr "112" - -#~ msgid "128" -#~ msgstr "128" - -#~ msgid "164" -#~ msgstr "164" - -#~ msgid "200" -#~ msgstr "200" - -#~ msgid "256" -#~ msgstr "256" - -#~ msgid "48" -#~ msgstr "48" - -#~ msgid "64" -#~ msgstr "64" - -#~ msgid "85" -#~ msgstr "85" - -#~ msgid "95" -#~ msgstr "95" - #~ msgid "_Crop" #~ msgstr "_Recortar" @@ -5861,8 +5942,8 @@ #~ msgid "Click \"Help\" for format code information." #~ msgstr "" -#~ "Pulse «Ayuda» para obtener información sobre el código de formato." -#~ "" +#~ "Pulse «Ayuda» para obtener información sobre el código de formato." #~ msgid "" #~ "If valuable photos have been deleted accidently, download the excellent " @@ -6498,8 +6579,8 @@ #~ msgstr "_Intercambiar la altura y el ancho para un mejor ajuste" #~ msgid "" -#~ "The number keys on the numeric keypad can be associated with scripts " -#~ "0-9.\n" +#~ "The number keys on the numeric keypad can be associated with scripts 0-" +#~ "9.\n" #~ "All scripts can be launched from the Scripts menu." #~ msgstr "" #~ "La teclas numéricas del teclado numérico se puede asociar a scripts 0-9 \n" @@ -6588,9 +6669,6 @@ #~ msgid "Came_ra Model" #~ msgstr "Modelo de cáma_ra" -#~ msgid "Da_te and Time" -#~ msgstr "Fecha y _hora" - #~ msgid "E_xposure mode" #~ msgstr "Modo de e_xposición" @@ -6672,8 +6750,8 @@ #~ msgid "" #~ "Possible values are: none, name, path, size, time, exifdate, comment." #~ msgstr "" -#~ "Los valores posibles son: «none», «name», «path», «size», «time», " -#~ "«exifdate», «comment»." +#~ "Los valores posibles son: «none», «name», «path», «size», «time», «exifdate», " +#~ "«comment»." #~ msgid "" #~ "Possible values are: none, simple, simple_with_shadow, shadow, slide, " @@ -6686,8 +6764,8 @@ #~ "Possible values are: none, square, image, display, 4x3, 4x6, 5x7, 8x10, " #~ "custom." #~ msgstr "" -#~ "Los valores posibles son: «none», «square», «image», «display», «4x3», " -#~ "«4x6», «5x7», «8x10», «custom»." +#~ "Los valores posibles son: «none», «square», «image», «display», «4x3», «4x6», " +#~ "«5x7», «8x10», «custom»." #~ msgid "Possible values are: skip, rename, ask, overwrite." #~ msgstr "Los valores posibles son: «skip», «rename», «ask», «overwrite»." @@ -6839,8 +6917,8 @@ #~ "The name \"%s\" is not valid because it contains the character \"/\". " #~ "Please use a different name." #~ msgstr "" -#~ "El nombre «%s» no es válido porque contiene el carácter «/». Use un " -#~ "nombre diferente." +#~ "El nombre «%s» no es válido porque contiene el carácter «/». Use un nombre " +#~ "diferente." #~ msgid "Edit with GIMP" #~ msgstr "Editar con GIMP" @@ -6882,8 +6960,8 @@ #~ "The name \"%s\" is not valid because it contains the character \",\". " #~ "Please use a different name." #~ msgstr "" -#~ "El nombre «%s» no es válido porque contiene el carácter «,». Use un " -#~ "nombre diferente." +#~ "El nombre «%s» no es válido porque contiene el carácter «,». Use un nombre " +#~ "diferente." #~ msgid "The tag \"%s\" is already present. Please use a different name." #~ msgstr "La etiqueta «%s» ya está presente. Use un nombre diferente." @@ -7084,9 +7162,6 @@ #~ msgid "_Go to the Image Folder" #~ msgstr "_Ir a la carpeta de la imagen" -#~ msgid "Specify a location to visit" -#~ msgstr "Especificar una ubicación para visitar" - #~ msgid "Create _Index Image..." #~ msgstr "Crear índice de _imágenes..." diff -Nru gthumb-2.14.3/po/it.po gthumb-3.0.0/po/it.po --- gthumb-2.14.3/po/it.po 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/po/it.po 2012-02-19 15:01:32.000000000 +0000 @@ -5,81 +5,89 @@ # Francesco Marletta , 2003, 2004, 2005, 2006, 2007, 2008, 2009. # Luca Ferretti , 2009. # Milo Casagrande , 2010. +# Gianvito Cavasoli , 2011, 2012. +# msgid "" msgstr "" "Project-Id-Version: gthumb\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-02 17:56+0200\n" -"PO-Revision-Date: 2010-10-02 18:00+0200\n" -"Last-Translator: Milo Casagrande \n" -"Language-Team: Italian \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gthumb&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-01-19 21:32+0000\n" +"PO-Revision-Date: 2012-01-13 21:24+0100\n" +"Last-Translator: Gianvito Cavasoli \n" +"Language-Team: Italiano \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Content-Transfer-Encoding: 8bits\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Il file non è un file .desktop valido" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" -msgstr "File di desktop Versione '%s' sconosciuto" +msgstr "File di desktop versione «%s» non riconosciuto" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "Lancio di %s" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "L'applicazione non accetta documenti sulla riga di comando" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" -msgstr "Opzione di lancio sconosciuta: %d" +msgstr "Opzione di lancio non riconosciuta: %d" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "" "Non è possibile passare URI di documenti a un'elemento del desktop con " -"'Type=Link'" +"«Type=Link»" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "Elemento non lanciabile" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "Disabilita la connessione al gestore di sessione" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" -msgstr "Specificare il file contenente la configurazione salvata" +msgstr "Specifica il file contenente la configurazione salvata" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "FILE" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" -msgstr "Specificare l'ID di gestione della sessione" +msgstr "Specifica l'ID di gestione della sessione" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "ID" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" -msgstr "Opzioni di gestione sessione:" +msgstr "Opzioni gestione di sessione:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "Mostra le opzioni di gestione sessione" @@ -89,9 +97,11 @@ #: ../data/gthumb.desktop.in.in.h:2 msgid "View and organize your images" -msgstr "Mostra e organizza le proprie immagini" +msgstr "Visualizza e organizza le proprie immagini" -#: ../data/gthumb.desktop.in.in.h:3 ../data/gthumb-import.desktop.in.in.h:3 +#. manually set name and icon +#: ../data/gthumb.desktop.in.in.h:3 ../gthumb/gth-browser.c:529 +#: ../gthumb/gth-progress-dialog.c:386 ../gthumb/main.c:313 msgid "gThumb" msgstr "gThumb" @@ -101,17 +111,21 @@ #: ../data/gthumb-import.desktop.in.in.h:1 msgid "Import the photos on your camera card" -msgstr "Importa le foto della scheda" +msgstr "Importa le foto dalla scheda della fotocamera" #: ../data/gthumb-import.desktop.in.in.h:2 +msgid "Import with gThumb" +msgstr "Import con gThumb" + +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "Photo Import Tool" msgstr "Strumento di importazione foto" #: ../data/gthumb-import.desktop.in.in.h:4 msgid "gThumb Photo Import Tool" -msgstr "Strumento di importazione foto di gThumb" +msgstr "Strumento di importazione foto gThumb" -#: ../data/gthumb.schemas.in.h:1 +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "" "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " "to generate thumbnails for all images." @@ -120,92 +134,107 @@ "durante la creazione delle miniature. Usare 0 se si vuole che vengano " "generate miniature per tutte le immagini." -#: ../data/gthumb.schemas.in.h:2 -msgid "" -"Possible values are: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." -msgstr "" -"I valori possibili sono: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." - -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "I valori possibili sono: high, low." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "I valori possibili sono: light, midtone, dark." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "I valori possibili sono: list, thumbnails." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "I valori possibili sono: small, medium, large." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Open files in the active window" +msgstr "Apre i file nella finestra attiva" -#: ../data/gthumb.schemas.in.h:7 -msgid "" -"Possible values are: system, text_below, text_beside, text_only, icons_only." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Whether to resize the window to fit the size of the image" msgstr "" -"I valori possibili sono: system, text_below, text_beside, text_only, " -"icons_only." +"Indica se ridimensionare la finestra per adattarla alla dimensione " +"dell'immagine" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "I valori possibili: white, black, checked, none." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 msgid "Whether to always use a black background." msgstr "Indica se usare sempre uno sfondo nero." -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 +msgid "Whether to reset the scrollbars position after changing image" msgstr "" -"Indica se reimpostare la posizione delle barre di scorrimento dopo il " -"cambiamento dell'immagine" +"Indica se ripristinare la posizione delle barre di scorrimento dopo la " +"modifica dell'immagine" -#: ../data/ui/extensions.ui.h:1 -msgid "Available _extensions:" -msgstr "Estensioni _disponibili:" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "I valori possibili sono: jpeg, jpg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "I valori possibili sono: tiff, tif." -#: ../data/ui/extensions.ui.h:2 +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"I valori possibili includono: general::unsorted, file::name, file::size, " +"file::mtime, exif::photo::datetimeoriginal" + +#: ../data/ui/extensions-preferences.ui.h:1 msgid "More extensions..." msgstr "Altre estensioni..." -#: ../data/ui/extensions.ui.h:3 -msgid "_Categories:" -msgstr "_Categorie:" - -#: ../data/ui/extensions.ui.h:4 -msgid "gthumb Extensions" -msgstr "Estensioni di gthumb" +#: ../data/ui/extensions-preferences.ui.h:2 +msgid "Some extensions are configurable." +msgstr "Alcune estensioni sono configurabili." + +#: ../data/ui/extensions-preferences.ui.h:3 +msgid "_Extensions:" +msgstr "_Estensioni:" #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" -msgstr "_Nome del Filtro:" +msgstr "_Nome del filtro:" #. limit label -#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 +#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:268 +#: ../gthumb/gth-filter.c:340 msgid "_Limit to" msgstr "_Limita a" #: ../data/ui/filter-editor.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" -msgstr "_Rispetta" +msgstr "Corrispon_de" #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "selezionato per" +#: ../data/ui/histogram-info.ui.h:1 +msgid "Mean:" +msgstr "Media:" + +#: ../data/ui/histogram-info.ui.h:2 +msgid "Median:" +msgstr "Mediana:" + +#. After the colon there is a percentile. +#: ../data/ui/histogram-info.ui.h:4 +msgctxt "Pixels" +msgid "Max:" +msgstr "Massimo:" + +#. After the colon there is the percentile of selected pixels. +#: ../data/ui/histogram-info.ui.h:6 +msgctxt "Pixels" +msgid "Selected:" +msgstr "Selezionato:" + +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:8 +msgid "Pixels:" +msgstr "Pixel:" + +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:10 +msgid "Std dev:" +msgstr "Dev. standard:" + #: ../data/ui/overwrite-dialog.ui.h:1 msgid "Do not overwrite _the old file" msgstr "Non sovrascrivere il _vecchio file" @@ -220,11 +249,11 @@ #: ../data/ui/overwrite-dialog.ui.h:4 msgid "New File:" -msgstr "Nuovo file" +msgstr "Nuovo file:" #: ../data/ui/overwrite-dialog.ui.h:5 msgid "Old File:" -msgstr "Vecchio File:" +msgstr "Vecchio file:" #: ../data/ui/overwrite-dialog.ui.h:6 msgid "Over_write the old file" @@ -232,7 +261,7 @@ #: ../data/ui/overwrite-dialog.ui.h:7 msgid "Overwrite _all files" -msgstr "Sovrascrivi _tutti i file" +msgstr "Sovrascrivere _tutti i file" #: ../data/ui/overwrite-dialog.ui.h:8 msgid "Overwrite the old file with the new one?" @@ -240,13 +269,13 @@ #: ../data/ui/overwrite-dialog.ui.h:9 #: ../extensions/file_tools/data/ui/crop-options.ui.h:9 -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 msgid "Size:" msgstr "Dimensione:" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" -msgstr "_Non sovrascrivere nessun file" +msgstr "_Non sovrascrivere alcun file" #: ../data/ui/overwrite-dialog.ui.h:11 msgid "_Save the new file as:" @@ -265,167 +294,103 @@ msgstr "_Altri filtri:" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Attivare gli elementi con un doppio clic" - -#: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Attivare gli elementi con un singolo clic" - -#: ../data/ui/preferences.ui.h:3 msgid "Appearance" msgstr "Aspetto" -#: ../data/ui/preferences.ui.h:4 +#: ../data/ui/preferences.ui.h:2 msgid "As_k confirmation before deleting files or catalogs" msgstr "C_hiedere conferma prima di eliminare file o cataloghi" -#: ../data/ui/preferences.ui.h:5 +#: ../data/ui/preferences.ui.h:3 msgid "Ask whether to save _modified files" -msgstr "Chiedere se salvare i file _modificati" +msgstr "Chiedere se salvare i file modi_ficati" -#: ../data/ui/preferences.ui.h:6 ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Nero" - -#: ../data/ui/preferences.ui.h:7 ../gthumb/dlg-extensions.c:69 -#: ../gthumb/gth-browser-actions-entries.h:155 +#: ../data/ui/preferences.ui.h:4 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:173 msgid "Browser" msgstr "Navigatore" -#: ../data/ui/preferences.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:1 +#: ../data/ui/preferences.ui.h:5 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 msgid "Caption" msgstr "Didascalia" -#: ../data/ui/preferences.ui.h:9 ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "A scacchi" - -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:6 msgid "Choose startup folder" -msgstr "Scegliere la cartella iniziale" +msgstr "Scegli la cartella iniziale" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:7 msgid "D_etermine image type from content (slower)" msgstr "D_eterminare il tipo di immagine dal contenuto (più lento)" -#: ../data/ui/preferences.ui.h:12 ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Adattare alla larghezza se più grande" - -#: ../data/ui/preferences.ui.h:13 ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Adattare alla finestra" - -#: ../data/ui/preferences.ui.h:14 ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Adattare alla finestra se più grande" - -#: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "Seguire il comportamento di Nautilus" +#: ../data/ui/preferences.ui.h:8 +msgid "File _properties in browser:" +msgstr "_Proprietà del file nel navigatore:" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:9 #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:374 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/edit_metadata/gth-edit-general-page.c:404 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 #: ../gthumb/gth-main-default-metadata.c:33 msgid "General" msgstr "Generale" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:10 msgid "Go to last _visited location" msgstr "Andare all'ultima posizione _visitata" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:11 msgid "Go to this _folder:" -msgstr "Andare a _questa cartella:" - -#: ../data/ui/preferences.ui.h:19 ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Solo icone" - -#: ../data/ui/preferences.ui.h:20 ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Mantenere l'ingrandimento precedente" - -#: ../data/ui/preferences.ui.h:21 -#: ../extensions/file_tools/gth-file-tool-crop.c:399 -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:422 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:278 -msgid "None" -msgstr "Nessuna" +msgstr "Andare a questa car_tella:" -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:12 msgid "On startup:" msgstr "All'avvio:" -#: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:190 +#: ../data/ui/preferences.ui.h:13 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 msgid "Other" msgstr "Altro" -#: ../data/ui/preferences.ui.h:24 -msgid "Set image to actual size" -msgstr "Porre l'immagine a grandezza reale" - -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:14 msgid "Set to C_urrent" -msgstr "Imposta a _quella attuale" - -#. Set widgets data. -#: ../data/ui/preferences.ui.h:26 ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Impostazioni di sistema" +msgstr "Imposta a quella at_tuale" -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:15 msgid "T_humbnails in viewer:" msgstr "_Miniature nel visualizzatore:" -#: ../data/ui/preferences.ui.h:28 ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Testo sotto le icone" - -#: ../data/ui/preferences.ui.h:29 ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Testo accanto alle icone" - -#: ../data/ui/preferences.ui.h:30 ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Solo testo" - -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:16 msgid "Thumbnail _size:" msgstr "_Dimensione miniature:" -#: ../data/ui/preferences.ui.h:32 ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Bianco" +#: ../data/ui/preferences.ui.h:17 +msgid "_Reuse the active window to open files" +msgstr "_Riutilizzare la finestra attiva per aprire i file" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:18 msgid "_Store metadata inside files if possible" -msgstr "_Memorizza i metadati nei file se possibile" +msgstr "_Memorizzare i metadati nei file se possibile" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:19 msgid "_Toolbar style:" msgstr "Stile della barra degli _strumenti:" -#: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "Preferenze di gthumb" - -#: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "in basso" - -#: ../data/ui/preferences.ui.h:37 -msgid "on the side" -msgstr "a fianco" +#: ../data/ui/preferences.ui.h:20 +msgid "below the folder list" +msgstr "sotto l'elenco cartelle" + +#: ../data/ui/preferences.ui.h:21 +msgid "gThumb Preferences" +msgstr "Preferenze di gThumb" + +#: ../data/ui/preferences.ui.h:22 +msgid "on the right" +msgstr "sulla destra" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" @@ -436,13 +401,29 @@ msgstr "Ordine _inverso" #: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 msgid "_Sort by:" msgstr "_Ordina per:" +#: ../extensions/23hq/23hq.extension.in.in.h:1 +msgid "23" +msgstr "23" + +#: ../extensions/23hq/23hq.extension.in.in.h:2 +msgid "Upload images to 23hq.com" +msgstr "Carica le immagini su 23hq.com" + +#: ../extensions/23hq/callbacks.c:68 +msgid "_23..." +msgstr "_23..." + +#: ../extensions/23hq/callbacks.c:69 +msgid "Upload photos to 23" +msgstr "Carica le foto su 23" + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 msgid "Add bookmarks support." -msgstr "Aggiunge il supporto per i segnalibri" +msgstr "Aggiunge il supporto per i segnalibri." #: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 @@ -454,12 +435,14 @@ #: ../extensions/catalogs/catalogs.extension.in.in.h:3 #: ../extensions/change_date/change_date.extension.in.in.h:3 #: ../extensions/comments/comments.extension.in.in.h:3 +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:3 #: ../extensions/convert_format/convert_format.extension.in.in.h:3 #: ../extensions/desktop_background/desktop_background.extension.in.in.h:3 #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:3 #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:3 #: ../extensions/file_manager/file_manager.extension.in.in.h:3 #: ../extensions/file_tools/file_tools.extension.in.in.h:3 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:3 #: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:3 #: ../extensions/image_print/image_print.extension.in.in.h:3 #: ../extensions/image_rotation/image_rotation.extension.in.in.h:3 @@ -475,35 +458,35 @@ #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" -msgstr "Squadra di sviluppo di gthumb" +msgstr "Sviluppatori di gThumb" -#: ../extensions/bookmarks/callbacks.c:52 +#: ../extensions/bookmarks/callbacks.c:54 msgid "_Bookmarks" -msgstr "_Segnalibri" +msgstr "Se_gnalibri" -#: ../extensions/bookmarks/callbacks.c:53 +#: ../extensions/bookmarks/callbacks.c:55 msgid "_System Bookmarks" -msgstr "_Segnalibri di sistema" +msgstr "Segnalibri di _sistema" -#: ../extensions/bookmarks/callbacks.c:56 +#: ../extensions/bookmarks/callbacks.c:58 msgid "_Add Bookmark" msgstr "_Aggiungi segnalibro" -#: ../extensions/bookmarks/callbacks.c:57 +#: ../extensions/bookmarks/callbacks.c:59 msgid "Add current location to bookmarks" msgstr "Aggiunge la posizione corrente ai segnalibri" -#: ../extensions/bookmarks/callbacks.c:61 +#: ../extensions/bookmarks/callbacks.c:63 msgid "_Edit Bookmarks..." msgstr "_Modifica segnalibri..." -#: ../extensions/bookmarks/callbacks.c:62 +#: ../extensions/bookmarks/callbacks.c:64 msgid "Edit bookmarks" -msgstr "Modifica segnalibri" +msgstr "Modifica i segnalibri" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:2 msgid "_Bookmarks:" -msgstr "_Segnalibri:" +msgstr "Se_gnalibri:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 msgid "_Location" @@ -531,7 +514,7 @@ #: ../extensions/burn_disc/callbacks.c:56 msgid "Write files to an optical disc" -msgstr "Scrivi i file su un disco ottico" +msgstr "Scrive i file su un disco ottico" #: ../extensions/burn_disc/data/ui/burn-disc-options.ui.h:1 msgid "Disc Name" @@ -539,11 +522,11 @@ #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:1 msgid "Current _folder" -msgstr "_Cartella corrente" +msgstr "_Cartella attuale" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:2 msgid "Current folder and its s_ub-folders" -msgstr "Cartella corrente e sue _sottocartelle" +msgstr "Attuale cartella e sue s_ottocartelle" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 msgid "Source" @@ -555,140 +538,161 @@ #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Scrivi sul disco" -#: ../extensions/catalogs/actions.c:62 -msgid "Could not remove the files from the catalog" -msgstr "Impossibile rimuovere i file dal catalogo" +#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#, c-format +msgid "Error interpreting JPEG image file: %s" +msgstr "Errore di interpretazione del file immagine JPEG: %s" -#: ../extensions/catalogs/actions.c:120 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:633 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:642 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:670 -#: ../extensions/search/gth-search.c:295 -msgid "Invalid file format" -msgstr "Formato di file invalido" +#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#, c-format +msgid "Unknown JPEG color space (%d)" +msgstr "Spazio di colore JPEG sconosciuto (%d)" + +#: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 +#: ../extensions/catalogs/dlg-add-to-catalog.c:274 +#: ../extensions/catalogs/dlg-add-to-catalog.c:394 +#: ../extensions/file_manager/actions.c:65 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 +#, c-format +msgid "No name specified" +msgstr "Nessun nome specificato" -#: ../extensions/catalogs/actions.c:189 -#: ../extensions/catalogs/dlg-add-to-catalog.c:265 -msgid "Enter the catalog name: " -msgstr "Inserisci il nome del catalogo: " - -#: ../extensions/catalogs/actions.c:193 ../extensions/catalogs/actions.c:259 -#: ../extensions/catalogs/dlg-add-to-catalog.c:269 -#: ../extensions/catalogs/dlg-add-to-catalog.c:335 -#: ../extensions/file_manager/actions.c:45 +#: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 +#: ../extensions/catalogs/dlg-add-to-catalog.c:281 +#: ../extensions/catalogs/dlg-add-to-catalog.c:401 +#: ../extensions/file_manager/actions.c:72 +#, c-format +msgid "Invalid name. The following characters are not allowed: %s" +msgstr "Nome non valido. I seguenti caratteri non sono consentiti: %s" + +#: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 +#: ../extensions/catalogs/dlg-add-to-catalog.c:338 +#: ../extensions/catalogs/dlg-add-to-catalog.c:448 +#: ../extensions/catalogs/gth-file-source-catalogs.c:503 +#: ../extensions/file_manager/actions.c:103 +msgid "Name already used" +msgstr "Nome già in uso" + +#: ../extensions/catalogs/actions.c:178 +#: ../extensions/catalogs/dlg-add-to-catalog.c:359 +msgid "New catalog" +msgstr "Nuovo catalogo" + +#: ../extensions/catalogs/actions.c:179 +#: ../extensions/catalogs/dlg-add-to-catalog.c:360 +msgid "Enter the catalog name:" +msgstr "Immettere il nome del catalogo:" + +#: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 +#: ../extensions/catalogs/dlg-add-to-catalog.c:362 +#: ../extensions/catalogs/dlg-add-to-catalog.c:474 +#: ../extensions/file_manager/actions.c:133 msgid "C_reate" msgstr "C_rea" -#: ../extensions/catalogs/actions.c:233 -#: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/catalogs/dlg-add-to-catalog.c:310 -#: ../extensions/search/gth-search-task.c:332 -msgid "Could not create the catalog" -msgstr "Impossibile creare il catalogo" - -#: ../extensions/catalogs/actions.c:255 -#: ../extensions/catalogs/dlg-add-to-catalog.c:331 -msgid "Enter the library name: " -msgstr "Inserisci il nome della raccolta: " - -#: ../extensions/catalogs/actions.c:299 -#: ../extensions/catalogs/dlg-add-to-catalog.c:375 -msgid "Could not create the library" -msgstr "Impossibile creare la raccolta" +#: ../extensions/catalogs/actions.c:290 +#: ../extensions/catalogs/dlg-add-to-catalog.c:471 +msgid "New library" +msgstr "Nuova raccolta" + +#: ../extensions/catalogs/actions.c:291 +#: ../extensions/catalogs/dlg-add-to-catalog.c:472 +msgid "Enter the library name:" +msgstr "Immettere il nome della raccolta:" -#: ../extensions/catalogs/actions.c:331 +#: ../extensions/catalogs/actions.c:326 msgid "Could not remove the catalog" msgstr "Impossibile rimuovere il catalogo" -#: ../extensions/catalogs/actions.c:365 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" -msgstr "Sicuro di voler rimuovere «%s»?" +msgstr "Si è sicuri di rimuovere «%s»?" -#: ../extensions/catalogs/callbacks.c:98 +#: ../extensions/catalogs/callbacks.c:102 msgid "_Add to Catalog" -msgstr "_Aggiungi al Catalogo" +msgstr "_Aggiungi al catalogo" -#: ../extensions/catalogs/callbacks.c:101 +#: ../extensions/catalogs/callbacks.c:105 msgid "Open _Folder" -msgstr "Apri la _cartella" +msgstr "Apri car_tella" -#: ../extensions/catalogs/callbacks.c:102 +#: ../extensions/catalogs/callbacks.c:106 msgid "Go to the folder that contains the selected file" -msgstr "Vai alla cartella che contiene il file selezionato" +msgstr "Va alla cartella che contiene il file selezionato" -#: ../extensions/catalogs/callbacks.c:106 -#: ../extensions/edit_metadata/callbacks.c:106 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:87 +#: ../extensions/catalogs/callbacks.c:110 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Altro..." -#: ../extensions/catalogs/callbacks.c:107 +#: ../extensions/catalogs/callbacks.c:111 msgid "Choose another catalog" msgstr "Scegli un altro catalogo" -#: ../extensions/catalogs/callbacks.c:111 +#: ../extensions/catalogs/callbacks.c:115 msgid "_Add to Catalog..." -msgstr "_Aggiungi al catalogo..." +msgstr "A_ggiungi al catalogo..." -#: ../extensions/catalogs/callbacks.c:112 +#: ../extensions/catalogs/callbacks.c:116 msgid "Add selected images to a catalog" msgstr "Aggiunge le immagini selezionate a un catalogo" -#: ../extensions/catalogs/callbacks.c:116 +#: ../extensions/catalogs/callbacks.c:120 msgid "Remo_ve from Catalog" msgstr "Rimuo_vi dal catalogo" -#: ../extensions/catalogs/callbacks.c:117 +#: ../extensions/catalogs/callbacks.c:121 msgid "Remove selected images from the catalog" msgstr "Rimuove le immagini selezionate dal catalogo" -#: ../extensions/catalogs/callbacks.c:121 +#: ../extensions/catalogs/callbacks.c:125 msgid "Create _Catalog" -msgstr "Crea un _catalogo" +msgstr "Crea _catalogo" -#: ../extensions/catalogs/callbacks.c:126 +#: ../extensions/catalogs/callbacks.c:130 msgid "Create _Library" -msgstr "Crea una _raccolta" +msgstr "Crea _raccolta" -#: ../extensions/catalogs/callbacks.c:136 +#: ../extensions/catalogs/callbacks.c:140 msgid "Rena_me" msgstr "Rino_mina" -#: ../extensions/catalogs/callbacks.c:263 -#: ../extensions/catalogs/callbacks.c:266 +#: ../extensions/catalogs/callbacks.c:279 +#: ../extensions/catalogs/callbacks.c:282 msgid "Command Line" msgstr "Riga di comando" -#: ../extensions/catalogs/callbacks.c:481 -#: ../extensions/catalogs/callbacks.c:486 -#: ../extensions/photo_importer/dlg-photo-importer.c:313 -#: ../extensions/photo_importer/dlg-photo-importer.c:353 -#: ../gthumb/gth-file-list.c:44 ../gthumb/gth-folder-tree.c:874 +#: ../extensions/catalogs/callbacks.c:497 +#: ../extensions/catalogs/callbacks.c:502 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(Vuoto)" -#: ../extensions/catalogs/callbacks.c:679 +#: ../extensions/catalogs/callbacks.c:697 msgid "Catalog Properties" msgstr "Proprietà del catalogo" -#: ../extensions/catalogs/callbacks.c:693 +#: ../extensions/catalogs/callbacks.c:711 msgid "Organize" msgstr "Organizza" -#: ../extensions/catalogs/callbacks.c:694 +#: ../extensions/catalogs/callbacks.c:712 msgid "Automatically organize files by date" msgstr "Organizza automaticamente i file per data" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:660 +#: ../extensions/catalogs/gth-catalog.c:1017 +#: ../extensions/catalogs/gth-catalog.c:1018 msgid "Catalogs" msgstr "Cataloghi" @@ -710,19 +714,20 @@ #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" -msgstr "Nuovo _catalogo" +msgstr "_Nuovo catalogo" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/webalbums/gth-web-exporter.c:1833 +#: ../extensions/file_manager/actions.c:929 +#: ../extensions/webalbums/gth-web-exporter.c:1842 msgid "_View the destination" -msgstr "_Mostra la destinazione" +msgstr "_Visualizzare la destinazione" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 msgid "Catalog" msgstr "Catalogo" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:199 +#: ../gthumb/gth-file-properties.c:212 msgid "Properties" msgstr "Proprietà" @@ -732,9 +737,10 @@ msgstr "_Data:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:36 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "_Name:" @@ -742,7 +748,7 @@ #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 msgid "Catalog _Preview:" -msgstr "_Anteprima del Catalogo" +msgstr "Ante_prima del catalogo" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organization:" @@ -751,22 +757,22 @@ #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 #: ../extensions/catalogs/data/ui/organize-files.ui.h:4 msgid "Organize Files" -msgstr "Organizza i file" +msgstr "Organizza file" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Organizing files" -msgstr "Organizzazione dei file in corso" +msgstr "Organizzazione dei file" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select All" -msgstr "Seleziona Tutto" +msgstr "Seleziona tutto" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 msgid "Select None" -msgstr "Annulla selezione" +msgstr "Nessuna selezione" #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:451 +#: ../extensions/edit_metadata/gth-edit-general-page.c:480 #: ../gthumb/gth-main-default-tests.c:264 msgid "Date photo was taken" msgstr "Data di scatto della foto" @@ -778,18 +784,18 @@ #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 msgid "Ignore catalogs with a single file" -msgstr "Ignorare i catalochi con un solo file" +msgstr "Ignorare i cataloghi con un solo file" #: ../extensions/catalogs/data/ui/organize-files.ui.h:5 msgid "Put single files in the catalog:" -msgstr "Poni i file singoli nel catalogo:" +msgstr "Mettere i file singoli nel catalogo:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Singles" msgstr "Singoli" #: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:225 +#: ../extensions/comments/main.c:280 msgid "Tag" msgstr "Etichetta" @@ -800,12 +806,13 @@ #: ../extensions/catalogs/data/ui/organize-files.ui.h:9 msgid "_Group files by:" -msgstr "Rag_gruppa i file per:" +msgstr "Rag_gruppare i file per:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" -msgstr "Includi le _sottocartelle" +msgstr "Includere le _sottocartelle" #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 msgid "tag" @@ -816,29 +823,73 @@ msgid "Could not add the files to the catalog" msgstr "Impossibile aggiungere i file al catalogo" +#: ../extensions/catalogs/dlg-add-to-catalog.c:217 +#: ../extensions/search/gth-search-task.c:356 +msgid "Could not create the catalog" +msgstr "Impossibile creare il catalogo" + #: ../extensions/catalogs/dlg-catalog-properties.c:80 msgid "Could not save the catalog" msgstr "Impossibile salvare il catalogo" -#: ../extensions/catalogs/dlg-catalog-properties.c:166 +#: ../extensions/catalogs/dlg-catalog-properties.c:159 msgid "Could not load the catalog" msgstr "Impossibile caricare il catalogo" #: ../extensions/catalogs/dlg-organize-files.c:120 msgid "Files will be organized in catalogs. No file will be moved on disk." msgstr "" -"I file saranno organizzati in cataloghi. I file sul disco non verranno " -"toccati." +"I file saranno organizzati in cataloghi. Nessun file sul disco sarà spostato." -#: ../extensions/catalogs/gth-catalog.c:1145 +#: ../extensions/catalogs/gth-catalog.c:1115 ../extensions/comments/main.c:43 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Etichette" -#: ../extensions/catalogs/gth-file-source-catalogs.c:790 +#: ../extensions/catalogs/gth-file-source-catalogs.c:948 +#, c-format +msgid "The catalog '%s' already exists, do you want to overwrite it?" +msgstr "Il catalogo «%s» esiste già, sovrascriverlo?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:950 +#, c-format +msgid "The library '%s' already exists, do you want to overwrite it?" +msgstr "La raccolta «%s» esiste già, sovrascriverla?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:958 +msgid "Over_write" +msgstr "Sovra_scrivi" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1076 +msgid "Cannot move the files" +msgstr "Impossibile spostare i file" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1078 +msgid "Cannot copy the files" +msgstr "Impossibile copiare i file" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 +msgid "Invalid destination." +msgstr "Destinazione non valida." + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1130 #, c-format msgid "Copying files to '%s'" -msgstr "Copia dei file in '%s'" +msgstr "Copia dei file in «%s»" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1383 +msgid "Could not remove the files from the catalog" +msgstr "Non è possibile rimuovere i file dal catalogo" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1441 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:681 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:690 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:719 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1224 +#: ../extensions/search/gth-search.c:265 +msgid "Invalid file format" +msgstr "Formato di file non valido" #: ../extensions/catalogs/gth-organize-task.c:202 #, c-format @@ -862,95 +913,452 @@ msgstr "Cambia la data dei file" #: ../extensions/change_date/data/ui/change-date.ui.h:1 -msgid "A_djust by" -msgstr "A_ggiusta di" +msgid "+" +msgstr "+" #: ../extensions/change_date/data/ui/change-date.ui.h:2 +msgid "-" +msgstr "-" + +#: ../extensions/change_date/data/ui/change-date.ui.h:3 +msgid "A_djust by" +msgstr "_Regola di" + +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change Date" msgstr "Cambia data" -#: ../extensions/change_date/data/ui/change-date.ui.h:3 +#: ../extensions/change_date/data/ui/change-date.ui.h:5 msgid "Change the following values:" msgstr "Cambia i seguenti valori:" -#: ../extensions/change_date/data/ui/change-date.ui.h:4 +#: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Change to:" msgstr "Cambia in:" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 +#: ../extensions/change_date/data/ui/change-date.ui.h:7 msgid "Co_mment date" msgstr "Data co_mmento" -#: ../extensions/change_date/data/ui/change-date.ui.h:6 +#: ../extensions/change_date/data/ui/change-date.ui.h:8 msgid "Date p_hoto was taken" -msgstr "Data di _scatto della foto" +msgstr "Data di scatto della _foto" -#: ../extensions/change_date/data/ui/change-date.ui.h:7 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "Exif DateTimeOriginal tag" msgstr "Etichetta Exif DateTimeOriginal" -#: ../extensions/change_date/data/ui/change-date.ui.h:8 +#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "Data di _modifica del file" -#: ../extensions/change_date/data/ui/change-date.ui.h:9 +#: ../extensions/change_date/data/ui/change-date.ui.h:11 msgid "File c_reation date" msgstr "Data di c_reazione del file" -#: ../extensions/change_date/data/ui/change-date.ui.h:10 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "The _following date:" -msgstr "La data se_guente:" +msgstr "La data _seguente:" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "_Last modified date" msgstr "Data dell'u_ltima modifica" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 msgid "hours" msgstr "ore" +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +msgid "minutes" +msgstr "minuti" + +#: ../extensions/change_date/data/ui/change-date.ui.h:16 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "seconds" +msgstr "secondi" + #: ../extensions/comments/comments.extension.in.in.h:1 msgid "Add comments and tags to any file type." -msgstr "Aggiungi commenti ed etichette a qualsiasi tipo di file." +msgstr "Aggiunge commenti ed etichette a qualsiasi tipo di file." #: ../extensions/comments/comments.extension.in.in.h:2 msgid "Comments and tags" msgstr "Commenti ed etichette" #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Preferenze" #: ../extensions/comments/data/ui/comments-preferences.ui.h:2 msgid "_Synchronize with the embedded metadata" -msgstr "_Sincronizza con i metadati incorporati" +msgstr "_Sincronizzare con i metadati incorporati" #: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:101 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Commento" -#: ../extensions/comments/main.c:209 +#: ../extensions/comments/main.c:39 ../gthumb/gth-main-default-metadata.c:46 +msgid "Title" +msgstr "Titolo" + +#: ../extensions/comments/main.c:40 ../extensions/comments/main.c:264 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:8 #: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:16 #: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Descrizione" -#: ../extensions/comments/main.c:217 ../gthumb/gth-main-default-metadata.c:50 +#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:272 +#: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Luogo" +#: ../extensions/comments/main.c:42 ../gthumb/gth-main-default-metadata.c:51 +msgid "Date" +msgstr "Data" + +#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:54 +msgid "Rating" +msgstr "Giudizio" + +#: ../extensions/contact_sheet/callbacks.c:59 +msgid "Contact _Sheet" +msgstr "_Biglietto da visita" + +#: ../extensions/contact_sheet/callbacks.c:61 +msgid "Contact _Sheet..." +msgstr "_Biglietto da visita..." + +#: ../extensions/contact_sheet/callbacks.c:62 +msgid "Create a contact sheet" +msgstr "Crea un biglietto da visita" + +#: ../extensions/contact_sheet/callbacks.c:65 +msgid "Image _Wall..." +msgstr "Parete da esposi_zione..." + +#: ../extensions/contact_sheet/callbacks.c:66 +msgid "Create an image-wall" +msgstr "Crea una parete da esposizione" + +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +msgid "Contact Sheet" +msgstr "Biglietto da visita" + +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 +msgid "Create an index image displaying the thumbnails of the selected files." +msgstr "" +"Crea un'immagine indice per mostrare le miniature dei file selezionati." + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 +msgid "Background" +msgstr "Sfondo" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 +msgid "C_olor:" +msgstr "C_olore:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Didascalia:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 +msgid "Frame" +msgstr "Fotogramma" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 +msgid "Inward Shadow" +msgstr "Ombra interna" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-crop.c:454 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Nessuna" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 +msgid "Outward Shadow" +msgstr "Ombra esterna" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +msgid "Select a color" +msgstr "Seleziona un colore" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 +msgid "Select a font" +msgstr "Seleziona un carattere" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 +msgid "Shadow only" +msgstr "Solo ombra" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 +msgid "Simple" +msgstr "Semplice" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +msgid "Simple with shadow" +msgstr "Semplice con ombra" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +msgid "Slide" +msgstr "Diapositiva" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Testo" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "_Footer:" +msgstr "Piè _di pagina:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 +msgid "_Gradient" +msgstr "_Gradiente" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "_Header:" +msgstr "Int_estazione:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +msgid "_Horizontal:" +msgstr "_Orizzontale:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 +msgid "_Solid color" +msgstr "Tinta _unita" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 +msgid "_Style:" +msgstr "_Stile:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 +msgid "_Vertical:" +msgstr "_Verticale:" + +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ formato }" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 +msgid "All images on a single page" +msgstr "Tutte le immagini in una singola pagina" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:6 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:10 +msgid "Choose destination folder" +msgstr "Scegli la cartella di destinazione" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 +msgid "Columns:" +msgstr "Colonne:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 +msgid "Create _HTML image map" +msgstr "Creare mappa _HTML dell'immagine" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +msgid "Create a new theme" +msgstr "Crea un nuovo tema" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +msgid "Delete the selected theme" +msgstr "Elimina il tema selezionato" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 +msgid "Edit the selected theme" +msgstr "Modifica il tema selezionato" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +msgid "File_name:" +msgstr "_Nome del file:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 +msgid "Images per page:" +msgstr "Immagini per pagina:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +msgid "Layout" +msgstr "Disposizione" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 +msgid "New enumerator digit" +msgstr "Nuova cifra per la numerazione" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Re_verse order" +msgstr "Ordine in_verso" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "S_ort:" +msgstr "_Ordina:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/pixbuf_savers/preferences.c:134 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "Saving" +msgstr "Salvataggio" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:20 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +msgid "Special code" +msgstr "Codice speciale" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 +msgid "Sq_uared" +msgstr "Q_uadrato" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "The current date" +msgstr "La data attuale" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "The current page number" +msgstr "Il numero di pagina attuale" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 +msgid "The total number of pages" +msgstr "Il numero totale delle pagine" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Theme" +msgstr "Tema" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +msgid "Thumbnails" +msgstr "Miniature" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 +msgid "_All pages with the same size" +msgstr "_Tutte le pagine con la stessa dimensione" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "_Destination:" +msgstr "_Destinazione:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 +msgid "_Size:" +msgstr "Dimen_sione:" + +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +msgid "Image Wall" +msgstr "Parete da esposizione" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +msgid "Could not save the theme" +msgstr "Impossibile salvare il tema" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +msgid "Could not delete the theme" +msgstr "Impossibile eliminare il tema" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +msgid "Creating images" +msgstr "Creazione delle immagini" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +msgid "Generating thumbnails" +msgstr "Generazione delle miniature" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:32 +msgid "Header" +msgstr "Intestazione" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:33 +msgid "Footer" +msgstr "Piè di pagina" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 +msgid "Theme Properties" +msgstr "Proprietà del tema" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 +msgid "Copy _From" +msgstr "Copia _da" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 +msgid "New theme" +msgstr "Nuovo tema" + #: ../extensions/convert_format/callbacks.c:45 msgid "Convert Format..." msgstr "Converti formato..." #: ../extensions/convert_format/callbacks.c:46 msgid "Convert image format" -msgstr "Converti il formato dell'immagine" +msgstr "Converte il formato dell'immagine" #: ../extensions/convert_format/convert_format.extension.in.in.h:1 msgid "Convert format" @@ -960,12 +1368,6 @@ msgid "Save images in a different format" msgstr "Salva le immagini in un formato diverso" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Choose destination folder" -msgstr "Scegliere la cartella di destinazione" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:2 msgid "Convert Format" msgstr "Converti formato" @@ -979,16 +1381,21 @@ msgid "New format" msgstr "Nuovo formato" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:5 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +msgid "_Use the original image folder" +msgstr "_Usare la cartella originaria dell'immagine" + +#: ../extensions/convert_format/dlg-convert-format.c:93 msgid "Converting images" msgstr "Conversione delle immagini" -#: ../extensions/desktop_background/actions.c:139 +#: ../extensions/desktop_background/actions.c:162 msgid "Could not show the desktop background properties" msgstr "Impossibile mostrare le proprietà dello sfondo del desktop" -#: ../extensions/desktop_background/actions.c:203 -#: ../extensions/desktop_background/actions.c:221 +#: ../extensions/desktop_background/actions.c:228 +#: ../extensions/desktop_background/actions.c:246 msgid "Could not set the desktop background" msgstr "Impossibile impostare lo sfondo del desktop" @@ -1005,17 +1412,35 @@ msgid "Desktop background" msgstr "Sfondo del desktop" -#: ../extensions/edit_metadata/callbacks.c:98 +#: ../extensions/edit_metadata/actions.c:66 +msgid "" +"Are you sure you want to permanently delete the metadata of the selected " +"files?" +msgstr "Eliminare definitivamente i metadati dei file selezionati?" + +#: ../extensions/edit_metadata/actions.c:73 +msgid "If you delete the metadata, it will be permanently lost." +msgstr "Se si eliminano i metadati, questi saranno persi definitivamente." + +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "_Etichette" -#: ../extensions/edit_metadata/callbacks.c:102 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" msgstr "Modifica il commento e altre informazioni dei file selezionati" #: ../extensions/edit_metadata/callbacks.c:107 -msgid "Choose another tag" -msgstr "Scegli un'altra etichettta" +msgid "Set the tags of the selected files" +msgstr "Imposta le etichette dei file selezionati" + +#: ../extensions/edit_metadata/callbacks.c:112 +msgid "Delete Metadata" +msgstr "Elimina metadati" + +#: ../extensions/edit_metadata/callbacks.c:113 +msgid "Delete the comment and the embedded metadata of the selected files" +msgstr "Elimina il commento e i metadati incorporati nei file selezionati" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 @@ -1030,95 +1455,102 @@ #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 msgid "_Place:" -msgstr "_Posto:" +msgstr "_Luogo:" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" -msgstr "_Gradimento:" +msgstr "_Giudizio:" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:6 msgid "_Title:" msgstr "_Titolo:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:56 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "Impossibile salvare i metadati del file" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:109 -#: ../extensions/rename_series/actions.c:37 -#: ../gthumb/gth-overwrite-dialog.c:162 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "Impossibile leggere le informazioni del file" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 msgid "Allow to edit files metadata." -msgstr "Permette di modificare i metadati del file." +msgstr "Consente di modificare i metadati del file." #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Edit metadata" msgstr "Modifica i metadati" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:448 +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "Metadati di %s" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:97 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d file" +msgstr[1] "%d file" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:263 +msgid "Sa_ve and Close" +msgstr "Sal_va e chiudi" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Salvare solo i campi _modificati" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:477 msgid "No date" msgstr "Nessuna data" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:449 +#: ../extensions/edit_metadata/gth-edit-general-page.c:478 msgid "The following date" msgstr "La data seguente" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:450 -#: ../extensions/importer/gth-import-preferences-dialog.c:328 +#: ../extensions/edit_metadata/gth-edit-general-page.c:479 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Data attuale" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:452 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 msgid "Last modified date" msgstr "Data dell'ultima modifica" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:453 +#: ../extensions/edit_metadata/gth-edit-general-page.c:482 msgid "File creation date" msgstr "Data di creazione del file" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:454 +#: ../extensions/edit_metadata/gth-edit-general-page.c:483 msgid "Do not modify" msgstr "Non modificare" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:106 -msgid "Save only cha_nged fields" -msgstr "Salva solo i campi _modificati" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:162 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:94 #, c-format -msgid "%s Metadata" -msgstr "Metadati di «%s»" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:166 -#: ../extensions/flicker/dlg-import-from-flickr.c:331 -#, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d file " -msgstr[1] "%d file" +msgid "%s Tags" +msgstr "Etichette %s" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Nuova etichetta" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:255 msgid "Assign Tags" msgstr "Assegna le etichette" -#: ../extensions/edit_metadata/gth-tag-task.c:113 -#: ../extensions/edit_metadata/gth-tag-task.c:130 +#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:132 msgid "Assigning tags to the selected files" -msgstr "Assegnazione delle etichette ai file selezionati" +msgstr "Assegna le etichette ai file selezionati" -#: ../extensions/edit_metadata/gth-tag-task.c:113 +#: ../extensions/edit_metadata/gth-tag-task.c:115 msgid "Writing files" msgstr "Scrittura dei file" -#: ../extensions/edit_metadata/gth-tag-task.c:130 +#: ../extensions/edit_metadata/gth-tag-task.c:132 msgid "Reading files" msgstr "Lettura dei file" @@ -1132,7 +1564,7 @@ #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 msgid "Byline _Title:" -msgstr "_Titolo del firmante" +msgstr "_Titolo dell'autore:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" @@ -1144,43 +1576,38 @@ #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" -msgstr "_Ringraziamenti:" +msgstr "Ringraziam_enti:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "_Byline:" -msgstr "_Firma:" +msgid "State/Province:" +msgstr "Stato/Provincia:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_City:" -msgstr "Città:" +msgid "_Byline:" +msgstr "_Firma:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_Code:" -msgstr "Codice:" +msgid "_City:" +msgstr "_Città:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:41 -msgid "_Destination:" -msgstr "_Destinazione:" +msgid "_Code:" +msgstr "_Codice:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 msgid "_Language:" msgstr "_Lingua:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 msgid "_Object Name:" msgstr "Nome dell'_oggetto:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 msgid "_Source:" -msgstr "_Sorgente:" +msgstr "_Fonte:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 msgid "_Urgency:" msgstr "_Urgenza:" @@ -1190,11 +1617,12 @@ #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:2 msgid "Read and write exif, iptc and xmp metadata." -msgstr "Leggi e scrivi i metadati exif, iptc and xmp" +msgstr "Legge e scrive i metadati exif, iptc e xmp." +# Generale Exif mi sapeva tanto di esercito... #: ../extensions/exiv2_tools/main.c:33 msgid "Exif General" -msgstr "Exif Generale" +msgstr "Sommario Exif" #: ../extensions/exiv2_tools/main.c:34 msgid "Exif Conditions" @@ -1214,7 +1642,7 @@ #: ../extensions/exiv2_tools/main.c:38 msgid "Exif Maker Notes" -msgstr "Note del costruttore Exif" +msgstr "Annotazioni Exif" #: ../extensions/exiv2_tools/main.c:39 msgid "Exif Versions" @@ -1222,7 +1650,7 @@ #: ../extensions/exiv2_tools/main.c:40 msgid "Exif Other" -msgstr "Exif Altro" +msgstr "Altre Exif" #: ../extensions/exiv2_tools/main.c:41 msgid "IPTC" @@ -1230,19 +1658,19 @@ #: ../extensions/exiv2_tools/main.c:42 msgid "XMP Embedded" -msgstr "XMP Incorporato" +msgstr "Incorporato XMP" #: ../extensions/exiv2_tools/main.c:43 msgid "XMP Attached" -msgstr "XMP Allegato" +msgstr "Allegato XMP" -#: ../extensions/exiv2_tools/main.c:245 +#: ../extensions/exiv2_tools/main.c:256 msgid "date photo was taken" msgstr "data di scatto della foto" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" -msgstr "Condividi" +msgstr "Condivisione" #: ../extensions/facebook/callbacks.c:54 msgid "Face_book..." @@ -1253,44 +1681,73 @@ msgstr "Carica le foto su Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 +msgid "1024 x 1024" +msgstr "1024 × 1024" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 +msgid "1280 x 1280" +msgstr "1280 × 1280" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 +msgid "1600 x 1600" +msgstr "1600 × 1600" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +msgid "2048 x 2048" +msgstr "2048 × 2048" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 +msgid "720 x 720" +msgstr "720 × 720" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 msgid "A_lbum:" msgstr "A_lbum:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 msgid "Add a new album" -msgstr "Aggiungi un nuovo album" +msgstr "Aggiunge un nuovo album" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "Edit accounts" msgstr "Modifica gli account" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Export to Flickr" msgstr "Esporta su Flickr" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:13 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 +msgid "Resize the images if larger than this size" +msgstr "Ridimensiona le immagini se più grandi di queste dimensioni" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "_Account:" msgstr "_Account:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:16 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +msgid "_Resize to:" +msgstr "_Ridimensiona a:" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Upload" msgstr "_Carica" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 @@ -1299,7 +1756,7 @@ msgstr "A_ccount:" #: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-account-manager.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 #: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 #: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 msgid "A_ccounts:" @@ -1311,12 +1768,12 @@ msgstr "Privato" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 msgid "Private photos, visible to friends" msgstr "Foto private, visibili agli amici" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Foto pubbliche" @@ -1330,177 +1787,179 @@ msgstr "_Visibilità:" #: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-ask-authorization.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 msgid "_Authorize..." msgstr "_Autorizza..." #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-complete-authorization.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 msgid "C_ontinue" msgstr "C_ontinua" #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker/flickr-authentication.c:438 -#: ../extensions/oauth/oauth-authentication.c:450 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 msgid "Once you're done, click the 'Continue' button below." -msgstr "Una volta terminato, fare clic sul bottone 'Continua', in basso." +msgstr "Una volta terminato, fare clic sul bottone «Continua» in basso." #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-export-completed.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:1 msgid "Files successfully uploaded to the server." -msgstr "File correttamente caricati sul server." +msgstr "File caricati con successo sul server." #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:2 -#: ../extensions/flicker/data/ui/flicker-export-completed.ui.h:2 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1832 +#: ../extensions/webalbums/gth-web-exporter.c:1841 msgid "_Open in the Browser" -msgstr "_Apri nel Navigatore" +msgstr "_Apri nel navigatore" -#: ../extensions/facebook/dlg-export-to-facebook.c:121 -#: ../extensions/facebook/dlg-export-to-facebook.c:312 -#: ../extensions/facebook/facebook-authentication.c:219 -#: ../extensions/flicker/dlg-export-to-flickr.c:137 -#: ../extensions/flicker/dlg-export-to-flickr.c:395 -#: ../extensions/flicker/dlg-import-from-flickr.c:234 -#: ../extensions/flicker/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:374 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:421 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:363 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "Impossibile connettersi al server" -#: ../extensions/facebook/dlg-export-to-facebook.c:172 -#: ../extensions/flicker/dlg-export-to-flickr.c:242 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:181 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:191 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:182 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 msgid "Could not upload the files" msgstr "Impossibile caricare i file" -#: ../extensions/facebook/dlg-export-to-facebook.c:388 -#: ../extensions/flicker/dlg-export-to-flickr.c:186 -#: ../extensions/flicker/dlg-export-to-flickr.c:220 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:459 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:713 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 msgid "Could not create the album" msgstr "Impossibile creare l'album" -#: ../extensions/facebook/dlg-export-to-facebook.c:456 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:530 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:778 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 msgid "New Album" msgstr "Nuovo album" -#: ../extensions/facebook/dlg-export-to-facebook.c:535 -#: ../extensions/flicker/dlg-export-to-flickr.c:521 -#: ../extensions/image_print/gth-image-print-job.c:1542 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:610 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:997 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 +#: ../extensions/image_print/gth-image-print-job.c:1789 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 msgid "No valid file selected." -msgstr "Nessun file valido selezionato" +msgstr "Nessun file valido selezionato." -#: ../extensions/facebook/dlg-export-to-facebook.c:536 -#: ../extensions/flicker/dlg-export-to-flickr.c:522 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:611 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:998 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 msgid "Could not export the files" msgstr "Impossibile esportare i file" -#: ../extensions/facebook/dlg-export-to-facebook.c:543 -#: ../extensions/flicker/dlg-export-to-flickr.c:529 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:618 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1004 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:785 -#: ../gthumb/gth-browser.c:939 ../gthumb/gth-browser.c:940 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:255 +#: ../extensions/find_duplicates/gth-find-duplicates.c:347 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:995 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d file (%s)" msgstr[1] "%d file (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:565 -#: ../extensions/flicker/dlg-export-to-flickr.c:552 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:638 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 #, c-format msgid "Export to %s" msgstr "Esporta su %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:230 -#: ../extensions/flicker/flickr-account-chooser-dialog.c:230 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:230 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "Nuova autenticazione..." -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." -msgstr "Scegliere l'_account" +msgstr "Scegli _account..." -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker/flickr-authentication.c:437 -#: ../extensions/oauth/oauth-authentication.c:449 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 #, c-format msgid "" "Return to this window when you have finished the authorization process on %s" msgstr "" -"Ritorna a questa finestra quando hai finito il processo di autorizzazione su " -"%s" +"Ritornare a questa finestra quando è terminato il processo di autorizzazione " +"su %s" -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker/flickr-authentication.c:517 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" -msgstr "gthumb richiede l'autorizzazione per caricare le foto su %s" +msgstr "L'applicazione richiede l'autorizzazione per caricare le foto su %s" -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker/flickr-authentication.c:518 -#: ../extensions/oauth/oauth-authentication.c:530 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 #, c-format msgid "" "Click 'Authorize' to open your web browser and authorize gthumb to upload " "photos to %s. When you're finished, return to this window to complete the " "authorization." msgstr "" -"Fai clic su 'Autorizza' per aprire il navigatore e autorizzare gthumb a " -"caricare le foto su %s. Quando hai finito, ritorna a questa finestra per " -"completare l'autorizzazione." - -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker/flickr-authentication.c:618 -#: ../extensions/oauth/oauth-authentication.c:632 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:815 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:666 +"Fare clic su «Autorizza» per aprire il browser web e autorizzare " +"l'applicazione a caricare le foto su %s. Quando terminato, ritornare a " +"questa finestra per completare l'autorizzazione." + +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Scegli l'account" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker/flickr-authentication.c:727 -#: ../extensions/oauth/oauth-authentication.c:741 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:876 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:727 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Modifica gli account" -#: ../extensions/facebook/facebook-connection.c:294 -#: ../extensions/facebook/facebook-connection.c:452 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:291 -#: ../extensions/facebook/facebook-service.c:494 -#: ../extensions/flicker/flickr-connection.c:290 -#: ../extensions/flicker/flickr-connection.c:441 -#: ../extensions/flicker/flickr-service.c:220 -#: ../extensions/flicker/flickr-service.c:423 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:195 +#: ../extensions/flicker_utils/flickr-service.c:398 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -1508,17 +1967,17 @@ msgid "Unknown error" msgstr "Errore sconosciuto" -#: ../extensions/facebook/facebook-connection.c:329 -#: ../extensions/facebook/facebook-connection.c:478 -#: ../extensions/facebook/facebook-service.c:214 -#: ../extensions/facebook/facebook-service.c:316 -#: ../extensions/flicker/flickr-connection.c:316 -#: ../extensions/flicker/flickr-connection.c:467 -#: ../extensions/flicker/flickr-service.c:244 -#: ../extensions/oauth/oauth-connection.c:375 -#: ../extensions/oauth/oauth-connection.c:450 -#: ../extensions/oauth/oauth-connection.c:554 -#: ../extensions/picasaweb/google-connection.c:363 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" msgstr "Connessione al server" @@ -1530,216 +1989,224 @@ msgid "Upload images to Facebook" msgstr "Carica le immagini su Facebook" -#: ../extensions/facebook/facebook-service.c:214 -#: ../extensions/facebook/facebook-service.c:316 -#: ../extensions/flicker/flickr-service.c:244 -#: ../extensions/oauth/oauth-connection.c:375 -#: ../extensions/oauth/oauth-connection.c:450 -#: ../extensions/oauth/oauth-connection.c:554 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "Ricupero informazioni sull'account" -#: ../extensions/facebook/facebook-service.c:422 -#: ../extensions/flicker/flickr-service.c:348 -#: ../extensions/photobucket/photobucket-service.c:235 -#: ../extensions/picasaweb/picasa-web-service.c:237 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:209 msgid "Getting the album list" msgstr "Ricupero dell'elenco degli album" -#: ../extensions/facebook/facebook-service.c:551 -#: ../extensions/flicker/flickr-service.c:451 -#: ../extensions/flicker/flickr-service.c:571 -#: ../extensions/flicker/flickr-service.c:609 -#: ../extensions/photobucket/photobucket-service.c:344 -#: ../extensions/picasaweb/picasa-web-service.c:328 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:426 +#: ../extensions/flicker_utils/flickr-service.c:546 +#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:300 msgid "Creating the new album" msgstr "Creazione del nuovo album" -#: ../extensions/facebook/facebook-service.c:610 -#: ../extensions/flicker/flickr-service.c:659 -#: ../extensions/photobucket/photobucket-service.c:401 -#: ../extensions/picasaweb/picasa-web-service.c:385 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:357 #, c-format msgid "Could not upload '%s': %s" -msgstr "Impossibile caricare '%s': %s" +msgstr "Impossibile caricare «%s»: %s" #. Translators: %s is a filename -#. send the file -#. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:810 -#: ../extensions/flicker/flickr-service.c:837 -#: ../extensions/photobucket/photobucket-service.c:524 -#: ../extensions/picasaweb/picasa-web-service.c:520 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:412 #, c-format msgid "Uploading '%s'" -msgstr "Caricamento di '%s'" +msgstr "Caricamento di «%s»" #: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker/flickr-service.c:915 -#: ../extensions/photobucket/photobucket-service.c:605 -#: ../extensions/picasaweb/picasa-web-service.c:594 +#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:605 msgid "Uploading the files to the server" msgstr "Caricamento dei file sul server" -#: ../extensions/facebook/facebook-service.c:1002 -#: ../extensions/flicker/flickr-service.c:1031 -#: ../extensions/picasaweb/picasa-web-service.c:715 +#: ../extensions/facebook/facebook-service.c:1003 +#: ../extensions/flicker_utils/flickr-service.c:1077 +#: ../extensions/picasaweb/picasa-web-service.c:718 msgid "Getting the photo list" msgstr "Ricupero dell'elenco delle foto" -#: ../extensions/file_manager/actions.c:41 -msgid "Enter the folder name: " -msgstr "Inserisci il nome della cartella: " - -#: ../extensions/file_manager/actions.c:69 -msgid "Could not create the folder" -msgstr "Impossibile creare la cartella" - -#: ../extensions/file_manager/actions.c:328 -#: ../extensions/file_manager/callbacks.c:315 -#: ../extensions/file_manager/callbacks.c:719 +#: ../extensions/file_manager/actions.c:130 +msgid "New folder" +msgstr "Nuova cartella" + +#: ../extensions/file_manager/actions.c:131 +msgid "Enter the folder name:" +msgstr "Inserire il nome della cartella:" + +#: ../extensions/file_manager/actions.c:397 +#: ../extensions/file_manager/callbacks.c:380 +#: ../extensions/file_manager/callbacks.c:842 msgid "Could not move the files" msgstr "Impossibile spostare i file" -#: ../extensions/file_manager/actions.c:329 -#: ../extensions/file_manager/callbacks.c:316 -#: ../extensions/file_manager/callbacks.c:720 +#: ../extensions/file_manager/actions.c:398 +#: ../extensions/file_manager/callbacks.c:381 +#: ../extensions/file_manager/callbacks.c:843 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." msgstr "" -"I file non possono essere spostati nella posizione corrente, in alternativa " -"puoi scegliere di copiarli." - -#: ../extensions/file_manager/actions.c:421 -#: ../extensions/importer/gth-import-task.c:615 -msgid "Could not delete the files" -msgstr "Impossibile eliminare i file" +"I file non possono essere spostati nella posizione attuale, in alternativa " +"si può scegliere di copiarli." -#: ../extensions/file_manager/actions.c:464 -msgid "" -"The files cannot be moved to the Trash. Do you want to delete them " -"permanently?" -msgstr "" -"I file non possono essere spostati nel cestino. Eliminarli definitivamente ?" - -#: ../extensions/file_manager/actions.c:475 -msgid "Could not move the files to the Trash" -msgstr "Impossibile spostare i file nel cestino" - -#: ../extensions/file_manager/actions.c:524 -#, c-format -msgid "Are you sure you want to move \"%s\" to trash?" -msgstr "Sei sicuro di voler spostare «%s» nel cestino ?" - -#: ../extensions/file_manager/actions.c:527 -#, c-format -msgid "Are you sure you want to move to trash the %'d selected file?" -msgid_plural "Are you sure you want to move to trash the %'d selected files?" -msgstr[0] "Sei sicuro di voler spostare nel cestino il %'d file selezionato ?" -msgstr[1] "Si è sicuri di voler spostare al cestino i %'d file selezionati ?" - -#: ../extensions/file_manager/actions.c:539 -#: ../extensions/file_manager/callbacks.c:168 -#: ../extensions/file_manager/callbacks.c:200 -msgid "Mo_ve to Trash" -msgstr "S_posta nel cestino" - -#: ../extensions/file_manager/actions.c:571 -#: ../extensions/file_manager/actions.c:862 -#, c-format -msgid "Are you sure you want to permanently delete \"%s\"?" -msgstr "Sei sicuro di voler cancellare definitivamente «%s» ?" - -#: ../extensions/file_manager/actions.c:574 -#, c-format -msgid "Are you sure you want to permanently delete the %'d selected file?" -msgid_plural "" -"Are you sure you want to permanently delete the %'d selected files?" -msgstr[0] "" -"Sei sicuro di voler cancellare definitivamente il %'d file selezionato ?" -msgstr[1] "" -"Si è sicuri di voler cancellare definitivamente i %'d file selezionati ?" - -#: ../extensions/file_manager/actions.c:584 -#: ../extensions/file_manager/actions.c:872 -msgid "If you delete a file, it will be permanently lost." -msgstr "Se si cancella un file, sarà perso definitivamente" - -#: ../extensions/file_manager/actions.c:614 +#: ../extensions/file_manager/actions.c:555 msgid "Could not open the location" msgstr "Impossibile aprire la posizione" -#: ../extensions/file_manager/actions.c:746 +#: ../extensions/file_manager/actions.c:688 msgid "" "The folder is not empty, do you want to delete the folder and its content " "permanently?" msgstr "" -"La cartella non è vuota, si vuole cancellare la cartella e il suo contenuto " +"La cartella non è vuota, eliminare la cartella e il suo contenuto " "definitivamente?" -#: ../extensions/file_manager/actions.c:762 +#: ../extensions/file_manager/actions.c:704 msgid "Could not delete the folder" msgstr "Impossibile eliminare la cartella" -#: ../extensions/file_manager/actions.c:821 +#: ../extensions/file_manager/actions.c:765 msgid "" "The folder cannot be moved to the Trash. Do you want to delete it " "permanently?" msgstr "" -"La cartella non può essere spostata al Cestino. Eliminarla definitivamente?" +"La cartella non può essere spostata nel cestino. Eliminarla definitivamente?" -#: ../extensions/file_manager/actions.c:828 +#: ../extensions/file_manager/actions.c:772 msgid "Could not move the folder to the Trash" -msgstr "Impossibile spostare la cartella al Cestino" +msgstr "Impossibile spostare la cartella nel cestino" -#: ../extensions/file_manager/callbacks.c:148 -#: ../extensions/file_manager/callbacks.c:180 +#: ../extensions/file_manager/actions.c:808 +#: ../gthumb/gth-file-source-vfs.c:837 +#, c-format +msgid "Are you sure you want to permanently delete \"%s\"?" +msgstr "Eliminare definitivamente «%s»?" + +#: ../extensions/file_manager/actions.c:818 +#: ../gthumb/gth-file-source-vfs.c:850 +msgid "If you delete a file, it will be permanently lost." +msgstr "Se si elimina un file, sarà perso definitivamente." + +#: ../extensions/file_manager/actions.c:910 +msgid "Move To" +msgstr "Sposta in" + +#: ../extensions/file_manager/actions.c:910 +msgid "Copy To" +msgstr "Copia in" + +#: ../extensions/file_manager/actions.c:914 +msgid "Move" +msgstr "Sposta" + +#: ../extensions/file_manager/actions.c:914 +msgid "Copy" +msgstr "Copia" + +#: ../extensions/file_manager/callbacks.c:163 +#: ../extensions/file_manager/callbacks.c:199 msgid "Create _Folder" msgstr "Crea _cartella" -#: ../extensions/file_manager/callbacks.c:149 -#: ../extensions/file_manager/callbacks.c:181 +#: ../extensions/file_manager/callbacks.c:164 +#: ../extensions/file_manager/callbacks.c:200 msgid "Create a new empty folder inside this folder" -msgstr "Creare una nuova cartella vuota dentro questa cartella" +msgstr "Crea una nuova cartella vuota dentro questa cartella" -#: ../extensions/file_manager/callbacks.c:164 +#: ../extensions/file_manager/callbacks.c:179 msgid "D_uplicate" -msgstr "_Duplica" +msgstr "D_uplica" -#: ../extensions/file_manager/callbacks.c:165 +#: ../extensions/file_manager/callbacks.c:180 msgid "Duplicate the selected files" msgstr "Duplica i file selezionati" -#: ../extensions/file_manager/callbacks.c:169 +#: ../extensions/file_manager/callbacks.c:183 +#: ../extensions/file_manager/callbacks.c:219 +#: ../gthumb/gth-file-source-vfs.c:809 +msgid "Mo_ve to Trash" +msgstr "S_posta nel cestino" + +#: ../extensions/file_manager/callbacks.c:184 msgid "Move the selected files to the Trash" msgstr "Sposta i file selezionati nel cestino" -#: ../extensions/file_manager/callbacks.c:172 -#: ../extensions/file_manager/callbacks.c:204 +#: ../extensions/file_manager/callbacks.c:187 +#: ../extensions/file_manager/callbacks.c:223 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 msgid "_Delete" -msgstr "C_ancella" +msgstr "E_limina" -#: ../extensions/file_manager/callbacks.c:173 +#: ../extensions/file_manager/callbacks.c:188 msgid "Delete the selected files" -msgstr "Cancella i file selezionati" - -#: ../extensions/file_manager/callbacks.c:176 -msgid "Open with the _File Manager" -msgstr "Apri con il _file manager" +msgstr "Elimina i file selezionati" -#: ../extensions/file_manager/callbacks.c:184 -#: ../extensions/rename_series/callbacks.c:47 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +#: ../extensions/file_manager/callbacks.c:191 +#: ../extensions/file_manager/callbacks.c:203 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Rename" msgstr "_Rinomina" -#: ../extensions/file_manager/callbacks.c:196 +#: ../extensions/file_manager/callbacks.c:192 +msgid "Rename the selected files" +msgstr "Rinomina i file selezionati" + +#: ../extensions/file_manager/callbacks.c:195 +msgid "Open with the _File Manager" +msgstr "Apri con il _file manager" + +#: ../extensions/file_manager/callbacks.c:215 msgid "_Paste Into Folder" msgstr "_Incolla nella cartella" -#: ../extensions/file_manager/callbacks.c:864 ../gthumb/gth-browser.c:4610 -#: ../gthumb/gth-browser.c:4647 +#: ../extensions/file_manager/callbacks.c:227 +#: ../extensions/file_manager/callbacks.c:236 +msgid "Copy to..." +msgstr "Copia in..." + +#: ../extensions/file_manager/callbacks.c:228 +msgid "Copy the selected folder to another folder" +msgstr "Copia la cartella selezionata in un'altra cartella" + +#: ../extensions/file_manager/callbacks.c:231 +#: ../extensions/file_manager/callbacks.c:240 +msgid "Move to..." +msgstr "Sposta in..." + +#: ../extensions/file_manager/callbacks.c:232 +msgid "Move the selected folder to another folder" +msgstr "Sposta la cartella selezionata in un'altra cartella" + +#: ../extensions/file_manager/callbacks.c:237 +msgid "Copy the selected files to another folder" +msgstr "Copia i file selezionati in un'altra cartella" + +#: ../extensions/file_manager/callbacks.c:241 +msgid "Move the selected files to another folder" +msgstr "Sposta i file selezionati in un'altra cartella" + +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:581 +#: ../gthumb/gth-browser.c:4925 ../gthumb/gth-browser.c:4959 msgid "Could not perform the operation" msgstr "Impossibile eseguire l'operazione" @@ -1753,7 +2220,7 @@ #: ../extensions/file_manager/gth-delete-task.c:62 msgid "Deleting files" -msgstr "Cancellazione dei file" +msgstr "Eliminazione dei file" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 msgid "B_rightness:" @@ -1769,52 +2236,60 @@ #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 msgid "Cyan-_Red:" -msgstr "Azzurrino-_Rosso:" +msgstr "Ciano-_rosso:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" -msgstr "G_amma" +msgstr "G_amma:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 msgid "_Magenta-Green:" -msgstr "_Magenta-Verde:" +msgstr "_Magenta-verde:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Reset" -msgstr "_Reimposta" +msgid "_Preview" +msgstr "Ante_prima" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "_Ripristina" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 msgid "_Saturation:" msgstr "_Saturazione:" -#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 msgid "_Yellow-Blue:" -msgstr "_Giallo-Blu:" - -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" +msgstr "_Giallo-blu:" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 #: ../extensions/file_tools/data/ui/resize-options.ui.h:3 msgid "Aspect ratio" msgstr "Proporzioni" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 msgid "C_rop" msgstr "_Ritaglia" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +msgid "Center" +msgstr "Centra" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 #: ../extensions/file_tools/data/ui/resize-options.ui.h:7 msgid "I_nvert aspect ratio" -msgstr "I_nverti le proporzioni" +msgstr "I_nvertire le proporzioni" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "M_ultiple of:" msgstr "M_ultiplo di:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +msgid "Maximize" +msgstr "Massimizza" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:8 #: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 msgid "Selection" @@ -1833,6 +2308,11 @@ msgid "px" msgstr "px" +#. this is used to separate the dimensions, for example: 120 × 250 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "×" +msgstr "×" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:2 #: ../extensions/resize_images/data/ui/resize-images.ui.h:2 #, no-c-format @@ -1853,219 +2333,471 @@ msgstr "Alta _qualità" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "Information" -msgstr "Informazioni" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "New dimensions:" msgstr "Nuove dimensioni:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "Options" msgstr "Opzioni" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Original dimensions:" msgstr "Dimensioni originali:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 msgid "Scale factor:" msgstr "Fattore di scala:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +msgid "Set the image size to this value" +msgstr "Imposta le dimensioni dell'immagine a questo valore" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 msgid "_Width:" msgstr "Larg_hezza:" #: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 msgid "pixels" msgstr "pixel" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 +msgid "Align" +msgstr "Allinea" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Alignment" +msgstr "Allineamento" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Angle" +msgstr "Angolo" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +msgid "Bounding box" +msgstr "Riquadro delimitato" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +msgid "Crop borders" +msgstr "Ritaglio bordi" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Tracciare una linea sull'immagine \n" +"per impostare l'allineamento." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Grid:" +msgstr "Griglia:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "Image size" +msgstr "Dimesioni immagine" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 +msgid "Keep aspect ratio" +msgstr "Mantenere le proporzioni" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 +msgid "Original size" +msgstr "Dimensioni originali" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "Parallel" +msgstr "Parallelo" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 +msgid "Perpendicular" +msgstr "Perpendicolare" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 +msgid "Pick a background color" +msgstr "Scegli un colore di sfondo" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 +msgid "Point 1:" +msgstr "Punto 1:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 +msgid "Point 2:" +msgstr "Punto 2:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 +msgid "Reset" +msgstr "Ripristina" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 +msgid "_Background:" +msgstr "_Sfondo:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 +msgid "_Transparent" +msgstr "_Trasparenza" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 +msgid "Amount:" +msgstr "Ammontare:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 +msgid "Radius:" +msgstr "Raggio:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Threshold:" +msgstr "Soglia:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "_Preview:" +msgstr "Ante_prima:" + #: ../extensions/file_tools/file_tools.extension.in.in.h:1 msgid "Basic tools to modify images." msgstr "Strumenti di base per modificare le immagini." #: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Image tools" -msgstr "Strumenti per immagini" - -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:310 -#: ../extensions/file_tools/gth-file-tool-negative.c:83 -msgid "Applying changes" -msgstr "Applicazione delle modifiche" +msgstr "Strumenti per le immagini" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:520 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors..." msgstr "Aggiusta i colori..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:520 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors" msgstr "Aggiusta i colori" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:521 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "" "Cambio di luminosità, contrasto, saturazione e livello gamma dell'immagine" -#: ../extensions/file_tools/gth-file-tool-crop.c:399 -#: ../extensions/file_tools/gth-file-tool-resize.c:422 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 msgid "Square" msgstr "Quadrato" -#: ../extensions/file_tools/gth-file-tool-crop.c:400 -#: ../extensions/file_tools/gth-file-tool-resize.c:423 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:499 #, c-format msgid "%d x %d (Image)" msgstr "%d × %d (Immagine)" -#: ../extensions/file_tools/gth-file-tool-crop.c:403 -#: ../extensions/file_tools/gth-file-tool-resize.c:426 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:503 #, c-format msgid "%d x %d (Screen)" msgstr "%d × %d (Schermo)" -#: ../extensions/file_tools/gth-file-tool-crop.c:407 -#: ../extensions/file_tools/gth-file-tool-resize.c:430 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:508 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:408 -#: ../extensions/file_tools/gth-file-tool-resize.c:431 +#: ../extensions/file_tools/gth-file-tool-crop.c:433 +#: ../extensions/file_tools/gth-file-tool-resize.c:509 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, Libro)" -#: ../extensions/file_tools/gth-file-tool-crop.c:409 -#: ../extensions/file_tools/gth-file-tool-resize.c:432 +#: ../extensions/file_tools/gth-file-tool-crop.c:434 +#: ../extensions/file_tools/gth-file-tool-resize.c:510 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:410 -#: ../extensions/file_tools/gth-file-tool-resize.c:433 +#: ../extensions/file_tools/gth-file-tool-crop.c:435 +#: ../extensions/file_tools/gth-file-tool-resize.c:511 msgid "3:2 (Postcard)" msgstr "3:2 (Cartolina)" -#: ../extensions/file_tools/gth-file-tool-crop.c:411 -#: ../extensions/file_tools/gth-file-tool-resize.c:434 +#: ../extensions/file_tools/gth-file-tool-crop.c:436 +#: ../extensions/file_tools/gth-file-tool-resize.c:512 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:412 -#: ../extensions/file_tools/gth-file-tool-resize.c:435 +#: ../extensions/file_tools/gth-file-tool-crop.c:437 +#: ../extensions/file_tools/gth-file-tool-resize.c:513 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:413 -#: ../extensions/file_tools/gth-file-tool-resize.c:436 +#: ../extensions/file_tools/gth-file-tool-crop.c:438 +#: ../extensions/file_tools/gth-file-tool-resize.c:514 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:414 -#: ../extensions/file_tools/gth-file-tool-resize.c:437 +#: ../extensions/file_tools/gth-file-tool-crop.c:439 +#: ../extensions/file_tools/gth-file-tool-resize.c:515 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:415 -#: ../extensions/file_tools/gth-file-tool-resize.c:438 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/file_tools/gth-file-tool-crop.c:440 +#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/rename_series/gth-template-selector.c:232 msgid "Custom" -msgstr "Personalizzato" +msgstr "Personalizzate" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-crop.c:455 +#: ../extensions/file_tools/gth-file-tool-rotate.c:416 msgid "Rule of Thirds" msgstr "Regola dei terzi" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-crop.c:456 +#: ../extensions/file_tools/gth-file-tool-rotate.c:417 msgid "Golden Sections" -msgstr "Sezioni auree" +msgstr "Rapporto aureo" -#: ../extensions/file_tools/gth-file-tool-crop.c:553 +#: ../extensions/file_tools/gth-file-tool-crop.c:457 +#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +msgid "Center Lines" +msgstr "Linee centrali" + +#: ../extensions/file_tools/gth-file-tool-crop.c:458 +#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +msgid "Uniform" +msgstr "Uniforme" + +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop..." msgstr "Ritaglia..." -#: ../extensions/file_tools/gth-file-tool-crop.c:553 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop" msgstr "Ritaglia" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:100 -msgid "Desaturating image" -msgstr "Desaturazione dell'immagine" +#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Applicazione delle modifiche" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:118 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 msgid "Desaturate" -msgstr "Desaturazione" +msgstr "Desatura" -#: ../extensions/file_tools/gth-file-tool-enhance.c:248 +#: ../extensions/file_tools/gth-file-tool-enhance.c:119 msgid "White balance correction" msgstr "Correzione del bilanciamento del bianco" -#: ../extensions/file_tools/gth-file-tool-enhance.c:280 +#: ../extensions/file_tools/gth-file-tool-enhance.c:342 msgid "Enhance Colors" msgstr "Migliora i colori" -#: ../extensions/file_tools/gth-file-tool-enhance.c:281 +#: ../extensions/file_tools/gth-file-tool-enhance.c:343 msgid "Automatic white balance correction" msgstr "Correzione automatica del bilanciamento del bianco" -#: ../extensions/file_tools/gth-file-tool-equalize.c:168 +#: ../extensions/file_tools/gth-file-tool-equalize.c:86 msgid "Equalizing image histogram" msgstr "Equalizzazione dell'istogramma dell'immagine" -#: ../extensions/file_tools/gth-file-tool-equalize.c:200 +#: ../extensions/file_tools/gth-file-tool-equalize.c:275 msgid "Equalize" msgstr "Equalizza" -#: ../extensions/file_tools/gth-file-tool-equalize.c:201 +#: ../extensions/file_tools/gth-file-tool-equalize.c:276 msgid "Equalize image histogram" msgstr "Equalizza l'istogramma dell'immagine" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Capovolgi" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 +msgid "Flip the image vertically" +msgstr "Capovolge verticalmente l'immagine" + +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Rifletti" -#: ../extensions/file_tools/gth-file-tool-negative.c:100 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 +msgid "Mirror the image horizontally" +msgstr "Riflette orizzontalmente l'immagine" + +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Negativo" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Ripeti" -#: ../extensions/file_tools/gth-file-tool-resize.c:549 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize..." msgstr "Ridimensiona..." -#: ../extensions/file_tools/gth-file-tool-resize.c:549 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize" msgstr "Ridimensiona" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +msgid "Rotate..." +msgstr "Ruota..." + +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +msgid "Rotate" +msgstr "Ruota" + +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +msgid "Freely rotate the image" +msgstr "Ruota liberamente l'immagine" + +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Ruota a sinistra" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 +msgid "Rotate the image by 90 degrees counterclockwise" +msgstr "Ruota l'immagine di 90 gradi in senso antiorario" + +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Ruota a destra" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 +msgid "Rotate the image by 90 degrees clockwise" +msgstr "Ruota l'immagine di 90 gradi in senso orario" + +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Salva come" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Salva" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +msgid "Sharpening image" +msgstr "Nitidezza dell'immagine" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +msgid "Enhance Focus..." +msgstr "Migliora messa a fuoco..." + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +msgid "Enhance Focus" +msgstr "Migliora la messa a fuoco" + +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Annulla" -#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:63 +#: ../extensions/find_duplicates/callbacks.c:48 +msgid "Find _Duplicates..." +msgstr "Trova _duplicati..." + +#: ../extensions/find_duplicates/callbacks.c:49 +msgid "Find duplicated files in the current location" +msgstr "Trova i file duplicati nell'attuale cartella" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-choose-folders.ui.h:1 +msgid "_Folders:" +msgstr "_Cartelle:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Duplicates:" +msgstr "Duplicati:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +msgid "Files:" +msgstr "File:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 +msgid "No duplicates found." +msgstr "Nessun duplicato trovato." + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 +msgid "Search for Duplicates" +msgstr "Cerca duplicati" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +#: ../gthumb/gth-browser-actions-entries.h:33 +msgid "_View" +msgstr "_Visualizza" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 +msgid "Find Duplicates" +msgstr "Trova duplicati" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/search/data/ui/search-editor.ui.h:1 +msgid "Start _at:" +msgstr "Iniziare _da:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +msgid "_Filter:" +msgstr "_Filtro:" + +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:2 +msgid "Find duplicated files." +msgstr "Trova i file duplicati." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +msgid "leave the newest duplicates" +msgstr "lascia i duplicati più nuovi" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +msgid "leave the oldest duplicates" +msgstr "lascia i duplicati più vecchi" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +msgid "by folder..." +msgstr "per cartella..." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +msgid "all files" +msgstr "tutti i file" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +msgid "no file" +msgstr "nessun file" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:397 +#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#, c-format +msgid "%d duplicate" +msgid_plural "%d duplicates" +msgstr[0] "%d duplicato" +msgstr[1] "%d duplicati" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +msgid "Search completed" +msgstr "Ricerca completata" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +msgid "Searching for duplicates" +msgstr "Ricerca dei duplicati in corso" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../gthumb/gth-load-file-data-task.c:106 +#: ../gthumb/gth-save-file-data-task.c:100 +#, c-format +msgid "%d file remaining" +msgid_plural "%d files remaining" +msgstr[0] "%d file rimanente" +msgstr[1] "%d file rimanenti" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +msgid "Getting the file list" +msgstr "Ricupero elenco dei file" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +msgid "Duplicates" +msgstr "Duplicati" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +msgid "Select" +msgstr "Seleziona" + +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr..." @@ -2073,144 +2805,140 @@ msgid "Download photos from Flickr" msgstr "Scarica le foto da Flickr" -#: ../extensions/flicker/callbacks.c:64 -msgid "Upload photos to Flickr" -msgstr "Carica le foto su Flickr" +#: ../extensions/flicker/callbacks.c:65 +msgid "Upload photos to Flickr" +msgstr "Carica le foto su Flickr" + +#: ../extensions/flicker/flicker.extension.in.in.h:1 +msgid "Flicker" +msgstr "Flicker" + +#: ../extensions/flicker/flicker.extension.in.in.h:2 +msgid "Upload images to Flickr" +msgstr "Carica le immagini su Flickr" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 msgid "Free space:" msgstr "Spazio libero:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 msgid "Hi_de from public searches" msgstr "Nascon_di dalle ricerche pubbliche" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 msgid "Moderate content" msgstr "Contenuto moderato" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 msgid "Ph_otoset:" -msgstr "_Set:" +msgstr "Raccolta di f_oto:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:6 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 msgid "Private photos" msgstr "Foto private" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:7 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 msgid "Private photos, visible to family" msgstr "Foto private, visibili alla famiglia" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:8 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 msgid "Private photos, visible to family and friends" msgstr "Foto private, visibili alla famiglia e agli amici" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Restricted content" msgstr "Contenuto riservato" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Safe content" msgstr "Contenuto sicuro" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:14 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "_Privacy:" msgstr "_Privacy:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "_Safety:" msgstr "_Sicurezza:" -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 msgid "_Import" msgstr "_Importa" -#: ../extensions/flicker/dlg-import-from-flickr.c:356 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:812 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "Impossibile recuperare l'elenco delle foto" -#: ../extensions/flicker/dlg-import-from-flickr.c:404 -#: ../extensions/flicker/dlg-import-from-flickr.c:571 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:845 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1008 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 msgid "No album selected" msgstr "Nessun album selezionato" -#: ../extensions/flicker/dlg-import-from-flickr.c:589 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 #, c-format msgid "Import from %s" msgstr "Importa da %s" -#: ../extensions/flicker/flicker.extension.in.in.h:1 -msgid "Flicker" -msgstr "Flicker" - -#: ../extensions/flicker/flicker.extension.in.in.h:2 -msgid "Upload images to Flickr" -msgstr "Carica immagini su Flickr" - -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:838 -#: ../gthumb/gth-browser.c:1870 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 +#: ../gthumb/gth-browser.c:1998 msgid "Could not save the file" msgstr "Impossibile salvare il file" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "Impossibile catturare una schermata" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:982 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 msgid "Save Image" msgstr "Salva l'immagine" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Schermata" -#. this is an empty time -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 msgid "--:--" msgstr "--:--" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 -msgid "/" -msgstr "/" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 msgid "Change volume level" msgstr "Cambia il volume" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 msgid "Faster" msgstr "Più veloce" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:627 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 msgid "Play" -msgstr "Esegui" +msgstr "Riproduci" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 msgid "Slower" msgstr "Più lento" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:9 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Time:" msgstr "Tempo:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 msgid "Toggle volume" msgstr "Attiva o disattiva il volume" #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/photo_importer/actions.c:67 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Scegli una cartella" @@ -2220,17 +2948,21 @@ #: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:2 msgid "Play audio and video files." -msgstr "Esegui file audio e video" +msgstr "Riproduce file audio e video." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:92 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Schermata" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:93 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Cattura una schermata" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:617 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +msgid "Playing video" +msgstr "Riproduzione video" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Pause" msgstr "Pausa" @@ -2249,7 +2981,7 @@ msgstr "Artista" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 msgid "Album" msgstr "Album" @@ -2268,16 +3000,16 @@ #: ../extensions/gstreamer_tools/main.c:45 msgid "Framerate" -msgstr "Framerate" +msgstr "Fotogrammi al secondo" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Larghezza" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:9 msgid "Height" msgstr "Altezza" @@ -2287,7 +3019,7 @@ #: ../extensions/gstreamer_tools/main.c:51 msgid "Sample rate" -msgstr "Sample rate" +msgstr "Frequenza di campionatura" #: ../extensions/gstreamer_utils/gstreamer-utils.c:363 msgid "Stereo" @@ -2299,98 +3031,121 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1034 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:74 -#: ../extensions/webalbums/dlg-web-exporter.c:408 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 +#: ../extensions/webalbums/dlg-web-exporter.c:442 +#: ../extensions/webalbums/gth-web-exporter.c:2446 #, c-format msgid "%d × %d" msgstr "%d × %d" -#: ../extensions/image_print/actions.c:67 +#: ../extensions/image_print/actions.c:69 msgid "Could not print the selected files" msgstr "Impossibile stampare i file selezionati" #: ../extensions/image_print/callbacks.c:54 msgid "Print the selected images" -msgstr "Stampa i file selezionati" +msgstr "Stampa le immagini selezionate" -#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 msgid "Centered" msgstr "Centrato" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:10 msgid "Image" msgstr "Immagine" -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Images per page:" -msgstr "Immagini per pagina:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 msgid "Left" msgstr "Sinistra" -#: ../extensions/image_print/data/ui/print-layout.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:13 msgid "Position:" msgstr "Posizione:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:14 msgid "Preview" msgstr "Anteprima" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 msgid "Rotation:" -msgstr "Rotazione" +msgstr "Rotazione:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Select Caption Font" -msgstr "Selezionare un carattere per la didascalia" +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +#: ../extensions/importer/data/ui/import-preferences.ui.h:4 +msgid "The event description" +msgstr "La descrizione dell'evento" -#: ../extensions/image_print/data/ui/print-layout.ui.h:13 +#: ../extensions/image_print/data/ui/print-layout.ui.h:21 +msgid "The total number of files" +msgstr "Il numero totale dei file" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 msgid "Top" msgstr "In alto" -#: ../extensions/image_print/data/ui/print-layout.ui.h:14 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 msgid "Unit:" msgstr "Unità:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "_Font:" -msgstr "_Carattere:" +#: ../extensions/image_print/data/ui/print-layout.ui.h:28 +msgid "_Rows:" +msgstr "_Righe:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "inches" msgstr "pollici" -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +#: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "millimetri" -#: ../extensions/image_print/gth-image-print-job.c:814 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +msgid "Fonts" +msgstr "Tipi di carattere" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +msgid "Select Caption Font" +msgstr "Seleziona carattere didascalia" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 +msgid "Select Footer Font" +msgstr "Seleziona carattere piè di pagina" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:5 +msgid "Select Header Font" +msgstr "Seleziona carattere intestazione" + +#: ../extensions/image_print/gth-image-print-job.c:971 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Pagina %d di %d" -#: ../extensions/image_print/gth-image-print-job.c:1491 -#: ../extensions/image_print/gth-image-print-job.c:1593 -#: ../extensions/image_print/gth-image-print-job.c:1614 +#: ../extensions/image_print/gth-image-print-job.c:1734 +#: ../extensions/image_print/gth-image-print-job.c:1861 +#: ../extensions/image_print/gth-image-print-job.c:1898 msgid "Could not print" msgstr "Impossibile stampare" -#: ../extensions/image_print/gth-image-print-job.c:1549 -msgid "Layout" -msgstr "Disposizione" +#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../gthumb/gth-main-default-tests.c:204 +msgid "Images" +msgstr "Immagini" + +#: ../extensions/image_print/gth-image-print-job.c:1863 +#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:277 +msgid "No suitable loader available for this file type" +msgstr "Nessun caricatore idoneo per questo tipo di file" #. translators: %s is a filename -#: ../extensions/image_print/gth-load-image-info-task.c:154 +#: ../extensions/image_print/gth-load-image-info-task.c:164 #, c-format msgid "Loading \"%s\"" -msgstr "Caricamento \"%s\"" +msgstr "Caricamento di «%s»" -#: ../extensions/image_print/gth-load-image-info-task.c:156 -#: ../extensions/webalbums/gth-web-exporter.c:2734 +#: ../extensions/image_print/gth-load-image-info-task.c:166 +#: ../extensions/webalbums/gth-web-exporter.c:2685 msgid "Loading images" msgstr "Caricamento immagini" @@ -2398,54 +3153,60 @@ msgid "Allow to print images choosing the page layout." msgstr "Permette di stampare le immagini scegliendo l'impaginazione." -# NdT: sarebbe "Didascalia dell'immagine", ma verrebbe -# mandato a capo nel riquadro dove viene visualizzato, -# così ho ridotto, ma si capisce lo stesso" #: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Image print" -msgstr "Stampa dell'immagine" +msgstr "Stampa immagine" + +#: ../extensions/image_print/preferences.c:79 +msgid "Print" +msgstr "Stampa" #: ../extensions/image_rotation/callbacks.c:50 msgid "Rotate the selected images 90° to the right" -msgstr "Ruota le immagini selezionate 90° a destra" +msgstr "Ruota le immagini selezionate di 90° a destra" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" -msgstr "Ruota le immagini selezionate 90° a sinistra" +msgstr "Ruota le immagini selezionate di 90° a sinistra" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Ruota fisicamente" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" msgstr "Ruota le immagini selezionate in base all'orientamento incorporato" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" -msgstr "Reimposta l'orientamento EXIF" +msgstr "Ripristina l'orientamento EXIF" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" -msgstr "Reimposta l'orientamento incorporato senza ruotare le immagini" +msgstr "Ripristina l'orientamento incorporato senza ruotare le immagini" -# NdT: sarebbe "Didascalia dell'immagine", ma verrebbe -# mandato a capo nel riquadro dove viene visualizzato, -# così ho ridotto, ma si capisce lo stesso" +#: ../extensions/image_rotation/gth-reset-orientation-task.c:111 +#: ../extensions/image_rotation/gth-transform-task.c:141 +#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2423 +msgid "Saving images" +msgstr "Salvataggio immagini" + +# #: ../extensions/image_rotation/image_rotation.extension.in.in.h:1 msgid "Image rotation" -msgstr "Rotazione dell'immagine" +msgstr "Ruota immagine" #: ../extensions/image_rotation/image_rotation.extension.in.in.h:2 msgid "Rotate images without data loss." msgstr "Ruota le immagini senza perdita di dati." -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "Problema nella trasformazione dell'immagine: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" "This transformation may introduce small image distortions along one or more " "edges, because the image dimensions are not multiples of 8.\n" @@ -2462,149 +3223,112 @@ "uno o più bordi, perché le dimensioni delle immagini non sono multipli di " "8.\n" "\n" -"Comunque la distorsione è reversibile. Se l'immagine risultante è " +"Comunque, la distorsione è reversibile. Se l'immagine risultante è " "inaccettabile, basta semplicemente applicare la trasformazione inversa per " "ritornare all'immagine originale.\n" "\n" -"Si può anche scegliere di scartare (o tranciare) ogni pixel di bordo non " +"Si può anche scegliere di scartare (o ritagliare) ogni pixel di bordo non " "trasformabile. Per gli usi pratici, questa modalità fornisce i migliori " "risultati visivi, ma la trasformazione non è più senza perdita." -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" -msgstr "_Trancia" +msgstr "_Ritaglia" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" -msgstr "_Accetta la distorsione" - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -msgid "" -"Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, " -"fit-width, fit-width-if-larger." -msgstr "" -"I valori possibili sono: actual-size, keep-prev, fit-size, fit-size-if-" -"larger, fit-width, fit-width-if-larger." - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -msgid "Whether to resize the window to fit the size of the image" -msgstr "" -"Indica se ridimensionare la finestra per adattarla alla dimensione " -"dell'immagine" +msgstr "_Accetta distorsione" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 msgid "After loading an image:" msgstr "Dopo aver caricato un'immagine:" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Alta" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Bassa" - -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 msgid "Reset scrollbar positions" -msgstr "Reimposta la posizione delle barre di scorrimento" +msgstr "Ripristinare la posizione delle barre di scorrimento" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 msgid "Transparency _type:" msgstr "_Tipo di trasparenza:" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 msgid "_Zoom quality:" msgstr "Qualità dell'_ingrandimento:" +#: ../extensions/image_viewer/gth-image-histogram.c:84 +msgid "Histogram" +msgstr "Istogramma" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 +msgid "Copy Image" +msgstr "Copia immagine" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 +msgid "Copy the image to the clipboard" +msgstr "Copia l'immagine negli appunti" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 +msgid "Paste Image" +msgstr "Incolla immagine" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 +msgid "Paste the image from the clipboard" +msgstr "Incolla l'immagine dagli appunti" + # NdT: è l'etichetta del pulsante della barra degli strumenti per aumentare l'ingrandimento -#: ../extensions/image_viewer/gth-image-viewer-page.c:172 +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "Aumenta" -#: ../extensions/image_viewer/gth-image-viewer-page.c:173 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Aumenta l'ingrandimento" # NdT: è l'etichetta del pulsante della barra degli strumenti per ridurre l'ingrandimento -#: ../extensions/image_viewer/gth-image-viewer-page.c:177 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Riduci" -#: ../extensions/image_viewer/gth-image-viewer-page.c:178 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Riduce l'ingrandimento" -#: ../extensions/image_viewer/gth-image-viewer-page.c:182 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:183 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Dimensione reale" -#: ../extensions/image_viewer/gth-image-viewer-page.c:187 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Adatta" -#: ../extensions/image_viewer/gth-image-viewer-page.c:188 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Ingrandisce adattando alla finestra" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Ingrandisce adattando alla larghezza" -#: ../extensions/image_viewer/gth-image-viewer-page.c:200 -msgid "_Fit Window to Image" -msgstr "_Adattare la Finestra all'Immagine" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:201 -msgid "Resize the window to the size of the image" -msgstr "Ridimensionare la finestra alla dimensione dell'immagine" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 msgid "Basic image viewing." -msgstr "Visualizzazione di base delle immagini" +msgstr "Visualizzazione di base delle immagini." #: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Visualizzatore immagini" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Imposta alla grandezza reale" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Adatta alla larghezza" - -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Visualizzatore" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "I valori possibili sono: none, file_date, current_date" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "I valori possibili sono: yyyymmdd, yyyymm, yyyy" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 -msgid "Special code" -msgstr "Codice speciale" - #: ../extensions/importer/data/ui/import-preferences.ui.h:3 msgid "The day of the month" msgstr "Il giorno del mese" -#: ../extensions/importer/data/ui/import-preferences.ui.h:4 -msgid "The event description" -msgstr "La descrizione dell'evento" - #: ../extensions/importer/data/ui/import-preferences.ui.h:5 msgid "The hour" msgstr "L'ora" @@ -2637,73 +3361,90 @@ msgid "as _single subfolder" msgstr "come _singola sottocartella" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" -msgstr "Destinazione invalida" +msgstr "Destinazione non valida" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "esempio: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Data del file" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "anno-mese-giorno" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "anno-mese" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "anno" -#: ../extensions/importer/gth-import-preferences-dialog.c:340 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "formato personalizzato" -#: ../extensions/importer/gth-import-task.c:438 -#: ../extensions/importer/gth-import-task.c:473 -#: ../extensions/importer/gth-import-task.c:639 +#: ../extensions/importer/gth-import-task.c:442 +#: ../extensions/importer/gth-import-task.c:477 +#: ../extensions/importer/gth-import-task.c:648 msgid "Importing files" -msgstr "Importazione dei file" +msgstr "Importazione file" -#: ../extensions/importer/gth-import-task.c:594 +#: ../extensions/importer/gth-import-task.c:598 msgid "No file imported" msgstr "Nessun file importato" -#: ../extensions/importer/gth-import-task.c:595 +#: ../extensions/importer/gth-import-task.c:599 msgid "The selected files are already present in the destination." msgstr "I file selezionati sono già presenti nella destinazione." -#: ../extensions/importer/gth-import-task.c:616 +#: ../extensions/importer/gth-import-task.c:622 +#: ../gthumb/gth-file-source-vfs.c:690 +msgid "Could not delete the files" +msgstr "Impossibile eliminare i file" + +#: ../extensions/importer/gth-import-task.c:623 msgid "Delete operation not supported." -msgstr "Operazione di cancellazione non supportata" +msgstr "Operazione di eliminazione non supportata" -#: ../extensions/importer/gth-import-task.c:700 +#: ../extensions/importer/gth-import-task.c:709 msgid "Last imported" -msgstr "Ultima importazione" +msgstr "Ultimo importato" + +#: ../extensions/importer/gth-import-task.c:815 +msgid "No file specified." +msgstr "Nessun file specificato." + +#. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. +#: ../extensions/importer/gth-import-task.c:852 +#, c-format +msgid "" +"Not enough free space in '%s'.\n" +"%s of space is required but only %s is available." +msgstr "" +"Non c'è abbastanza spazio libero in «%s».\n" +"Sono richiesti %s di spazio ma sono disponibili solo %s." -#: ../extensions/list_tools/callbacks.c:64 ../gthumb/gth-filterbar.c:303 +#: ../extensions/list_tools/callbacks.c:75 ../gthumb/gth-filterbar.c:303 msgid "Personalize..." msgstr "Personalizza..." -#: ../extensions/list_tools/callbacks.c:237 -#: ../extensions/list_tools/callbacks.c:248 +#: ../extensions/list_tools/callbacks.c:319 msgid "Tools" msgstr "Strumenti" -#: ../extensions/list_tools/callbacks.c:239 -#: ../extensions/list_tools/callbacks.c:250 +#: ../extensions/list_tools/callbacks.c:320 msgid "Batch tools for multiple files" -msgstr "Strumenti che operano su più file" +msgstr "Strumenti in batch per file multipli" #: ../extensions/list_tools/data/ui/ask-value.ui.h:1 msgid "_Skip" @@ -2719,109 +3460,88 @@ #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 #, no-c-format -msgid "%B" -msgstr "%B" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format msgid "%E" msgstr "%E" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 -#, no-c-format -msgid "%F" -msgstr "%F" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:4 #, no-c-format msgid "%N" msgstr "%N" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 -#, no-c-format -msgid "%P" -msgstr "%P" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:12 -#, no-c-format -msgid "%U" -msgstr "%U" - #. Translate only 'message' and 'default_value'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:7 #, no-c-format msgid "%ask{ message }{ default value }" msgstr "%ask{ messaggio }{ valore predefinito }" #. Translate only 'attribute name' -#: ../extensions/list_tools/data/ui/script-editor.ui.h:18 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 #, no-c-format msgid "%attr{ attribute name }" msgstr "%attr{ nome dell'attributo }" #. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:13 #, no-c-format msgid "%quote{ text }" msgstr "%quote{ testo }" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:14 #: ../extensions/rename_series/data/ui/rename-series.ui.h:10 msgid "A file attribute" msgstr "Un attributo di file" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 msgid "Ask an input value" -msgstr "Chiedi un valore da inserire" +msgstr "Chiede un valore da inserire" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:17 msgid "E_xecute command once for every file" -msgstr "E_segui il comando una volta per ogni file" +msgstr "Ese_guire il comando una volta per ogni file" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:18 msgid "Quote the text " -msgstr "Racchiudi il testo tra virgolette" +msgstr "Cita il testo " -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 msgid "Sh_ortcut:" -msgstr "S_corciatoia:" +msgstr "Sc_orciatoia:" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 msgid "The file basename" msgstr "Il nome del file senza percorso" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" msgstr "Il nome del file senza percorso e estensione" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:31 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 msgid "The file extension" msgstr "L'estensione del file" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:32 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 msgid "The file path" msgstr "Il percorso del file" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:33 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 msgid "The file uri" msgstr "L'URI del file" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:34 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 msgid "The parent folder path" -msgstr "Il percorso della cartella" +msgstr "Il percorso della cartella genitore" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:35 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 msgid "_Command:" -msgstr "Co_mando:" +msgstr "_Comando:" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:37 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 msgid "_Terminal command (shell script)" msgstr "Comando da _terminale (script per la shell)" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:38 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 msgid "_Wait for the command to finish" -msgstr "_Attendi la fine dell'esecuzione" +msgstr "_Attendere che il comando termini" #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" @@ -2832,7 +3552,7 @@ msgstr "Scorciatoia" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "Mostra" @@ -2840,57 +3560,91 @@ msgid "Could not save the script" msgstr "Impossibile salvare lo script" -#: ../extensions/list_tools/dlg-personalize-scripts.c:405 +#: ../extensions/list_tools/dlg-personalize-scripts.c:406 msgid "New Command" msgstr "Nuovo comando" -#: ../extensions/list_tools/dlg-personalize-scripts.c:432 +#: ../extensions/list_tools/dlg-personalize-scripts.c:433 msgid "Edit Command" msgstr "Modifica comando" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/dlg-personalize-scripts.c:461 +msgid "Are you sure you want to delete the selected command?" +msgstr "Eliminare il comando selezionato?" + +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" -msgstr "Inserisci un valore:" +msgstr "Inserire un valore:" -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:571 -#: ../extensions/webalbums/gth-web-exporter.c:583 -#: ../extensions/webalbums/gth-web-exporter.c:591 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:560 +#: ../extensions/webalbums/gth-web-exporter.c:572 +#: ../extensions/webalbums/gth-web-exporter.c:580 msgid "Malformed command" msgstr "Comando malformato" -#: ../extensions/list_tools/gth-script-editor-dialog.c:177 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "nessuna" -#: ../extensions/list_tools/gth-script-editor-dialog.c:183 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "tasto %d del tastierino numerico" -#: ../extensions/list_tools/gth-script-editor-dialog.c:320 -#: ../gthumb/gth-filter-editor-dialog.c:492 -#, c-format -msgid "No name specified" -msgstr "Nessun nome specificato" - -#: ../extensions/list_tools/gth-script-editor-dialog.c:326 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "Nessun comando specificato" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "Il comando è terminato in maniera irregolare con stato %d" #: ../extensions/list_tools/list_tools.extension.in.in.h:1 msgid "File list tools" -msgstr "Strumenti per serie di file" +msgstr "Strumenti di elenco file" #: ../extensions/list_tools/list_tools.extension.in.in.h:2 msgid "Scripting and batch manipulation of files." -msgstr "Creazione di script e manipolazione in serie di file" +msgstr "Script e batch per la manipolazione di file." + +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "S" +msgstr "S" + +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "N" +msgstr "N" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "W" +msgstr "O" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "E" +msgstr "E" + +#: ../extensions/map_view/gth-map-view.c:205 +#: ../extensions/map_view/map_view.extension.in.in.h:1 +msgid "Map" +msgstr "Mappa" + +#. No GPS label +#: ../extensions/map_view/gth-map-view.c:273 +msgid "The geographical position information is not available for this image." +msgstr "" +"Non sono disponibili le informazioni della posizione geografica per questa " +"immagine." + +#: ../extensions/map_view/map_view.extension.in.in.h:2 +msgid "View the photo position on the map" +msgstr "Visualizza la posizione della foto sulla mappa" #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." @@ -2898,76 +3652,72 @@ #: ../extensions/photobucket/callbacks.c:55 msgid "Upload photos to Photobucket" -msgstr "Carica foto su Photobucket" +msgstr "Carica le foto su Photobucket" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 msgid "1 megabyte file size" msgstr "un megabyte di dimensione" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 msgid "15ʺ screen ( 800 x 600 )" -msgstr "Schermo da 15ʺ ( 800 x 600 )" +msgstr "Schermo da 15ʺ ( 800 × 600 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 msgid "17ʺ screen ( 1024 x 768 )" -msgstr "Schermo da 17ʺ ( 1024 x 768 )" +msgstr "Schermo da 17ʺ ( 1024 × 768 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 msgid "Large ( 640 x 480 )" -msgstr "Grande ( 640 x 480 )" +msgstr "Grande ( 640 × 480 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 msgid "Medium ( 320 x 240 )" -msgstr "Media ( 320 x 240 )" +msgstr "Media ( 320 × 240 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 msgid "Small ( 160 x 120 )" -msgstr "Piccola ( 160 x 120 )" +msgstr "Piccola ( 160 × 120 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 msgid "Tiny ( 100 x 75 )" -msgstr "Minuta ( 100 x 75 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "_Ridimensiona:" +msgstr "Miniatura ( 100 × 75 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 msgid "_Scramble filenames" -msgstr "_Modifica a caso i nomi dei file" +msgstr "Rendere ca_suali i nomi dei file" #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 msgid "_Container:" msgstr "_Contenitore:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:289 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Tiny ( 100 × 75 )" -msgstr "Minuta ( 100 × 75 )" +msgstr "Miniatura ( 100 × 75 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Small ( 160 × 120 )" msgstr "Piccola ( 160 × 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Medium ( 320 × 240 )" msgstr "Media ( 320 × 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "Large ( 640 × 480 )" msgstr "Grande ( 640 × 480 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "15ʺ screen ( 800 × 600 )" msgstr "Schermo da 15ʺ ( 800 × 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "17ʺ screen ( 1024 × 768 )" msgstr "Schermo da 17ʺ ( 1024 × 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:302 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 msgid "2 megabyte file size" -msgstr "2 megabyte di dimensione" +msgstr "2 megabyte di dimensione file" #: ../extensions/photobucket/photobucket.extension.in.in.h:1 msgid "PhotoBucket" @@ -2975,65 +3725,86 @@ #: ../extensions/photobucket/photobucket.extension.in.in.h:2 msgid "Upload images to PhotoBucket" -msgstr "Carica immagini su PhotoBucket" +msgstr "Carica le immagini su PhotoBucket" -#: ../extensions/photo_importer/callbacks.c:51 -msgid "_Removable Device..." -msgstr "_Dispositivo rimovibile" +#: ../extensions/photo_importer/actions.c:71 +msgid "Import" +msgstr "Importa" #: ../extensions/photo_importer/callbacks.c:52 +msgid "_Removable Device..." +msgstr "Dispositivo _rimovibile..." + +#: ../extensions/photo_importer/callbacks.c:53 msgid "Import photos and other files from a removable device" msgstr "Importa foto e altri file da un dispositivo rimovibile" +#: ../extensions/photo_importer/callbacks.c:56 +msgid "F_older..." +msgstr "Car_tella..." + +#: ../extensions/photo_importer/callbacks.c:57 +msgid "Import photos and other files from a folder" +msgstr "Importa foto e altri file da una cartella" + #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 msgid "After importing from a device:" -msgstr "Dopo aver importato da un dispositivo:" +msgstr "Dopo l'importazione da un dispositivo:" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 msgid "_Rotate the images physically" -msgstr "_Ruota fisicamente le immagini" - -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -msgid "Import from Removable Device" -msgstr "Importa da un dispositivo rimovibile" +msgstr "_Ruotare fisicamente le immagini" #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 #: ../gthumb/gth-filterbar.c:413 msgid "S_how:" -msgstr "M_ostra:" +msgstr "M_ostrare:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 msgid "_Delete the imported files from the source" -msgstr "_Elimina le immagini importate dalla sorgente" +msgstr "_Eliminare i file importati dalla sorgente" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 msgid "_Event:" msgstr "_Evento:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:8 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 msgid "_Tags:" -msgstr "_Etichette:" +msgstr "E_tichette:" + +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +msgid "Could not import the files" +msgstr "Impossibile importare i file" #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:248 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "File da importare: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:288 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" msgstr "Impossibile caricare la cartella" -#: ../extensions/photo_importer/dlg-photo-importer.c:318 -#: ../gthumb/gth-browser.c:1783 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:1911 msgid "Getting folder listing..." -msgstr "Recupero contenuto cartella in corso..." +msgstr "Recupero elenco delle cartelle..." -#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "Vuoto" +#: ../extensions/photo_importer/dlg-photo-importer.c:586 +msgid "Import from Removable Device" +msgstr "Importa dal dispositivo rimovibile" + +#: ../extensions/photo_importer/dlg-photo-importer.c:618 +msgid "Import from Folder" +msgstr "Importa dalla cartella" + #: ../extensions/photo_importer/photo_importer.extension.in.in.h:1 msgid "Import photos" msgstr "Importa foto" @@ -3043,21 +3814,21 @@ msgstr "Importa le foto da dispositivi rimovibili" #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." -msgstr "_Picasa Web Album..." +msgstr "Album web _Picasa..." #: ../extensions/picasaweb/callbacks.c:60 msgid "Download photos from Picasa Web Album" -msgstr "Scarica foto da Picasa Web Album" +msgstr "Scarica le foto dall'album web di Picasa" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" -msgstr "Carica foto su Picasa Web Album" +msgstr "Carica le foto sull'album web di Picasa" #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 msgid "Export to Picasa Web Albums" -msgstr "Esporta su Picasa Web Album" +msgstr "Esporta su album web di Picasa" #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "_Albums:" @@ -3065,7 +3836,7 @@ #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 msgid "Import from Picasa Web Album" -msgstr "Importa da Picasa Web Album" +msgstr "Importa dall'album web di Picasa" #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 msgid "_Album:" @@ -3076,8 +3847,8 @@ "Type the characters you see in the picture below. Letters are not case-" "sensitive." msgstr "" -"Immettere i caratteri che si vedono nell'immagine sottostante. Per le " -"lettere non importa il maiuscolo/minuscolo." +"Digitare i caratteri che si vedono nell'immagine sottostante. Non sono " +"distinte lettere maiuscole o minuscole." #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 msgid "_E-Mail:" @@ -3085,56 +3856,57 @@ #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 msgid "_Password:" -msgstr "_Password:" +msgstr "Pass_word:" #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "Public" msgstr "Pubblico" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:352 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:294 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "Impossibile recuperare l'elenco degli album" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:434 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:376 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" -msgstr "Picasa Web Album" +msgstr "Album web Picasa" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:521 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:463 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "Account" -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:134 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 msgid "Could not load the file" msgstr "Impossibile caricare il file" #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" -msgstr "Picasa Web Album" +msgstr "Album web Picasa" #: ../extensions/picasaweb/picasaweb.extension.in.in.h:2 msgid "Upload images to Picasa Web Albums" -msgstr "Carica immagini su Picasa Web Album" - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: none, deflate, jpeg." -msgstr "I valori possibili sono: none, deflate, jpeg." +msgstr "Carica le immagini sull'album web di Picasa" #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 msgid "Opti_mize" -msgstr "Otti_mizza" +msgstr "Otti_mizzare" #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "_Progressive" -msgstr "_Progressivo" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 +msgid "_Default extension:" +msgstr "Estensione pre_definita:" #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 +msgid "_Progressive" +msgstr "_Progressiva" + +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 msgid "_Quality:" msgstr "_Qualità:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 msgid "_Smoothing:" msgstr "_Smussatura:" @@ -3162,44 +3934,36 @@ msgid "Resolution" msgstr "Risoluzione" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Horizontal:" -msgstr "_Orizzontale:" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 msgid "_Loss compression (JPEG)" msgstr "Compressione con _perdita (JPEG)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 msgid "_No compression" msgstr "_Nessuna compressione" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_Vertical:" -msgstr "_Verticale:" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 msgid "dpi" msgstr "dpi" -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:478 +#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 msgid "JPEG" msgstr "JPEG" -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 +#: ../extensions/pixbuf_savers/gth-png-saver.c:140 msgid "PNG" msgstr "PNG" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 #: ../gthumb/gth-buffer-data.c:84 msgid "Insufficient memory" msgstr "Memoria insufficiente" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 msgid "TGA" msgstr "TGA" -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:497 +#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 msgid "TIFF" msgstr "TIFF" @@ -3209,16 +3973,11 @@ #: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "Salva le immagini in formati di file comuni come JPEG, PNG and TIFF" - -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "Saving" -msgstr "Salvataggio" +msgstr "Salva le immagini in comuni formati di file come JPEG, PNG e TIFF" #: ../extensions/raw_files/raw_files.extension.in.in.h:1 msgid "Allow to load raw format images." -msgstr "Permetti il caricamento di immagini in formato RAW" +msgstr "Consente il caricamento di immagini in formato RAW." #: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" @@ -3232,18 +3991,17 @@ msgid "_Y:" msgstr "_Y:" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:437 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." msgstr "Rimozione occhi rossi..." -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:437 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "Rimozione occhi rossi" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:438 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" -msgstr "" -"Rimuovi l'effetto occhi rossi causato dai flash delle macchine fotografiche" +msgstr "Rimuove l'effetto occhi rossi causato dai flash delle fotocamere" #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:1 msgid "Red-eye removal" @@ -3251,23 +4009,23 @@ #: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:2 msgid "Tool to remove the red-eye effect from a photo." -msgstr "Strumento per rimuovere l'effetto occhi rossi da una foto." - -#: ../extensions/rename_series/callbacks.c:48 -msgid "Rename the selected files" -msgstr "Rinomina i file selezionate" +msgstr "Strumento per la rimozione dell'effetto occhi rossi da una foto." -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "" -"Possible values include: general::unsorted, file::name, file::size, file::" -"mtime, exif::photo::datetimeoriginal" -msgstr "" -"I valori possibili includono: general::unsorted, file::name, file::size, " -"file::mtime, exif::photo::datetimeoriginal" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "I valori possibili sono: 0 (nessuno), 1 (inferiore), 2 (superiore)" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:1 +msgid "add" +msgstr "aggiungi" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 +msgid "digits" +msgstr "digita" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +msgid "format:" +msgstr "formato:" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "remove" +msgstr "rimuovi" #. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:3 @@ -3276,13 +4034,6 @@ msgstr "%A{ identificatore }" #. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, no-c-format -msgid "%D{ format }" -msgstr "%D{ formato }" - -#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:9 #, no-c-format msgid "%M{ format }" @@ -3291,78 +4042,107 @@ #. Translators: this is the text case (upper or lower case). #: ../extensions/rename_series/data/ui/rename-series.ui.h:12 msgid "Cas_e:" -msgstr "_Maiuscolo/minuscolo" +msgstr "_Maiuscolo/minuscolo:" #: ../extensions/rename_series/data/ui/rename-series.ui.h:14 -msgid "New enumerator digit" -msgstr "Nuova cifra dell'enumeratore" +msgid "Edit template" +msgstr "Modifica il modello" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 msgid "Re_verse Order" msgstr "Ordine in_verso" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 msgid "Rename" -msgstr "Rinomina" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/search/data/ui/search-editor.ui.h:1 -msgid "Start _at:" -msgstr "Ini_zia da:" +msgstr "Rinomina" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 msgid "The digitalization date" msgstr "La data di digitalizzazione" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 msgid "The modification date" msgstr "La data di modifica" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 msgid "The original enumerator" msgstr "La numerazione originale" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 msgid "The original extension" msgstr "L'estensione originale" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:24 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 msgid "The original filename" msgstr "Il nome di file originale" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -msgid "_Preview:" -msgstr "Ante_prima:" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 msgid "_Template:" msgstr "_Modello:" -#: ../extensions/rename_series/dlg-rename-series.c:380 +#: ../extensions/rename_series/dlg-rename-series.c:58 +msgid "Enumerator" +msgstr "Numerazione" + +#: ../extensions/rename_series/dlg-rename-series.c:59 +msgid "Original filename" +msgstr "Nome file originale" + +#: ../extensions/rename_series/dlg-rename-series.c:60 +msgid "Original extension" +msgstr "Estensione originale" + +#: ../extensions/rename_series/dlg-rename-series.c:61 +msgid "Original enumerator" +msgstr "Numerazione originale" + +#: ../extensions/rename_series/dlg-rename-series.c:62 +msgid "Modification date" +msgstr "Data di modifica" + +#: ../extensions/rename_series/dlg-rename-series.c:63 +msgid "Digitalization date" +msgstr "Data di digitalizzazione" + +#: ../extensions/rename_series/dlg-rename-series.c:64 +msgid "File attribute" +msgstr "Attributo file" + +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 msgid "Could not rename the files" msgstr "Impossibile rinominare i file" -#: ../extensions/rename_series/dlg-rename-series.c:469 +#: ../extensions/rename_series/dlg-rename-series.c:780 +msgid "Could not save the template" +msgstr "Impossibile salvare il modello" + +#: ../extensions/rename_series/dlg-rename-series.c:798 +msgid "Edit Template" +msgstr "Modifica modello" + +#: ../extensions/rename_series/dlg-rename-series.c:856 msgid "Old Name" -msgstr "Vecchio nome" +msgstr "Nome vecchio" -#: ../extensions/rename_series/dlg-rename-series.c:477 +#: ../extensions/rename_series/dlg-rename-series.c:867 msgid "New Name" -msgstr "Nuovo nome" +msgstr "Nome nuovo" -#: ../extensions/rename_series/dlg-rename-series.c:554 +#: ../extensions/rename_series/dlg-rename-series.c:944 msgid "Keep original case" -msgstr "Mantieni le maiuscole/minuscole originali" +msgstr "Mantieni maiuscole/minuscole originali" -#: ../extensions/rename_series/dlg-rename-series.c:555 +#: ../extensions/rename_series/dlg-rename-series.c:945 msgid "Convert to lower-case" msgstr "Converti in minuscolo" -#: ../extensions/rename_series/dlg-rename-series.c:556 +#: ../extensions/rename_series/dlg-rename-series.c:946 msgid "Convert to upper-case" msgstr "Converti in maiuscolo" -#: ../extensions/rename_series/gth-rename-task.c:166 +#: ../extensions/rename_series/gth-rename-task.c:167 msgid "Renaming files" msgstr "Rinomina dei file" @@ -3372,62 +4152,67 @@ #: ../extensions/rename_series/rename_series.extension.in.in.h:2 msgid "Rename series of files." -msgstr "Rinomina serie di file" +msgstr "Rinomina serie di file." #: ../extensions/resize_images/callbacks.c:45 msgid "Resize Images..." -msgstr "Ridimensiona Immagini..." +msgstr "Ridimensiona immagini..." #: ../extensions/resize_images/callbacks.c:46 msgid "Resize the selected images" msgstr "Ridimensiona le immagini selezionate" -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "I valori possibili sono: pixels, percentage." - #: ../extensions/resize_images/data/ui/resize-images.ui.h:5 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Formato" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "New dimensions" msgstr "Nuove dimensioni" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 msgid "Resize Images" msgstr "Ridimensiona immagini" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Height:" msgstr "Alte_zza:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 msgid "_Preserve original aspect ratios" -msgstr "_Preserva le proporzioni originali" +msgstr "_Preservare le proporzioni originali" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 msgid "pixel" msgstr "pixel" -#: ../extensions/resize_images/dlg-resize-images.c:140 +#: ../extensions/resize_images/dlg-resize-images.c:168 msgid "Resizing images" -msgstr "Ridimensionamento delle immagini" +msgstr "Ridimensionamento immagini" + +#: ../extensions/resize_images/dlg-resize-images.c:412 +msgid "Keep the original format" +msgstr "Mantieni il formato originale" #: ../extensions/resize_images/resize_images.extension.in.in.h:1 msgid "Resize images" -msgstr "Ridimensiona le immagini" +msgstr "Ridimensiona immagini" #: ../extensions/resize_images/resize_images.extension.in.in.h:2 msgid "Resize series of images." -msgstr "Ridimensiona una serie di immagini" +msgstr "Ridimensiona una serie di immagini." -#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:116 -#: ../extensions/search/actions.c:122 +#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:123 msgid "Could not perform the search" msgstr "Impossibile eseguire la ricerca" -#: ../extensions/search/actions.c:53 +#: ../extensions/search/actions.c:54 msgid "Search Result" msgstr "Risultati della ricerca" -#: ../extensions/search/actions.c:75 +#: ../extensions/search/actions.c:76 msgid "Find" msgstr "Trova" @@ -3435,35 +4220,36 @@ msgid "Find files" msgstr "Trova file" -#: ../extensions/search/callbacks.c:133 +#: ../extensions/search/callbacks.c:132 msgid "Search again" msgstr "Cerca di nuovo" #. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 +#: ../extensions/search/callbacks.c:174 #: ../extensions/search/search.extension.in.in.h:2 msgid "Search" msgstr "Cerca" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:196 +#: ../extensions/search/gth-search-editor.c:111 +#: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "tutte le regole seguenti" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:197 +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "una qualsiasi delle regole seguenti" -#: ../extensions/search/gth-search-task.c:178 -msgid "Files found untill now: %" -msgstr "File trovati finora: %" +#: ../extensions/search/gth-search-task.c:181 +#, c-format +msgid "Files found until now: %s" +msgstr "File trovati finora: %s" -#: ../extensions/search/gth-search-task.c:251 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "Ricerca..." -#: ../extensions/search/gth-search-task.c:257 +#: ../extensions/search/gth-search-task.c:277 msgid "Cancel the operation" msgstr "Annulla l'operazione" @@ -3473,107 +4259,107 @@ #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" -msgstr "_Proiezione" +msgstr "_Diapositiva" #: ../extensions/slideshow/callbacks.c:57 msgid "View as a slideshow" -msgstr "Vedi come proiezione" +msgstr "Visualizza come una diapositiva" -#: ../extensions/slideshow/callbacks.c:406 +#: ../extensions/slideshow/callbacks.c:410 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" -msgstr "Proiezione" +msgstr "Diapositiva" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 msgid "Add files to the playlist" -msgstr "Aggiungi file all'elenco" +msgstr "Aggiunge dei file alla scaletta" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 msgid "Playlist" -msgstr "Elenco" +msgstr "Scaletta" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 msgid "R_andom order" -msgstr "Ordine _casuale" +msgstr "Ordine c_asuale" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 msgid "Remove the selected files" -msgstr "Rimuovere i file selezionati" +msgstr "Rimuove i file selezionati" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 msgid "_Change automatically, every" -msgstr "_Cambia automaticamente, ogni" +msgstr "_Cambiare automaticamente ogni" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 msgid "_Personalize" -msgstr "_Personalizza" +msgstr "_Personalizzare" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 msgid "_Restart when finished" -msgstr "_Ricomincia quando è finita" +msgstr "_Ricominciare quando è terminata" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 msgid "_Transition effect:" msgstr "Effetto di _transizione:" -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 -msgid "seconds" -msgstr "secondi" +#: ../extensions/slideshow/gth-slideshow.c:229 +msgid "Playing slideshow" +msgstr "Riproduzione diapositiva" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow-preferences.c:183 msgid "Choose the files to play" msgstr "Scegli i file da riprodurre" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:192 msgid "Audio files" msgstr "File audio" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:258 msgid "Random" msgstr "Casuale" -#: ../extensions/slideshow/main.c:284 +#: ../extensions/slideshow/main.c:283 msgid "Push from right" -msgstr "Spingi da destra" +msgstr "Spinta da destra" -#: ../extensions/slideshow/main.c:290 +#: ../extensions/slideshow/main.c:289 msgid "Push from bottom" -msgstr "Spingi dal basso" +msgstr "Spinta dal basso" -#: ../extensions/slideshow/main.c:296 +#: ../extensions/slideshow/main.c:295 msgid "Slide from right" -msgstr "Scivola da destra" +msgstr "Scorrimento da destra" -#: ../extensions/slideshow/main.c:302 +#: ../extensions/slideshow/main.c:301 msgid "Slide from bottom" -msgstr "Scivola dal basso" +msgstr "Scorrimento dal basso" -#: ../extensions/slideshow/main.c:308 +#: ../extensions/slideshow/main.c:307 msgid "Fade in" msgstr "Dissolvenza" -#: ../extensions/slideshow/main.c:314 +#: ../extensions/slideshow/main.c:313 msgid "Flip page" -msgstr "Capovolgi la pagina" +msgstr "Pagina capovolta" -#: ../extensions/slideshow/main.c:320 +#: ../extensions/slideshow/main.c:319 msgid "Cube from right" msgstr "Cubo da destra" -#: ../extensions/slideshow/main.c:326 +#: ../extensions/slideshow/main.c:325 msgid "Cube from bottom" msgstr "Cubo dal basso" #: ../extensions/slideshow/slideshow.extension.in.in.h:2 msgid "View images as a slideshow." -msgstr "Vedi una proiezione delle immagini." +msgstr "Visualizza le immagini come una diapositiva." #: ../extensions/webalbums/callbacks.c:71 msgid "_Web Album..." -msgstr "Album _Web" +msgstr "Album _web..." #: ../extensions/webalbums/callbacks.c:72 msgid "Create a static web album" @@ -3581,7 +4367,7 @@ #: ../extensions/webalbums/data/albumthemes/text.h:26 msgid "Click to view the image" -msgstr "Fai clic per vedere l'immagine" +msgstr "Fare clic per visualizzare l'immagine" #: ../extensions/webalbums/data/albumthemes/text.h:27 msgid "Go back to the index" @@ -3590,287 +4376,230 @@ #: ../extensions/webalbums/data/albumthemes/text.h:28 #, c-format msgid "Image %d of %d" -msgstr "Immaigne %d di %d" +msgstr "Immagine %d di %d" #: ../extensions/webalbums/data/albumthemes/text.h:29 msgid "Index" msgstr "Indice" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:115 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "Successiva" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "Precedente" #: ../extensions/webalbums/data/albumthemes/text.h:33 #, c-format msgid "View page %d" -msgstr "Vedi la pagina %d" +msgstr "Visualizza pagina %d" #: ../extensions/webalbums/data/albumthemes/text.h:34 msgid "View the next image" -msgstr "Vedi l'immagine successiva" +msgstr "Visualizza la successiva immagine" #: ../extensions/webalbums/data/albumthemes/text.h:35 msgid "View the next page" -msgstr "Vedi la pagina successiva" +msgstr "Visualizza la successiva pagina" #: ../extensions/webalbums/data/albumthemes/text.h:36 msgid "View the previous image" -msgstr "Vedi l'immagine precedente" +msgstr "Visualizza la precedente immagine" #: ../extensions/webalbums/data/albumthemes/text.h:37 msgid "View the previous page" -msgstr "Vedi la pagina precedente" +msgstr "Visualizza la precedente pagina" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 #, no-c-format -msgid "%I" -msgstr "%I" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -#, no-c-format -msgid "%i" -msgstr "%i" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -#, no-c-format -msgid "%p" -msgstr "%p" +msgid "%P" +msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 msgid "Adapts to the window width" msgstr "Adatta alla larghezza della finestra" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 msgid "All images on a single image" msgstr "Tutte le immagini in una singola immagine" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "All images on a single page" -msgstr "Tutte le immagini in una singola pagina" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 -msgid "Columns:" -msgstr "Colonne:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 msgid "Image Attributes" msgstr "Attributi dell'immagine" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 msgid "Image Page" msgstr "Pagina dell'immagine" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 msgid "Index Page" msgstr "Pagina indice" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -msgid "Re_verse order" -msgstr "Ordine in_verso" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 -msgid "S_ort:" -msgstr "_Ordina:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 msgid "Show the description, if available" -msgstr "Mostra la descrizione, se disponibile" +msgstr "Mostrare la descrizione se disponibile" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 msgid "Show the following attributes:" -msgstr "Mostra i seguenti attributi:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The current date" -msgstr "La data attuale" +msgstr "Mostrare i seguenti attributi:" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 msgid "The current image number" -msgstr "Il numero d'immagine corrente" +msgstr "Il numero dell'immagine attuale" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "The current page number" -msgstr "Il numero di pagina corrente" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "The file comment" +msgstr "Il commento del file" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 msgid "The total number of images" -msgstr "Il numero totale di immagini" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "The total number of pages" -msgstr "Il numero totale di pagine" +msgstr "Il numero totale delle immagini" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "Theme" -msgstr "Tema:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 msgid "Thumbnail Caption" msgstr "Didascalia della miniatura" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "Use subfolders to organize files" -msgstr "Usa le sottocartelle per organizzare i file" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "Web Album" msgstr "Album web" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 msgid "_Adapt to the window width " -msgstr "_Adatta alla larghezza della finestra" +msgstr "_Adattare alla larghezza della finestra" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:40 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 msgid "_Copy originals to destination" -msgstr "_Copia gli originali a destinazione" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:42 -msgid "_Footer:" -msgstr "Piè _di pagina:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:43 -msgid "_Header:" -msgstr "Int_estazione:" +msgstr "_Copiare gli originali nella destinazione" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:44 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 msgid "_Resize if larger than:" -msgstr "_Ridimensiona se più grande di:" +msgstr "_Ridimensionare se più grande di:" -#: ../extensions/webalbums/gth-web-exporter.c:1795 +#: ../extensions/webalbums/gth-web-exporter.c:1802 msgid "Could not show the destination" msgstr "Impossibile mostrare la destinazione" -#: ../extensions/webalbums/gth-web-exporter.c:1829 +#: ../extensions/webalbums/gth-web-exporter.c:1838 msgid "The album has been created successfully." -msgstr "L'album è stato creato correttamente" +msgstr "L'album è stato creato con successo." -#: ../extensions/webalbums/gth-web-exporter.c:2095 -#: ../extensions/webalbums/gth-web-exporter.c:2122 +#: ../extensions/webalbums/gth-web-exporter.c:2106 +#: ../extensions/webalbums/gth-web-exporter.c:2133 msgid "Saving thumbnails" msgstr "Salvataggio miniature" -#: ../extensions/webalbums/gth-web-exporter.c:2150 +#: ../extensions/webalbums/gth-web-exporter.c:2161 msgid "Saving HTML pages: Images" msgstr "Salvataggio pagine HTML: Immagini" -#: ../extensions/webalbums/gth-web-exporter.c:2208 +#: ../extensions/webalbums/gth-web-exporter.c:2219 msgid "Saving HTML pages: Indexes" msgstr "Salvataggio pagine HTML: Indici" -#: ../extensions/webalbums/gth-web-exporter.c:2328 -#: ../extensions/webalbums/gth-web-exporter.c:2385 -msgid "Saving images" -msgstr "Salvataggio immagini" - -#: ../extensions/webalbums/gth-web-exporter.c:2441 +#: ../extensions/webalbums/gth-web-exporter.c:2502 msgid "Copying original images" -msgstr "Copia delle immagini originali" +msgstr "Copia immagini originali" -#: ../extensions/webalbums/gth-web-exporter.c:2977 +#: ../extensions/webalbums/gth-web-exporter.c:2929 msgid "Could not find the style folder" -msgstr "Impossibile trovare la cartella di stile" +msgstr "Impossibile trovare la cartella dello stile" -#: ../extensions/webalbums/gth-web-exporter.c:3010 +#: ../extensions/webalbums/gth-web-exporter.c:2967 msgid "Could not create a temporary folder" msgstr "Impossibile creare una cartella temporanea" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 msgid "Create static web albums." -msgstr "Crea album web statici." +msgstr "Crea degli album web statici." #: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Web Albums" msgstr "Album web" -#: ../gthumb/dlg-extensions.c:65 ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-personalize-filters.c:237 +msgid "Filter" +msgstr "Filtro" + +#: ../gthumb/dlg-personalize-filters.c:315 +msgid "Could not save the filter" +msgstr "Impossibile salvare i filtri" + +#: ../gthumb/dlg-personalize-filters.c:358 +msgid "New Filter" +msgstr "Nuovo filtro" + +#: ../gthumb/dlg-personalize-filters.c:387 +msgid "Edit Filter" +msgstr "Modifica filtro" + +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:269 msgid "All" -msgstr "Tutto" +msgstr "Tutte" -#: ../gthumb/dlg-extensions.c:66 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" -msgstr "Attive" +msgstr "Abilitate" -#: ../gthumb/dlg-extensions.c:67 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" -msgstr "Disattive" +msgstr "Disabilitate" -#: ../gthumb/dlg-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" msgstr "Visualizzatori" -#: ../gthumb/dlg-extensions.c:71 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "Metadati" -#: ../gthumb/dlg-extensions.c:72 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "Strumenti per file" -#: ../gthumb/dlg-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "Strumenti per elenchi" -#: ../gthumb/dlg-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "Importatori" -#: ../gthumb/dlg-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" msgstr "Esportatori" -#: ../gthumb/dlg-extensions.c:154 -msgid "Restart required" -msgstr "Richiesto il riavvio" - -#: ../gthumb/dlg-extensions.c:155 -msgid "You need to restart gthumb for these changes to take effect" -msgstr "Bisogna riavviare gthumb affinché le modifiche abbiano effetto" - -#: ../gthumb/dlg-extensions.c:156 -msgid "_Continue" -msgstr "_Continua" - -#: ../gthumb/dlg-extensions.c:157 -msgid "_Restart" -msgstr "_Riavvia" - -#: ../gthumb/dlg-extensions.c:258 +#: ../gthumb/dlg-preferences-extensions.c:216 msgid "Could not activate the extension" msgstr "Impossibile attivare l'estensione" -#: ../gthumb/dlg-extensions.c:264 +#: ../gthumb/dlg-preferences-extensions.c:226 msgid "Could not deactivate the extension" msgstr "Impossibile disattivare l'estensione" -#: ../gthumb/dlg-extensions.c:286 -msgid "Use" -msgstr "Usa" - -#: ../gthumb/dlg-extensions.c:302 -msgid "Extension" -msgstr "Estensione" +#. add the page to the preferences dialog +#: ../gthumb/dlg-preferences-extensions.c:772 +msgid "Extensions" +msgstr "Estensioni" -#: ../gthumb/dlg-personalize-filters.c:236 -msgid "Filter" -msgstr "Filtro" +#: ../gthumb/dlg-preferences-extensions.c:819 +msgid "Restart required" +msgstr "Richiesto il riavvio" -#: ../gthumb/dlg-personalize-filters.c:314 -msgid "Could not save the filter" -msgstr "Impossibile salvare i filtri" +#: ../gthumb/dlg-preferences-extensions.c:820 +msgid "You need to restart gthumb for these changes to take effect" +msgstr "" +"È necessario riavviare l'applicazione affinché le modifiche abbiano effetto" -#: ../gthumb/dlg-personalize-filters.c:356 -msgid "New Filter" -msgstr "Nuovo filtro" +#: ../gthumb/dlg-preferences-extensions.c:821 +msgid "_Continue" +msgstr "_Continua" -#: ../gthumb/dlg-personalize-filters.c:385 -msgid "Edit Filter" -msgstr "Modifica Filtro" +#: ../gthumb/dlg-preferences-extensions.c:822 +msgid "_Restart" +msgstr "_Riavvia" #: ../gthumb/eggfileformatchooser.c:236 #, c-format @@ -3904,41 +4633,41 @@ "s'. Please make sure to use a known extension for that file or manually " "choose a file format from the list below." msgstr "" -"Il programma non è stato in grado di capire il formato che si vuole usare " -"per `%s'. Assicurarsi di usare un'estensione nota per quel file oppure " -"scegliere manualmente un formato di file dalla lista sottostante." +"Il programma non è stato in grado di trovare il formato di file che si vuole " +"usare per «%s». Assicurarsi di usare un'estensione conosciuta per questo file " +"oppure scegliere manualmente un formato di file dall'elenco sottostante." #: ../gthumb/eggfileformatchooser.c:688 msgid "File format not recognized" msgstr "Formato di file non riconosciuto" #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1362 +#: ../gthumb/gio-utils.c:1355 #, c-format msgid "%s of %s" msgstr "%s di %s" -#: ../gthumb/gio-utils.c:1397 +#: ../gthumb/gio-utils.c:1390 #, c-format msgid "Moving \"%s\" to \"%s\"" -msgstr "Spostamento di \"%s\" a \"%s\"" +msgstr "Spostamento di «%s» in «%s»" -#: ../gthumb/gio-utils.c:1399 +#: ../gthumb/gio-utils.c:1392 #, c-format msgid "Copying \"%s\" to \"%s\"" -msgstr "Copia di \"%s\" a \"%s\"" +msgstr "Copia di «%s» in «%s»" -#: ../gthumb/gio-utils.c:1735 +#: ../gthumb/gio-utils.c:1733 msgid "Moving files" -msgstr "Spostamento dei file" +msgstr "Spostamento file" -#: ../gthumb/gio-utils.c:1735 +#: ../gthumb/gio-utils.c:1733 msgid "Copying files" -msgstr "Copia dei file" +msgstr "Copia file" -#: ../gthumb/gio-utils.c:1736 +#: ../gthumb/gio-utils.c:1734 msgid "Getting file information" -msgstr "Recupero informazioni del file" +msgstr "Recupero informazioni file" #. hour:minutes:seconds #. Translators: This is a time format, like "9:05:02" for 9 @@ -3946,11 +4675,11 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2817 +#: ../gthumb/glib-utils.c:2844 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" -msgstr "%d:%02d:%02d" +msgstr "%d.%02d.%02d" #. minutes:seconds #. Translators: This is a time format, like "5:02" for 5 @@ -3958,13 +4687,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2826 +#: ../gthumb/glib-utils.c:2853 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d.%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:370 +#: ../gthumb/gth-browser-actions-callbacks.c:391 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -3976,7 +4705,7 @@ "Foundation; sia la versione 2 della licenza, o (a scelta) una qualsiasi " "versione successiva." -#: ../gthumb/gth-browser-actions-callbacks.c:374 +#: ../gthumb/gth-browser-actions-callbacks.c:395 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -3988,367 +4717,430 @@ "PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per maggiori " "dettagli." -#: ../gthumb/gth-browser-actions-callbacks.c:378 +#: ../gthumb/gth-browser-actions-callbacks.c:399 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." msgstr "" -"Dovresti aver ricevuto una copia della GNU General Public License insieme a " -"gthumb. In caso contrario, vedi http://www.gnu.org/licenses/." +"Si dovrebbe aver ricevuto una copia della GNU General Public License insieme " +"a gthumb. In caso contrario, consultare http://www.gnu.org/licenses/." -#: ../gthumb/gth-browser-actions-callbacks.c:397 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "An image viewer and browser for GNOME." msgstr "Un visualizzatore e navigatore di immagini per GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:421 msgid "translator_credits" msgstr "" "Paolo Bacchilega \n" "Francesco Marletta \n" -"Paolo Benvenuto " +"Paolo Benvenuto \n" +"Gianvito Cavasoli " -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_File" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "_Modifica" -#: ../gthumb/gth-browser-actions-entries.h:32 -msgid "_View" -msgstr "_Visualizza" - -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "V_ai" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "A_iuto" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" -msgstr "_Apri con" +msgstr "Apri c_on" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" -msgstr "_Importa" +msgstr "I_mporta da" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" -msgstr "_Esporta" +msgstr "E_sporta a" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" msgstr "Nuova _finestra" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" -msgstr "Apri un'altra finestra" +msgstr "Apre un'altra finestra" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Apri" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "Apri in una nuova finestra" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "Modifica varie preferenze" -#: ../gthumb/gth-browser-actions-entries.h:80 -msgid "Extensions" -msgstr "Estensioni" - -#: ../gthumb/gth-browser-actions-entries.h:81 -msgid "Activate, deactivate and configure the gthumb extensions" -msgstr "Attivazione, disattiva e configura le estensioni di gthumb" - -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." msgstr "_Ordina per..." -#: ../gthumb/gth-browser-actions-entries.h:95 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." msgstr "_Filtro..." -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:108 msgid "Stop loading the current location" -msgstr "Ferma il caricamento della posizione corrente" +msgstr "Ferma il caricamento della posizione attuale" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:114 msgid "Reload the current location" -msgstr "Ricarica la posizione corrente" +msgstr "Ricarica la posizione attuale" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" -msgstr "Vedi l'immagine precedente" +msgstr "Visualizza la precedente immagine" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" -msgstr "Vedi l'immagine successiva" +msgstr "Visualizza la successiva immagine" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "Passa a schermo intero" -#: ../gthumb/gth-browser-actions-entries.h:126 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" -msgstr "Lascia lo schermo intero" +msgstr "Finestra normale" -#: ../gthumb/gth-browser-actions-entries.h:131 ../gthumb/gth-browser.c:3344 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3575 msgid "Go to the previous visited location" -msgstr "Vai alla posizione visitata precedente" +msgstr "Va alla precedente posizione visitata" -#: ../gthumb/gth-browser-actions-entries.h:136 ../gthumb/gth-browser.c:3365 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3593 msgid "Go to the next visited location" -msgstr "Vai alla posizione visitata seguente" +msgstr "Va alla successiva posizione visitata" -#: ../gthumb/gth-browser-actions-entries.h:141 ../gthumb/gth-browser.c:3386 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3611 msgid "Go up one level" -msgstr "Vai su di un livello" +msgstr "Sale di un livello" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:653 +#: ../gthumb/gth-browser-actions-entries.h:167 ../gthumb/gth-browser.c:672 msgid "_Delete History" -msgstr "_Pulisci cronologia" +msgstr "_Elimina cronologia" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:168 msgid "Delete the list of visited locations" -msgstr "Elimina la lista delle posizioni visitate" +msgstr "Elimina l'elenco delle posizioni visitate" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "View the folders" -msgstr "Mostra le cartelle" +msgstr "Visualizza le cartelle" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "Show information about gthumb" -msgstr "Mostra le informazioni su gthumb" +msgstr "Mostra le informazioni sull'applicazione" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:185 msgid "Contents" msgstr "Sommario" -#: ../gthumb/gth-browser-actions-entries.h:166 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Display the gthumb Manual" -msgstr "Presenta il manuale di gthumb" +msgstr "Visualizza il manuale dell'applicazione" -#: ../gthumb/gth-browser-actions-entries.h:170 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "_Keyboard Shortcuts" msgstr "Scorciatoie da _tastiera" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:200 msgid "_Toolbar" -msgstr "Barra degli st_rumenti" +msgstr "Barra degli _strumenti" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:201 msgid "View or hide the toolbar of this window" -msgstr "Mostra o nasconde la barra degli strumenti di questa finestra" +msgstr "Visualizza o nasconde la barra degli strumenti di questa finestra" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:205 msgid "_Statusbar" msgstr "Barra di s_tato" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:206 msgid "View or hide the statusbar of this window" -msgstr "Mostra o nasconde la barra di stato di questa finestra" +msgstr "Visualizza o nasconde la barra di stato di questa finestra" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:210 msgid "_Filterbar" msgstr "Barra dei f_iltri" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:211 msgid "View or hide the filterbar of this window" -msgstr "Mostra o nasconde la barra dei filtri di questa finestra" +msgstr "Visualizza o nasconde la barra dei filtri di questa finestra" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:215 msgid "_Sidebar" msgstr "Barra _laterale" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:216 msgid "View or hide the sidebar of this window" -msgstr "Mostra o nasconde la barra laterale di questa finestra" +msgstr "Visualizza o nasconde la barra laterale di questa finestra" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:220 msgid "_Thumbnail Pane" msgstr "Pannello delle _miniature" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:221 msgid "View or hide the thumbnail pane in viewer mode" msgstr "" -"Mostra o nasconde il pannello delle miniature in modalità visualizzatore" +"Visualizza o nasconde il pannello delle miniature nella modalità " +"visualizzatore" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:225 msgid "_Thumbnails" msgstr "_Miniature" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:226 msgid "View thumbnails" -msgstr "Mostra le miniature" +msgstr "Visualizza le miniature" -#: ../gthumb/gth-browser-actions-entries.h:209 +#: ../gthumb/gth-browser-actions-entries.h:230 msgid "_Hidden Files" msgstr "File _nascosti" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:231 msgid "Show hidden files and folders" -msgstr "Mostra i file e le cartelle nascosti" +msgstr "Mostra i file e le cartelle nascoste" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:241 msgid "View file properties" -msgstr "Vedi le proprietà dei file" +msgstr "Visualizza le proprietà dei file" -#: ../gthumb/gth-browser-actions-entries.h:219 +#: ../gthumb/gth-browser-actions-entries.h:245 msgid "Edit" msgstr "Modifica" -#: ../gthumb/gth-browser-actions-entries.h:220 +#: ../gthumb/gth-browser-actions-entries.h:246 msgid "Edit file" msgstr "Modifica il file" -#: ../gthumb/gth-browser.c:355 +#: ../gthumb/gth-browser-actions-entries.h:250 +msgid "_Fit Window to Image" +msgstr "A_dattare la finestra all'Immagine" + +#: ../gthumb/gth-browser-actions-entries.h:251 +msgid "Resize the window to the size of the image" +msgstr "Ridimensiona la finestra alla dimensione dell'immagine" + +#: ../gthumb/gth-browser.c:369 #, c-format msgid "Open %s" msgstr "Apri %s" -#: ../gthumb/gth-browser.c:494 +#: ../gthumb/gth-browser.c:509 msgid "[modified]" -msgstr "[modificato]" +msgstr "[modificata]" + +#: ../gthumb/gth-browser.c:996 +#, c-format +msgid "%d file selected (%s)" +msgid_plural "%d files selected (%s)" +msgstr[0] "%d file selezionato (%s)" +msgstr[1] "%d file selezionati (%s)" + +#: ../gthumb/gth-browser.c:1031 +#, c-format +msgid "%s of free space" +msgstr "%s di spazio libero" -#: ../gthumb/gth-browser.c:498 ../gthumb/gth-main.c:259 -msgid "gthumb" -msgstr "gthumb" - -#: ../gthumb/gth-browser.c:1121 ../gthumb/gth-browser.c:1674 -#: ../gthumb/gth-browser.c:5436 ../gthumb/gth-browser.c:5455 -#: ../gthumb/gth-browser.c:5480 +#: ../gthumb/gth-browser.c:1240 ../gthumb/gth-browser.c:1799 +#: ../gthumb/gth-browser.c:5883 ../gthumb/gth-browser.c:5902 +#: ../gthumb/gth-browser.c:5927 #, c-format msgid "Could not load the position \"%s\"" msgstr "Impossibile caricare la posizione «%s»" -#: ../gthumb/gth-browser.c:1767 ../gthumb/gth-browser.c:1794 +#: ../gthumb/gth-browser.c:1895 ../gthumb/gth-browser.c:1922 #, c-format msgid "No suitable module found for %s" -msgstr "Impossibile trovare un modulo idoneo per %s" +msgstr "Nessun modulo idoneo trovato per %s" -#: ../gthumb/gth-browser.c:1912 +#: ../gthumb/gth-browser.c:2042 #, c-format msgid "Save changes to file '%s'?" -msgstr "Salvare le modifiche al file «%s» ?" +msgstr "Salvare le modifiche al file «%s»?" -#: ../gthumb/gth-browser.c:1917 +#: ../gthumb/gth-browser.c:2047 msgid "If you don't save, changes to the file will be permanently lost." msgstr "Se non si salva, le modifiche al file saranno perse definitivamente." -#: ../gthumb/gth-browser.c:1918 +#: ../gthumb/gth-browser.c:2048 msgid "Do _Not Save" msgstr "_Non salvare" -#: ../gthumb/gth-browser.c:2606 ../gthumb/gth-browser.c:2630 -#: ../gthumb/gth-source-tree.c:178 ../gthumb/gth-source-tree.c:200 +#: ../gthumb/gth-browser.c:2818 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Impossibile cambiare il nome" -#: ../gthumb/gth-browser.c:3028 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3247 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Modificato" -#: ../gthumb/gth-browser.c:3345 ../gthumb/gth-browser.c:3366 +#: ../gthumb/gth-browser.c:3576 ../gthumb/gth-browser.c:3594 msgid "View the list of visited locations" -msgstr "Vedi l'elenco delle posizioni visitate" +msgstr "Visualizza l'elenco delle posizioni visitate" -#: ../gthumb/gth-browser.c:3387 +#: ../gthumb/gth-browser.c:3612 msgid "View the list of upper locations" -msgstr "Vedi l'elenco delle posizioni superiori" +msgstr "Visualizza l'elenco delle posizioni superiori" -#: ../gthumb/gth-browser.c:5437 +#: ../gthumb/gth-browser.c:5884 #, c-format msgid "File type not supported" msgstr "Tipo di file non supportato" -#: ../gthumb/gth-browser.c:5481 +#: ../gthumb/gth-browser.c:5928 #, c-format msgid "No suitable module found" -msgstr "Impossibile trovare un modulo idoneo" +msgstr "Nessun modulo idoneo trovato" -#: ../gthumb/gth-extensions.c:228 +#: ../gthumb/gth-extensions.c:203 #, c-format msgid "Could not open the module `%s`: %s" -msgstr "Impossibile aprire il modulo `%s`: %s" +msgstr "Impossibile aprire il modulo «%s»: %s" -#: ../gthumb/gth-extensions.c:827 +#: ../gthumb/gth-extensions.c:733 #, c-format -msgid "The extension '%s' is required by the extension '%s'" -msgstr "L'estensione '%s' è richiesta dall'estensione '%s'" +msgid "The extension '%1$s' is required by the extension '%2$s'" +msgstr "L'estensione «%1$s» è richiesta dall'estensione «%2$s»" -#: ../gthumb/gth-file-source-vfs.c:80 +#: ../gthumb/gth-file-source-vfs.c:117 msgid "Home Folder" -msgstr "Cartella principale" +msgstr "Cartella home" -#: ../gthumb/gth-file-source-vfs.c:87 +#: ../gthumb/gth-file-source-vfs.c:122 msgid "File System" msgstr "File system" +#: ../gthumb/gth-file-source-vfs.c:735 +msgid "" +"The files cannot be moved to the Trash. Do you want to delete them " +"permanently?" +msgstr "" +"I file non possono essere spostati nel cestino. Eliminarli definitivamente?" + +#: ../gthumb/gth-file-source-vfs.c:746 +msgid "Could not move the files to the Trash" +msgstr "Impossibile spostare i file nel cestino" + +#: ../gthumb/gth-file-source-vfs.c:793 +#, c-format +msgid "Are you sure you want to move \"%s\" to trash?" +msgstr "Spostare «%s» nel cestino?" + +#: ../gthumb/gth-file-source-vfs.c:797 +#, c-format +msgid "Are you sure you want to move to trash the %'d selected file?" +msgid_plural "Are you sure you want to move to trash the %'d selected files?" +msgstr[0] "Spostare nel cestino %'d file selezionato?" +msgstr[1] "Spostare nel cestino %'d file selezionati?" + +#: ../gthumb/gth-file-source-vfs.c:840 +#, c-format +msgid "Are you sure you want to permanently delete the %'d selected file?" +msgid_plural "" +"Are you sure you want to permanently delete the %'d selected files?" +msgstr[0] "Eliminare definitivamente %'d file selezionato?" +msgstr[1] "Eliminare definitivamente %'d file selezionati?" + #: ../gthumb/gth-filterbar.c:405 msgid "Hide the filterbar" -msgstr "Nascondi la barra dei filtri" +msgstr "Nasconde la barra dei filtri" -#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" -#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "MB" -#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:211 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:279 ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter.c:289 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "file" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" -msgstr "ascendente" +msgstr "crescente" -#: ../gthumb/gth-filter-editor-dialog.c:256 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" -msgstr "discendente" +msgstr "decrescente" -#: ../gthumb/gth-filter-editor-dialog.c:546 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "Nessun limite specificato" -#: ../gthumb/gth-folder-tree.c:848 +#: ../gthumb/gth-folder-tree.c:857 msgid "Loading..." msgstr "Caricamento..." -#: ../gthumb/gth-folder-tree.c:1119 +#: ../gthumb/gth-folder-tree.c:1100 msgid "(Open Parent)" -msgstr "(apri genitore)" - -#: ../gthumb/gth-image-loader.c:222 ../gthumb/gth-image-loader.c:294 -msgid "No suitable loader available for this file type" -msgstr "Nessun caricatore idoneo per questo tipo di file" - -#: ../gthumb/gth-main.c:222 -#, c-format -msgid "Unable to show '%s'" -msgstr "Impossibile mostrare '%s'" +msgstr "(Apri genitore)" -#: ../gthumb/gth-main.c:242 -#, c-format -msgid "Unable to open '%s'" -msgstr "Impossibile aprire '%s'" +#: ../gthumb/gth-histogram-view.c:826 +msgid "Linear scale" +msgstr "Scala lineare" + +#: ../gthumb/gth-histogram-view.c:838 +msgid "Logarithmic scale" +msgstr "Scala logaritmica" + +#: ../gthumb/gth-histogram-view.c:858 +msgid "Channel:" +msgstr "Canali:" + +#: ../gthumb/gth-histogram-view.c:890 +msgid "Value" +msgstr "Valore" + +#: ../gthumb/gth-histogram-view.c:896 +msgid "Red" +msgstr "Rosso" + +#: ../gthumb/gth-histogram-view.c:902 +msgid "Green" +msgstr "Verde" + +#: ../gthumb/gth-histogram-view.c:908 +msgid "Blue" +msgstr "Blu" + +#: ../gthumb/gth-histogram-view.c:914 +msgid "Alpha" +msgstr "Alfa" + +#: ../gthumb/gth-histogram-view.c:921 +msgid "RGB" +msgstr "RGB" + +#: ../gthumb/gth-load-file-data-task.c:108 +msgid "Reading file information" +msgstr "Lettura informazioni del file" #: ../gthumb/gth-main-default-metadata.c:32 msgid "File" @@ -4371,41 +5163,25 @@ msgid "Full Name" msgstr "Nome completo" -#: ../gthumb/gth-main-default-metadata.c:46 -msgid "Title" -msgstr "Titolo" - #: ../gthumb/gth-main-default-metadata.c:48 msgid "Duration" msgstr "Durata" -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Formato" - -#: ../gthumb/gth-main-default-metadata.c:51 -msgid "Date" -msgstr "Data" - -#: ../gthumb/gth-main-default-metadata.c:54 -msgid "Rating" -msgstr "Gradimento" - #: ../gthumb/gth-main-default-sort-types.c:131 msgid "file name" -msgstr "nome del file" +msgstr "nome file" #: ../gthumb/gth-main-default-sort-types.c:132 msgid "file path" -msgstr "Percorso del file" +msgstr "percorso file" #: ../gthumb/gth-main-default-sort-types.c:133 msgid "file size" -msgstr "Dimensione del file" +msgstr "dimensione file" #: ../gthumb/gth-main-default-sort-types.c:134 msgid "file modified date" -msgstr "data di modifica del file" +msgstr "data modifica file" #: ../gthumb/gth-main-default-sort-types.c:135 msgid "no sorting" @@ -4415,13 +5191,9 @@ msgid "dimensions" msgstr "dimensioni" -#: ../gthumb/gth-main-default-tests.c:204 -msgid "Images" -msgstr "Immagini" - #: ../gthumb/gth-main-default-tests.c:225 msgid "Media" -msgstr "Media" +msgstr "Multimediale" #: ../gthumb/gth-main-default-tests.c:232 msgid "Text Files" @@ -4437,7 +5209,7 @@ #: ../gthumb/gth-main-default-tests.c:278 msgid "Description (embedded)" -msgstr "Descrizione (incorporato)" +msgstr "Descrizione (incorporata)" #: ../gthumb/gth-pixbuf-list-task.c:139 msgid "Could not rename the file" @@ -4447,16 +5219,20 @@ msgid "No options available for this file type" msgstr "Nessuna opzione disponibile per questo tipo di file" -#: ../gthumb/gth-progress-dialog.c:136 +#: ../gthumb/gth-progress-dialog.c:142 msgid "Cancel operation" -msgstr "Annulla l'operazione" +msgstr "Annulla operazione" + +#: ../gthumb/gth-save-file-data-task.c:102 +msgid "Saving file information" +msgstr "Salvataggio informazioni del file" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-tags-entry.c:388 #, c-format msgid "Create tag «%s»" -msgstr "Crea l'etichetta «%s»" +msgstr "Crea etichetta «%s»" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:743 msgid "Show all the tags" msgstr "Mostra tutte le etichette" @@ -4513,25 +5289,29 @@ msgid "is" msgstr "è" -#: ../gthumb/gth-test-category.c:47 ../gthumb/gth-test-simple.c:50 +#: ../gthumb/gth-test-category.c:47 +msgid "is only" +msgstr "è solo" + +#: ../gthumb/gth-test-category.c:48 ../gthumb/gth-test-simple.c:50 #: ../gthumb/gth-test-simple.c:65 msgid "is not" msgstr "non è" -#: ../gthumb/gth-test-category.c:361 ../gthumb/gth-test-simple.c:796 -#: ../gthumb/gth-test-simple.c:822 ../gthumb/gth-test-simple.c:843 -#: ../gthumb/gth-test-simple.c:869 +#: ../gthumb/gth-test-category.c:386 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" -msgstr "La definizione del test è incompleta" +msgstr "La definizione del test non è completa" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:251 msgid "Add a new rule" -msgstr "Aggiungi una nuova regola" +msgstr "Aggiunge una nuova regola" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:262 msgid "Remove this rule" -msgstr "Rimuovi questa regola" +msgstr "Rimuove questa regola" #: ../gthumb/gth-test-simple.c:46 msgid "contains" @@ -4551,7 +5331,7 @@ #: ../gthumb/gth-test-simple.c:52 msgid "matches" -msgstr "rispetta espressione" +msgstr "rispetta" #: ../gthumb/gth-test-simple.c:56 msgid "is lower than" @@ -4567,17 +5347,17 @@ #: ../gthumb/gth-test-simple.c:62 msgid "is before" -msgstr "è prima del" +msgstr "è prima" #: ../gthumb/gth-test-simple.c:63 msgid "is after" -msgstr "è dopo il" +msgstr "è dopo" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:474 msgid "Today" msgstr "Oggi" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:482 msgid "Now" msgstr "Ora" @@ -4585,41 +5365,59 @@ msgid "Close this window" msgstr "Chiude questa finestra" -#: ../gthumb/gtk-utils.c:802 +#: ../gthumb/gth-window-actions-entries.h:36 +msgid "Close _All Windows" +msgstr "Chiudi _tutte le finestre" + +#: ../gthumb/gtk-utils.c:551 msgid "Could not display help" -msgstr "Impossibile mostrare l'aiuto" +msgstr "Impossibile mostrare il sommario" -#: ../gthumb/gtk-utils.c:1089 ../gthumb/gtk-utils.c:1097 +#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 msgid "Could not launch the application" msgstr "Impossibile lanciare l'applicazione" -#: ../gthumb/main.c:67 +#: ../gthumb/gtk-utils.c:978 +msgid "_Copy Here" +msgstr "_Copia qui" + +#: ../gthumb/gtk-utils.c:983 +msgid "_Move Here" +msgstr "_Sposta qui" + +#: ../gthumb/gtk-utils.c:988 +msgid "_Link Here" +msgstr "C_ollega qui" + +#: ../gthumb/gtk-utils.c:997 +msgid "Cancel" +msgstr "Annulla" + +#: ../gthumb/main.c:59 msgid "Open a new window" -msgstr "Apri una nuova finestra" +msgstr "Apre una nuova finestra" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:63 msgid "Start in fullscreen mode" msgstr "Avvia in modalità a schermo intero" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:67 msgid "Automatically start a slideshow" -msgstr "Avvia automaticamente la proiezione" +msgstr "Avvia automaticamente una diapositiva" -#: ../gthumb/main.c:79 +#: ../gthumb/main.c:71 msgid "Automatically import digital camera photos" msgstr "Importa automaticamente le foto dalla fotocamera digitale" -#: ../gthumb/main.c:83 +#: ../gthumb/main.c:75 msgid "Show version" msgstr "Mostra la versione" -#. command line options -#: ../gthumb/main.c:413 +#: ../gthumb/main.c:344 msgid "- Image browser and viewer" msgstr "- Navigatore e visualizzatore di immagini" #: ../gthumb/pixbuf-io.c:174 #, c-format msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "" -"Impossibile trovare un modulo idoneo per salvare l'immagine come \"%s\"" +msgstr "Impossibile trovare un modulo idoneo per salvare l'immagine come «%s»" diff -Nru gthumb-2.14.3/po/ja.po gthumb-3.0.0/po/ja.po --- gthumb-2.14.3/po/ja.po 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/po/ja.po 2012-04-17 16:57:26.000000000 +0000 @@ -1,116 +1,127 @@ # gthumb ja.po. -# Copyright (C) 2001-2007,2009-2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2007,2009-2012 Free Software Foundation, Inc. # Takeshi AIHANA , 2001-2007,2009-2011. +# Jiro Matsuzawa , 2012 +# Ritsuko Sato , 2012 # msgid "" msgstr "" -"Project-Id-Version: gthumb gthumb-2-14\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-27 07:23+0900\n" -"PO-Revision-Date: 2011-10-27 07:22+0900\n" -"Last-Translator: Takeshi AIHANA \n" -"Language-Team: Japanese \n" -"Language: ja\n" +"Project-Id-Version: gthumb master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gthumb&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-04-17 12:12+0000\n" +"PO-Revision-Date: 2012-04-17 22:03+0900\n" +"Last-Translator: OKANO Takayoshi \n" +"Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: ja\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "妥当な .desktop ファイルではありません" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "バージョン '%s' の .desktop ファイルはサポートしていません" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "%sの起動中です" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "コマンドラインからドキュメントにはアクセスできません" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "不明な起動オプションです: %d" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "ドキュメントの URI を 'Type=Link' のデスクトップの要素には渡せません" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "起動可能なアイテムではありません" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" -msgstr "セッション・マネージャに接続しない" +msgstr "セッションマネージャーに接続しない" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "設定を保存したファイルを指定する" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "FILE" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "セッション管理の ID を指定する" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "ID" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "セッション管理のオプション:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "セッション管理のオプションを表示する" #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:1 ../data/gthumb-import.desktop.in.in.h:1 -#: ../gthumb/gth-browser.c:523 ../gthumb/gth-main.c:229 -#: ../gthumb/gth-progress-dialog.c:443 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:530 +#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 msgid "gThumb" msgstr "gThumb" #: ../data/gthumb.desktop.in.in.h:2 msgid "Image Viewer" -msgstr "画像ビューア" +msgstr "画像ビューアー" #: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" -msgstr "gThumb 画像ビューア" +msgstr "gThumb 画像ビューアー" #: ../data/gthumb.desktop.in.in.h:4 msgid "View and organize your images" msgstr "画像を表示し管理するツールです" +#: ../data/gthumb-import.desktop.in.in.h:1 +msgid "Import with gThumb" +msgstr "gThumb でインポート" + #: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "写真を取り込むツール" #: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" -msgstr "gThumb フォト・インポート・ツール" +msgstr "gThumb フォトインポートツール" #: ../data/gthumb-import.desktop.in.in.h:4 msgid "Import the photos on your camera card" msgstr "お使いのカメラや IC メモリにある写真を取り込みます" -#: ../data/gthumb.schemas.in.h:1 +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "" "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " "to generate thumbnails for all images." @@ -118,51 +129,41 @@ "このサイズ (バイト単位) より大きい画像はサムネイル表示されません。全ての画像" "をサムネイル表示する場合は 0 を指定して下さい。" -#: ../data/gthumb.schemas.in.h:2 -msgid "Possible values are: list, thumbnails." -msgstr "設定可能な値: list、thumbnails" - -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -msgid "Possible values are: high, low." -msgstr "設定可能な値: high、low" +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" +msgstr "画像のサイズに合わせてウィンドウの大きさを変更するかどうかです。" -#: ../data/gthumb.schemas.in.h:4 -msgid "" -"Possible values are: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." -msgstr "" -"設定可能な値: actual_size、fit、keep_prev、fit_if_larger、fit_width_if_larger" +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "使用中のウィンドウでファイルを開きます" -#: ../data/gthumb.schemas.in.h:5 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "設定可能な値: white、black、checked、none" -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Whether to reset the scrollbar positions after changing image" -msgstr "画像を変更した後にスクロールバーの位置をリセットするかどうかです。" - -#: ../data/gthumb.schemas.in.h:7 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 -msgid "Possible values are: light, midtone, dark." -msgstr "設定可能な値: light、midtone、dark" - -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 -msgid "Possible values are: small, medium, large." -msgstr "設定可能な値: small、medium、large" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +msgid "Whether to reset the scrollbars position after changing image" +msgstr "画像を変更した後にスクロールバーの位置をリセット" -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to always use a black background." msgstr "常に背景を黒色にするかどうかを設定します。" -#: ../data/gthumb.schemas.in.h:10 +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "指定可能な値: jpeg、jpg" + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "指定可能な値: tiff、tif" + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 msgid "" -"Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "設定可能な値: system、text_below、text_beside、text_only、icons_only" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"指定可能な値: general::unsorted、file::name、file::size、file::mtime、exif::" +"photo::datetimeoriginal" #: ../data/ui/extensions-preferences.ui.h:1 msgid "_Extensions:" @@ -178,7 +179,7 @@ #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" -msgstr "フィルタの名前(_N):" +msgstr "フィルターの名前(_N):" #: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 @@ -186,8 +187,8 @@ msgstr "次を満足するもの(_M): " #. limit label -#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:270 +#: ../gthumb/gth-filter.c:342 msgid "_Limit to" msgstr "次に制限する(_L):" @@ -199,7 +200,7 @@ msgid "Mean:" msgstr "平均:" -#. Short for "Standard deviation". Try to keep it short in the translation. +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. #: ../data/ui/histogram-info.ui.h:3 msgid "Std dev:" msgstr "標準偏差:" @@ -225,9 +226,14 @@ msgid "Selected:" msgstr "選択値:" +#: ../data/ui/location.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +msgid "_Location:" +msgstr "場所(_L):" + #: ../data/ui/overwrite-dialog.ui.h:1 msgid "Overwrite the old file with the new one?" -msgstr "新しいファイルで古いファイル上書きしますか?" +msgstr "新しいファイルで古いファイルを上書きしますか?" #: ../data/ui/overwrite-dialog.ui.h:2 msgid "Old File:" @@ -239,7 +245,7 @@ #: ../data/ui/overwrite-dialog.ui.h:4 #: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 msgid "Size:" msgstr "サイズ:" @@ -273,191 +279,187 @@ #: ../data/ui/personalize-filters.ui.h:1 msgid "Filters" -msgstr "フィルタの一覧" +msgstr "フィルターの一覧" #: ../data/ui/personalize-filters.ui.h:2 msgid "_General filter:" -msgstr "通常のフィルタ(_G):" +msgstr "通常のフィルター(_G):" #: ../data/ui/personalize-filters.ui.h:3 msgid "_Other filters:" -msgstr "その他のフィルタ(_O):" +msgstr "その他のフィルター(_O):" #: ../data/ui/preferences.ui.h:1 -msgid "Follow Nautilus behaviour" -msgstr "Nautilus の設定に従う" +msgid "below the folder list" +msgstr "フォルダーの一覧の下" #: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "シングル・クリックで有効にする" +msgid "on the right" +msgstr "右側" #: ../data/ui/preferences.ui.h:3 -msgid "Activate items with a double click" -msgstr "ダブル・クリックで有効にする" +msgid "gThumb Preferences" +msgstr "gThumb の設定" #: ../data/ui/preferences.ui.h:4 -msgid "gthumb Preferences" -msgstr "gThumb の設定" +msgid "_Toolbar style:" +msgstr "ツールバーのスタイル(_T):" #: ../data/ui/preferences.ui.h:5 -msgid "Appearance" -msgstr "外観" +msgid "T_humbnails in viewer:" +msgstr "サムネイルの表示位置(_H):" #: ../data/ui/preferences.ui.h:6 -msgid "_Toolbar style:" -msgstr "ツールバーのスタイル(_T):" +msgid "System settings" +msgstr "デスクトップ設定に従う" #: ../data/ui/preferences.ui.h:7 -msgid "T_humbnails in viewer:" -msgstr "サムネイルの一覧(_H):" +msgid "Text below icons" +msgstr "アイコンの下にラベル" #: ../data/ui/preferences.ui.h:8 -msgid "On startup:" -msgstr "起動時:" +msgid "Text beside icons" +msgstr "アイコンの横にラベル" #: ../data/ui/preferences.ui.h:9 -msgid "Go to last _visited location" -msgstr "次に訪れた場所へ移動する(_V)" +msgid "Icons only" +msgstr "アイコンのみ" #: ../data/ui/preferences.ui.h:10 -msgid "Go to this _folder:" -msgstr "次のフォルダへ移動する(_F):" +msgid "Text only" +msgstr "ラベルのみ" #: ../data/ui/preferences.ui.h:11 -msgid "Choose startup folder" -msgstr "起動時に開くフォルダの選択" +msgid "on the bottom" +msgstr "下側" #: ../data/ui/preferences.ui.h:12 -msgid "Set to C_urrent" -msgstr "現在の場所をセットする(_U)" +msgid "on the side" +msgstr "横側" #: ../data/ui/preferences.ui.h:13 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:192 -#: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Other" -msgstr "その他" +msgid "File _properties in browser:" +msgstr "ブラウザーでのプロパティ表示位置(_P):" #: ../data/ui/preferences.ui.h:14 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "ファイルまたはカタログを削除する前に確認する(_K)" +msgid "Appearance" +msgstr "外観" #: ../data/ui/preferences.ui.h:15 -msgid "Ask whether to save _modified files" -msgstr "変更したファイルを保存するか確認する(_M)" +msgid "Go to last _visited location" +msgstr "直前に訪れた場所へ移動する(_V)" #: ../data/ui/preferences.ui.h:16 -msgid "_Store metadata inside files if possible" -msgstr "可能ならば、ファイル内にメタデータを埋め込む(_S)" +msgid "Go to this _folder:" +msgstr "次のフォルダーへ移動する(_F):" #: ../data/ui/preferences.ui.h:17 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:393 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "全般" +msgid "Choose startup folder" +msgstr "起動時に開くフォルダーの選択" #: ../data/ui/preferences.ui.h:18 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "Caption" -msgstr "表示する見出し" +msgid "Set to C_urrent" +msgstr "現在の場所をセットする(_U)" #: ../data/ui/preferences.ui.h:19 -msgid "Thumbnail _size:" -msgstr "サムネイルのサイズ(_S):" +msgid "_Reuse the active window to open files" +msgstr "使用中のウィンドウでファイルを開く(_R)" #: ../data/ui/preferences.ui.h:20 -msgid "D_etermine image type from content (slower)" -msgstr "画像の内容から種類を判断する (低速)(_D)" +msgid "On startup:" +msgstr "起動時:" -#: ../data/ui/preferences.ui.h:21 ../gthumb/dlg-preferences-extensions.c:72 -#: ../gthumb/gth-browser-actions-entries.h:150 -msgid "Browser" -msgstr "ブラウザ" +#: ../data/ui/preferences.ui.h:21 +msgid "As_k confirmation before deleting files or catalogs" +msgstr "ファイルまたはカタログを削除する前に確認する(_K)" #: ../data/ui/preferences.ui.h:22 -msgid "on the bottom" -msgstr "ウィンドウの下側" +msgid "Ask whether to save _modified files" +msgstr "変更したファイルを保存するか確認する(_M)" #: ../data/ui/preferences.ui.h:23 -msgid "on the side" -msgstr "ウィンドウの横側" - -#. Set widgets data. -#: ../data/ui/preferences.ui.h:24 ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "デスクトップ設定に従う" +msgid "_Store metadata inside files if possible" +msgstr "可能ならば、ファイル内にメタデータを埋め込む(_S)" -#: ../data/ui/preferences.ui.h:25 ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "アイコンの下にラベル" +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 +#: ../extensions/gstreamer_tools/main.c:33 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 +msgid "Other" +msgstr "その他" -#: ../data/ui/preferences.ui.h:26 ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "アイコンの横にラベル" +#: ../data/ui/preferences.ui.h:25 +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "全般" -#: ../data/ui/preferences.ui.h:27 ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "アイコンのみ" +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "表示するプロパティ" -#: ../data/ui/preferences.ui.h:28 ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "ラベルのみ" +#: ../data/ui/preferences.ui.h:27 +msgid "Thumbnail _size:" +msgstr "サムネイルのサイズ(_S):" -#: ../data/ui/preferences.ui.h:29 ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "白色" +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" #: ../data/ui/preferences.ui.h:30 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-crop.c:448 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 -#: ../extensions/file_tools/gth-file-tool-rotate.c:414 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "なし" - -#: ../data/ui/preferences.ui.h:31 ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "黒色" - -#: ../data/ui/preferences.ui.h:32 ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "格子縞" +msgid "85" +msgstr "85" -#: ../data/ui/preferences.ui.h:33 ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "前と同じ拡大率にする" - -#: ../data/ui/preferences.ui.h:34 ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "ウィンドウに合わせる" - -#: ../data/ui/preferences.ui.h:35 ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "ウィンドウ・サイズよりも大きい場合はウィンドウに合わせる" +#: ../data/ui/preferences.ui.h:31 +msgid "95" +msgstr "95" + +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" + +#: ../data/ui/preferences.ui.h:33 +msgid "128" +msgstr "128" + +#: ../data/ui/preferences.ui.h:34 +msgid "164" +msgstr "164" + +#: ../data/ui/preferences.ui.h:35 +msgid "200" +msgstr "200" #: ../data/ui/preferences.ui.h:36 -msgid "Set image to actual size" -msgstr "オリジナルのサイズにする" +msgid "256" +msgstr "256" -#: ../data/ui/preferences.ui.h:37 ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "ウィンドウ・サイズよりも大きい場合は幅に合わせる" +#: ../data/ui/preferences.ui.h:37 +msgid "D_etermine image type from content (slower)" +msgstr "画像の内容から種類を判断する (低速)(_E)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "ブラウザー" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" -msgstr "並び替え" +msgstr "並べ替え" #: ../data/ui/sort-order.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" -msgstr "次で並び替える(_S): " +msgstr "並べ替え順序(_S): " #: ../data/ui/sort-order.ui.h:3 msgid "_Inverse order" @@ -471,11 +473,11 @@ msgid "Upload images to 23hq.com" msgstr "画像を 23hq.com へアップロードします" -#: ../extensions/23hq/callbacks.c:67 +#: ../extensions/23hq/callbacks.c:68 msgid "_23..." msgstr "23(_2)..." -#: ../extensions/23hq/callbacks.c:68 +#: ../extensions/23hq/callbacks.c:69 msgid "Upload photos to 23" msgstr "写真を 23 へアップロードします" @@ -513,6 +515,7 @@ #: ../extensions/rename_series/rename_series.extension.in.in.h:3 #: ../extensions/resize_images/resize_images.extension.in.in.h:3 #: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" @@ -556,7 +559,7 @@ #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" -msgstr "ブックマークを移動できませんでした" +msgstr "ブックマークを削除できませんでした" #: ../extensions/burn_disc/burn_disc.extension.in.in.h:1 msgid "Burn CD/DVD" @@ -580,11 +583,11 @@ #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:1 msgid "Current _folder" -msgstr "このフォルダ(_F)" +msgstr "このフォルダー(_F)" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:2 msgid "Current folder and its s_ub-folders" -msgstr "このフォルダとそのサブフォルダ(_U)" +msgstr "このフォルダーとそのサブフォルダー(_U)" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 msgid "_Selected files" @@ -596,7 +599,7 @@ #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "ディスクへの書き込み" @@ -613,17 +616,17 @@ #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 -#: ../extensions/file_manager/actions.c:65 -#: ../extensions/list_tools/gth-script-editor-dialog.c:319 -#: ../gthumb/gth-filter-editor-dialog.c:491 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format msgid "No name specified" -msgstr "名前が指定されていません。" +msgstr "名前が指定されていません" #: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 #: ../extensions/catalogs/dlg-add-to-catalog.c:281 #: ../extensions/catalogs/dlg-add-to-catalog.c:401 -#: ../extensions/file_manager/actions.c:72 +#: ../extensions/file_manager/actions.c:75 #, c-format msgid "Invalid name. The following characters are not allowed: %s" msgstr "名前が間違っています (次の文字は指定できません: %s)" @@ -631,7 +634,8 @@ #: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 #: ../extensions/catalogs/dlg-add-to-catalog.c:338 #: ../extensions/catalogs/dlg-add-to-catalog.c:448 -#: ../extensions/file_manager/actions.c:103 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 msgid "Name already used" msgstr "その名前は既に使われています" @@ -648,7 +652,7 @@ #: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 #: ../extensions/catalogs/dlg-add-to-catalog.c:474 -#: ../extensions/file_manager/actions.c:133 +#: ../extensions/file_manager/actions.c:136 msgid "C_reate" msgstr "作成する(_R)" @@ -666,26 +670,27 @@ msgid "Could not remove the catalog" msgstr "カタログを削除できませんでした" -#: ../extensions/catalogs/actions.c:361 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" -msgstr "本当に \"%s\" を削除しますか?" +msgstr "本当に \"%s\" を削除しますか?" #: ../extensions/catalogs/callbacks.c:102 msgid "_Add to Catalog" msgstr "カタログに追加する(_A)" #: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" -msgstr "フォルダを開く(_F)" +msgstr "フォルダーを開く(_F)" #: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" -msgstr "選択したファイルを格納するフォルダへジャンプします" +msgstr "選択したファイルを格納するフォルダーへジャンプします" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/edit_metadata/callbacks.c:116 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:86 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "その他..." @@ -728,29 +733,29 @@ #: ../extensions/catalogs/callbacks.c:497 #: ../extensions/catalogs/callbacks.c:502 -#: ../extensions/photo_importer/dlg-photo-importer.c:359 -#: ../extensions/photo_importer/dlg-photo-importer.c:399 -#: ../gthumb/gth-file-list.c:45 ../gthumb/gth-folder-tree.c:874 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" -msgstr "(空です)" +msgstr "(ファイルなし)" -#: ../extensions/catalogs/callbacks.c:695 +#: ../extensions/catalogs/callbacks.c:697 msgid "Catalog Properties" msgstr "カタログのプロパティを表示します" -#: ../extensions/catalogs/callbacks.c:709 +#: ../extensions/catalogs/callbacks.c:711 msgid "Organize" msgstr "整理する" -#: ../extensions/catalogs/callbacks.c:710 +#: ../extensions/catalogs/callbacks.c:712 msgid "Automatically organize files by date" msgstr "自動的にファイルを年月日のついたカタログに整理します" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1024 +#: ../extensions/catalogs/gth-catalog.c:1025 msgid "Catalogs" msgstr "カタログ" @@ -775,19 +780,19 @@ msgstr "新しいライブラリ(_L)" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:922 -#: ../extensions/webalbums/gth-web-exporter.c:1852 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1842 msgid "_View the destination" -msgstr "送り先のフォルダを表示する(_V)" +msgstr "送り先のフォルダーを表示する(_V)" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -#: ../gthumb/gth-file-properties.c:201 +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "プロパティ" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 #: ../extensions/list_tools/data/ui/script-editor.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 @@ -805,7 +810,7 @@ msgstr "カタログ" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:1 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "ファイルの整理" @@ -829,52 +834,52 @@ msgid "Catalog _Preview:" msgstr "カタログのプレビュー(_P):" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:1 +#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../gthumb/gth-main-default-tests.c:300 +msgid "Date photo was taken" +msgstr "写真の撮影日" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -msgid "_Group files by:" -msgstr "次でグループ化する(_G):" +#: ../gthumb/gth-main-default-tests.c:292 +msgid "File modified date" +msgstr "ファイルの変更日時" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 -#: ../extensions/search/data/ui/search-editor.ui.h:2 -msgid "_Include sub-folders" -msgstr "サブ・フォルダも含める(_I)" +#: ../extensions/comments/main.c:159 +msgid "Tag" +msgstr "タグ" #: ../extensions/catalogs/data/ui/organize-files.ui.h:4 -msgid "Ignore catalogs with a single file" -msgstr "1個しかファイルのないカタログは無視する" +msgid "tag" +msgstr "tag" #: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "1個のカタログに1個のファイルを格納する:" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "単体" +#: ../gthumb/gth-main-default-tests.c:324 +msgid "Tag (embedded)" +msgstr "(埋め込まれた) タグ" #: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:470 -#: ../gthumb/gth-main-default-tests.c:264 -msgid "Date photo was taken" -msgstr "写真の撮影日" +msgid "_Group files by:" +msgstr "次でグループ化する(_G):" #: ../extensions/catalogs/data/ui/organize-files.ui.h:8 -#: ../gthumb/gth-main-default-tests.c:256 -msgid "File modified date" -msgstr "ファイルの変更日時" +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/search/data/ui/search-editor.ui.h:2 +msgid "_Include sub-folders" +msgstr "サブフォルダーも含める(_I)" #: ../extensions/catalogs/data/ui/organize-files.ui.h:9 -#: ../extensions/comments/main.c:261 -msgid "Tag" -msgstr "タグ" +msgid "Ignore catalogs with a single file" +msgstr "1個しかファイルのないカタログは無視する" #: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -msgid "tag" -msgstr "tag" +msgid "Put single files in the catalog:" +msgstr "1個のカタログに1個のファイルを格納する:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -#: ../gthumb/gth-main-default-tests.c:284 -msgid "Tag (embedded)" -msgstr "(埋め込まれた) タグ" +msgid "Singles" +msgstr "単体" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -882,7 +887,7 @@ msgstr "ファイルをカタログに追加できませんでした" #: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/search/gth-search-task.c:352 +#: ../extensions/search/gth-search-task.c:356 msgid "Could not create the catalog" msgstr "カタログを作成できませんでした" @@ -890,61 +895,63 @@ msgid "Could not save the catalog" msgstr "カタログを保存できませんでした" -#: ../extensions/catalogs/dlg-catalog-properties.c:166 +#: ../extensions/catalogs/dlg-catalog-properties.c:159 msgid "Could not load the catalog" msgstr "カタログをロードできませんでした" #: ../extensions/catalogs/dlg-organize-files.c:120 msgid "Files will be organized in catalogs. No file will be moved on disk." msgstr "" -"ファイルをカタログの中に登録しますが、ディスクから削除されることはありません" +"ファイルをカタログに登録しますが、ファイル本体はディスク上では移動されませ" +"ん。" -#: ../extensions/catalogs/gth-catalog.c:1145 ../extensions/comments/main.c:43 +#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "タグ" -#: ../extensions/catalogs/gth-file-source-catalogs.c:848 +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 #, c-format msgid "The catalog '%s' already exists, do you want to overwrite it?" -msgstr "次のカタログは既に存在していますが上書きしますか?: '%s'" +msgstr "次のカタログは既に存在していますが上書きしますか?: '%s'" -#: ../extensions/catalogs/gth-file-source-catalogs.c:850 +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 #, c-format msgid "The library '%s' already exists, do you want to overwrite it?" -msgstr "次のライブラリは既に存在していますが上書きしますか?: '%s'" +msgstr "次のライブラリは既に存在していますが上書きしますか?: '%s'" -#: ../extensions/catalogs/gth-file-source-catalogs.c:858 +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 msgid "Over_write" msgstr "上書きする(_W)" -#: ../extensions/catalogs/gth-file-source-catalogs.c:976 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 msgid "Cannot move the files" msgstr "ファイルを移動できません" -#: ../extensions/catalogs/gth-file-source-catalogs.c:978 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 msgid "Cannot copy the files" msgstr "ファイルをコピーできません" -#: ../extensions/catalogs/gth-file-source-catalogs.c:983 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 msgid "Invalid destination." -msgstr "移動先がが間違っています" +msgstr "移動先が間違っています" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1030 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format msgid "Copying files to '%s'" msgstr "ファイルを '%s' へコピー中" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1283 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 msgid "Could not remove the files from the catalog" msgstr "カタログからファイルを削除できませんでした" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1341 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:683 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:711 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1214 -#: ../extensions/search/gth-search.c:295 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "ファイル形式が間違っています" @@ -969,11 +976,6 @@ msgid "Change the files date" msgstr "ファイルの日付を変更します" -#: ../extensions/change_date/data/gthumb_change_date.schemas.in.h:1 -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "設定可能な値: pixels、percentage" - #: ../extensions/change_date/data/ui/change-date.ui.h:1 msgid "Change Date" msgstr "日付の変更" @@ -984,7 +986,7 @@ #: ../extensions/change_date/data/ui/change-date.ui.h:3 msgid "_Last modified date" -msgstr "最終修正日時(_L)" +msgstr "更新日時(_L)" #: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Co_mment date" @@ -1004,7 +1006,7 @@ #: ../extensions/change_date/data/ui/change-date.ui.h:8 msgid "File _modified date" -msgstr "ファイルの最終修正日時(_M)" +msgstr "ファイルの更新日時(_M)" #: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File c_reation date" @@ -1030,7 +1032,7 @@ #: ../extensions/change_date/data/ui/change-date.ui.h:14 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" -msgstr "秒間" +msgstr "秒" #: ../extensions/change_date/data/ui/change-date.ui.h:15 msgid "+" @@ -1040,6 +1042,15 @@ msgid "-" msgstr "次を引く" +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "埋め込みのメタデータをインポート" + +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "" +"ファイル埋め込みのメタデータを gThumb のコメントシステムにインポートします" + #: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "コメントとタグ" @@ -1049,7 +1060,7 @@ msgstr "いろいろな種類のファイルにコメントやタグを追加します" #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "設定" @@ -1057,69 +1068,79 @@ msgid "_Synchronize with the embedded metadata" msgstr "埋め込まれているメタデータと同期する(_S)" -#: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:111 +#: ../extensions/comments/main.c:34 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "コメント" -#: ../extensions/comments/main.c:39 ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "タイトル" -#: ../extensions/comments/main.c:40 ../extensions/comments/main.c:245 +#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:8 #: ../extensions/importer/data/ui/import-preferences.ui.h:6 #: ../extensions/list_tools/data/ui/script-editor.ui.h:11 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "説明" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:253 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:151 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "場所" -#: ../extensions/comments/main.c:42 ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:43 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "日付" -#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "評価" #: ../extensions/contact_sheet/callbacks.c:59 msgid "Contact _Sheet" -msgstr "コンタクト・シート(_S)" +msgstr "コンタクトシート(_S)" #: ../extensions/contact_sheet/callbacks.c:61 msgid "Contact _Sheet..." -msgstr "コンタクト・シート(_S)..." +msgstr "コンタクトシート(_S)..." #: ../extensions/contact_sheet/callbacks.c:62 msgid "Create a contact sheet" -msgstr "コンタクト・シートを生成します" +msgstr "コンタクトシートを生成します" #: ../extensions/contact_sheet/callbacks.c:65 msgid "Image _Wall..." -msgstr "イメージ・ウォール(_W)..." +msgstr "イメージウォール(_W)..." #: ../extensions/contact_sheet/callbacks.c:66 msgid "Create an image-wall" -msgstr "イメージ・ウォールを生成します" +msgstr "イメージウォールを生成します" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" -msgstr "コンタクト・シート" +msgstr "コンタクトシート" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 msgid "Create an index image displaying the thumbnails of the selected files." msgstr "選択したファイルのサムネイルを表示するインデックス用の画像を生成します" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-crop.c:454 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "なし" + #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 msgid "Simple" msgstr "シンプル" @@ -1157,12 +1178,12 @@ msgstr "グラデーション(_G)" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 msgid "_Horizontal:" msgstr "水平方向(_H):" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 msgid "_Vertical:" msgstr "垂直方向(_V):" @@ -1183,17 +1204,17 @@ msgstr "色(_O):" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/rename_series/dlg-rename-series.c:63 +#: ../extensions/rename_series/dlg-rename-series.c:57 msgid "Text" msgstr "文字列" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 msgid "_Header:" -msgstr "ヘッダ(_H):" +msgstr "ヘッダー(_H):" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 msgid "Select a font" @@ -1201,51 +1222,51 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 msgid "_Footer:" -msgstr "フッタ(_F):" +msgstr "フッター(_F):" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 msgid "Caption:" msgstr "見出し:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 -#: ../extensions/image_print/data/ui/print-layout.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 msgid "The current page number" msgstr "現在のページ番号" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 msgid "The total number of pages" msgstr "ページの総数" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 #: ../extensions/importer/data/ui/import-preferences.ui.h:5 #: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 msgid "Special code" msgstr "特別な記号" #. translate only the text in the curly brackets #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:14 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 #, no-c-format msgid "%D{ format }" msgstr "%D{ フォーマット }" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 msgid "The current date" msgstr "今日の日付" @@ -1253,10 +1274,10 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 msgid "_Destination:" msgstr "格納場所(_D):" @@ -1267,7 +1288,7 @@ #: ../extensions/resize_images/data/ui/resize-images.ui.h:7 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 msgid "Choose destination folder" -msgstr "保存先のフォルダの選択" +msgstr "保存先のフォルダーの選択" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 @@ -1276,7 +1297,7 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 msgid "New enumerator digit" msgstr "通番の数字" @@ -1310,7 +1331,7 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 msgid "Columns:" msgstr "横に並べる数:" @@ -1333,7 +1354,7 @@ #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 msgid "Layout" msgstr "レイアウト" @@ -1341,7 +1362,7 @@ #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 msgid "S_ort:" -msgstr "並び替え(_O):" +msgstr "並べ替え(_O):" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 @@ -1365,43 +1386,43 @@ #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" -msgstr "イメージ・ウォール" +msgstr "イメージウォール" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:483 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:495 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:509 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 msgid "Could not save the theme" msgstr "テーマを保存できませんでした" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:654 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 msgid "Could not delete the theme" msgstr "テーマを削除できませんでした" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 msgid "Creating images" msgstr "画像の生成中" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 msgid "Generating thumbnails" msgstr "サムネイルの生成中" #: ../extensions/contact_sheet/gth-contact-sheet-theme.c:32 msgid "Header" -msgstr "ヘッダ" +msgstr "ヘッダー" #: ../extensions/contact_sheet/gth-contact-sheet-theme.c:33 msgid "Footer" -msgstr "フッタ" +msgstr "フッター" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:197 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 msgid "Theme Properties" msgstr "テーマのプロパティ" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:212 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 msgid "Copy _From" msgstr "他からコピー(_F)" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:348 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 msgid "New theme" msgstr "新しいテーマ" @@ -1437,18 +1458,18 @@ #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 #: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Use the original image folder" -msgstr "元の画像フォルダを使う(_U)" +msgstr "元の画像フォルダーを使う(_U)" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/dlg-convert-format.c:93 msgid "Converting images" msgstr "画像の変換中" -#: ../extensions/desktop_background/actions.c:203 +#: ../extensions/desktop_background/actions.c:162 msgid "Could not show the desktop background properties" msgstr "デスクトップの背景のプロパティを表示できませんでした" -#: ../extensions/desktop_background/actions.c:269 -#: ../extensions/desktop_background/actions.c:287 +#: ../extensions/desktop_background/actions.c:228 +#: ../extensions/desktop_background/actions.c:246 msgid "Could not set the desktop background" msgstr "デスクトップの背景にセットできませんでした" @@ -1465,38 +1486,38 @@ msgid "Desktop background" msgstr "デスクトップの背景" -#: ../extensions/edit_metadata/actions.c:129 +#: ../extensions/edit_metadata/actions.c:66 msgid "" "Are you sure you want to permanently delete the metadata of the selected " "files?" -msgstr "本当に選択したファイルのメタ・データを完全に消去しますか?" +msgstr "本当に選択したファイルのメタデータを完全に消去しますか?" -#: ../extensions/edit_metadata/actions.c:136 +#: ../extensions/edit_metadata/actions.c:73 msgid "If you delete the metadata, it will be permanently lost." msgstr "メタデータを削除すると元に戻すことはできません。" -#: ../extensions/edit_metadata/callbacks.c:108 +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "タグ(_A)" -#: ../extensions/edit_metadata/callbacks.c:112 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" msgstr "選択したファイルのコメントやその他の情報を編集します" -#: ../extensions/edit_metadata/callbacks.c:117 -msgid "Choose another tag" -msgstr "別のタグを選択します" +#: ../extensions/edit_metadata/callbacks.c:107 +msgid "Set the tags of the selected files" +msgstr "選択したファイルにタグを追加します" -#: ../extensions/edit_metadata/callbacks.c:121 +#: ../extensions/edit_metadata/callbacks.c:112 msgid "Delete Metadata" msgstr "メタデータの削除" -#: ../extensions/edit_metadata/callbacks.c:122 +#: ../extensions/edit_metadata/callbacks.c:113 msgid "Delete the comment and the embedded metadata of the selected files" msgstr "選択したファイルのコメントや埋め込まれているメタデータを削除します" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "説明(_E):" @@ -1518,12 +1539,12 @@ msgid "_Title:" msgstr "タイトル(_T):" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:63 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "ファイルのメタデータを保存できませんでした" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:150 -#: ../gthumb/gth-overwrite-dialog.c:166 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "ファイル情報を読み込めません" @@ -1535,54 +1556,61 @@ msgid "Allow to edit files metadata." msgstr "ファイルのメタデータを編集できるようにします" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:467 +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "%s のメタデータ" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d個のファイル" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +msgid "Sa_ve and Close" +msgstr "保存して閉じる(_V)" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "変更のある項目だけ保存する(_N)" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:547 msgid "No date" msgstr "日付なし" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:468 +#: ../extensions/edit_metadata/gth-edit-general-page.c:548 msgid "The following date" msgstr "指定する" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:469 -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "今日" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:471 +#: ../extensions/edit_metadata/gth-edit-general-page.c:551 msgid "Last modified date" -msgstr "最終修正日時" +msgstr "更新日時" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:472 +#: ../extensions/edit_metadata/gth-edit-general-page.c:552 msgid "File creation date" msgstr "ファイルの生成日" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:553 msgid "Do not modify" msgstr "変更しない" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:105 -msgid "Save only cha_nged fields" -msgstr "変更のある項目だけ保存する(_N)" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:161 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -msgid "%s Metadata" -msgstr "%s のメタデータ" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:165 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:332 -#, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d個のファイル" -msgstr[1] "%d個のファイル" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "新しいタグ" +msgid "%s Tags" +msgstr "%s タグ" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 msgid "Assign Tags" msgstr "タグの割当て" @@ -1605,7 +1633,7 @@ #: ../extensions/example/src/example.extension.in.in.h:2 msgid "Extension example." -msgstr "拡張機能のサンプルです" +msgstr "拡張機能のサンプルです。" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 msgid "C_opyright:" @@ -1654,7 +1682,7 @@ #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 msgid "State/Province:" -msgstr "都道府県:" +msgstr "州/県:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1708,64 +1736,64 @@ msgid "XMP Attached" msgstr "添付された XMP" -#: ../extensions/exiv2_tools/main.c:255 +#: ../extensions/exiv2_tools/main.c:256 msgid "date photo was taken" msgstr "撮影日" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" msgstr "共有する" #: ../extensions/facebook/callbacks.c:54 msgid "Face_book..." -msgstr "フェイスブック(_B)..." +msgstr "Facebook(_B)..." #: ../extensions/facebook/callbacks.c:55 msgid "Upload photos to Facebook" -msgstr "写真をフェイスブックへアップロードします" +msgstr "写真を Facebook へアップロードします" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 msgid "Export to Flickr" -msgstr "Flickr へのエキスポート" +msgstr "Flickr へのエクスポート" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 msgid "_Upload" msgstr "アップロード(_U)" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 msgid "_Account:" msgstr "アカウント(_A):" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 msgid "Edit accounts" msgstr "アカウントを編集します" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "A_lbum:" msgstr "アルバム(_L):" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "Add a new album" msgstr "新しいアルバムを追加します" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 msgid "Resize the images if larger than this size" -msgstr "次よりも大きい場合はサイズを変更する" +msgstr "これよりも大きい場合はサイズを変更する" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 msgid "_Resize to:" msgstr "サイズを変更する(_R):" @@ -1791,10 +1819,10 @@ #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 msgid "A_ccount:" msgstr "アカウント(_C):" @@ -1806,30 +1834,26 @@ msgid "A_ccounts:" msgstr "アカウントの一覧(_C):" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "_Visibility:" -msgstr "公開レベル(_V):" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -msgid "_Location:" -msgstr "場所(_L):" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 msgid "Public photos" msgstr "一般公開" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to friends" msgstr "プライベートな写真 (友人限定)" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 msgid "Private" msgstr "プライベート" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 +msgid "_Visibility:" +msgstr "公開レベル(_V):" + #: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 @@ -1837,9 +1861,9 @@ msgstr "認証する(_A)..." #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker_utils/flickr-authentication.c:435 -#: ../extensions/oauth/oauth-authentication.c:450 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 msgid "Once you're done, click the 'Continue' button below." msgstr "完了したら、この下にある [続行する] ボタンをクリックして下さい。" @@ -1854,40 +1878,40 @@ #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:1 msgid "Files successfully uploaded to the server." -msgstr "ファイルのサーバへのアップロードが完了しました。" +msgstr "ファイルのサーバーへのアップロードが完了しました。" #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:2 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1851 +#: ../extensions/webalbums/gth-web-exporter.c:1841 msgid "_Open in the Browser" -msgstr "ブラウザで開く(_O)" +msgstr "ブラウザーで開く(_O)" -#: ../extensions/facebook/dlg-export-to-facebook.c:128 -#: ../extensions/facebook/dlg-export-to-facebook.c:333 -#: ../extensions/facebook/facebook-authentication.c:219 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:234 -#: ../extensions/flicker_utils/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 #: ../extensions/photobucket/dlg-export-to-photobucket.c:376 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:377 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" -msgstr "サーバに接続できませんでした" +msgstr "サーバーに接続できませんでした" -#: ../extensions/facebook/dlg-export-to-facebook.c:180 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 msgid "Could not upload the files" msgstr "このファイルをアップロードできませんでした" -#: ../extensions/facebook/dlg-export-to-facebook.c:410 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 #: ../extensions/photobucket/dlg-export-to-photobucket.c:462 @@ -1895,113 +1919,112 @@ msgid "Could not create the album" msgstr "アルバムを作成できませんでした" -#: ../extensions/facebook/dlg-export-to-facebook.c:479 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 #: ../extensions/photobucket/dlg-export-to-photobucket.c:534 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 msgid "New Album" msgstr "新しいアルバム" -#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1816 +#: ../extensions/image_print/gth-image-print-job.c:1789 #: ../extensions/photobucket/dlg-export-to-photobucket.c:614 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 msgid "No valid file selected." msgstr "妥当なファイルを選択して下さい。" -#: ../extensions/facebook/dlg-export-to-facebook.c:559 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 #: ../extensions/photobucket/dlg-export-to-photobucket.c:615 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 msgid "Could not export the files" -msgstr "ファイルをエキスポートできませんでした" +msgstr "ファイルをエクスポートできませんでした" -#: ../extensions/facebook/dlg-export-to-facebook.c:567 -#: ../extensions/find_duplicates/gth-find-duplicates.c:284 -#: ../extensions/find_duplicates/gth-find-duplicates.c:376 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:255 +#: ../extensions/find_duplicates/gth-find-duplicates.c:347 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 #: ../extensions/photobucket/dlg-export-to-photobucket.c:623 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:800 -#: ../gthumb/gth-browser.c:990 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:1006 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d個のファイル (%s)" -msgstr[1] "%d個のファイル (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:589 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:590 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:643 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 #, c-format msgid "Export to %s" -msgstr "%s へのエキスポート" +msgstr "%s へのエクスポート" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:229 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:229 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:229 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "新しい認証..." -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker_utils/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." msgstr "アカウントの選択(_A)..." -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker_utils/flickr-authentication.c:434 -#: ../extensions/oauth/oauth-authentication.c:449 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 #, c-format msgid "" "Return to this window when you have finished the authorization process on %s" msgstr "%s の認証プロセスが完了したらこのウィンドウに戻って下さい" -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker_utils/flickr-authentication.c:514 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" msgstr "写真を %s へアップロードするには認証が必要です" -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker_utils/flickr-authentication.c:515 -#: ../extensions/oauth/oauth-authentication.c:530 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 #, c-format msgid "" "Click 'Authorize' to open your web browser and authorize gthumb to upload " "photos to %s. When you're finished, return to this window to complete the " "authorization." msgstr "" -"[認証する] をクリックしてウェブ・ブラウザを開き、写真を %s へアップロードする" +"[認証する] をクリックしてウェブブラウザーを開き、写真を %s へアップロードする" "ために認証を実施して下さい (完了したら、このウィンドウに戻って認証を完了させ" "て下さい)" -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker_utils/flickr-authentication.c:615 -#: ../extensions/oauth/oauth-authentication.c:632 +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:681 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "アカウントの選択" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker_utils/flickr-authentication.c:724 -#: ../extensions/oauth/oauth-authentication.c:741 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:742 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "アカウントの編集" -#: ../extensions/facebook/facebook-connection.c:304 -#: ../extensions/facebook/facebook-connection.c:464 -#: ../extensions/facebook/facebook-service.c:191 -#: ../extensions/facebook/facebook-service.c:294 -#: ../extensions/facebook/facebook-service.c:497 -#: ../extensions/flicker_utils/flickr-connection.c:295 -#: ../extensions/flicker_utils/flickr-connection.c:442 -#: ../extensions/flicker_utils/flickr-service.c:224 -#: ../extensions/flicker_utils/flickr-service.c:427 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:195 +#: ../extensions/flicker_utils/flickr-service.c:398 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2009,166 +2032,168 @@ msgid "Unknown error" msgstr "原因不明のエラー" -#: ../extensions/facebook/facebook-connection.c:339 -#: ../extensions/facebook/facebook-connection.c:490 -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-connection.c:321 -#: ../extensions/flicker_utils/flickr-connection.c:468 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 -#: ../extensions/picasaweb/google-connection.c:373 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" -msgstr "サーバへ接続中" +msgstr "サーバーへ接続中" #: ../extensions/facebook/facebook.extension.in.in.h:1 msgid "Facebook" -msgstr "フェイスブック" +msgstr "Facebook" #: ../extensions/facebook/facebook.extension.in.in.h:2 msgid "Upload images to Facebook" -msgstr "画像をフェイスブックへアップロードします" +msgstr "画像を Facebook へアップロードします" -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "アカウント情報の取得中" -#: ../extensions/facebook/facebook-service.c:425 -#: ../extensions/flicker_utils/flickr-service.c:352 -#: ../extensions/photobucket/photobucket-service.c:236 -#: ../extensions/picasaweb/picasa-web-service.c:238 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:209 msgid "Getting the album list" msgstr "アルバムの一覧の取得中" -#: ../extensions/facebook/facebook-service.c:554 -#: ../extensions/flicker_utils/flickr-service.c:455 -#: ../extensions/flicker_utils/flickr-service.c:575 -#: ../extensions/flicker_utils/flickr-service.c:613 -#: ../extensions/photobucket/photobucket-service.c:345 -#: ../extensions/picasaweb/picasa-web-service.c:329 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:426 +#: ../extensions/flicker_utils/flickr-service.c:546 +#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:300 msgid "Creating the new album" msgstr "新しいアルバムの生成中" -#: ../extensions/facebook/facebook-service.c:613 -#: ../extensions/flicker_utils/flickr-service.c:663 -#: ../extensions/photobucket/photobucket-service.c:402 -#: ../extensions/picasaweb/picasa-web-service.c:386 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:357 #, c-format msgid "Could not upload '%s': %s" msgstr "'%s' をアップロードできませんでした: %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:699 -#: ../extensions/flicker_utils/flickr-service.c:774 -#: ../extensions/photobucket/photobucket-service.c:459 -#: ../extensions/picasaweb/picasa-web-service.c:441 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:412 #, c-format msgid "Uploading '%s'" msgstr "'%s' のアップロード中" -#: ../extensions/facebook/facebook-service.c:915 -#: ../extensions/flicker_utils/flickr-service.c:943 -#: ../extensions/photobucket/photobucket-service.c:628 -#: ../extensions/picasaweb/picasa-web-service.c:634 +#: ../extensions/facebook/facebook-service.c:886 +#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:605 msgid "Uploading the files to the server" -msgstr "サーバにファイルのアップロード中" +msgstr "サーバーにファイルのアップロード中" -#: ../extensions/facebook/facebook-service.c:1032 -#: ../extensions/flicker_utils/flickr-service.c:1106 -#: ../extensions/picasaweb/picasa-web-service.c:747 +#: ../extensions/facebook/facebook-service.c:1003 +#: ../extensions/flicker_utils/flickr-service.c:1077 +#: ../extensions/picasaweb/picasa-web-service.c:718 msgid "Getting the photo list" msgstr "写真の一覧の取得中" -#: ../extensions/file_manager/actions.c:130 +#: ../extensions/file_manager/actions.c:133 msgid "New folder" -msgstr "新しいフォルダ" +msgstr "新しいフォルダー" -#: ../extensions/file_manager/actions.c:131 +#: ../extensions/file_manager/actions.c:134 msgid "Enter the folder name:" -msgstr "フォルダ名を入力して下さい: " +msgstr "フォルダー名を入力して下さい: " -#: ../extensions/file_manager/actions.c:397 +#: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:847 +#: ../extensions/file_manager/callbacks.c:842 msgid "Could not move the files" msgstr "ファイルを移動できませんでした" -#: ../extensions/file_manager/actions.c:398 +#: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:848 +#: ../extensions/file_manager/callbacks.c:843 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." msgstr "この場所にファイルを移動できませんが、コピーは可能です。" -#: ../extensions/file_manager/actions.c:555 +#: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "その場所をオープンできませんでした" -#: ../extensions/file_manager/actions.c:688 +#: ../extensions/file_manager/actions.c:696 msgid "" "The folder is not empty, do you want to delete the folder and its content " "permanently?" -msgstr "そのフォルダは空ですが、そのフォルダとその中身を完全に消去しますか?" +msgstr "" +"そのフォルダーは空ではありませんが、そのフォルダーとその中身を完全に消去しま" +"すか?" -#: ../extensions/file_manager/actions.c:704 +#: ../extensions/file_manager/actions.c:712 msgid "Could not delete the folder" -msgstr "フォルダを削除できませんでした" +msgstr "フォルダーを削除できませんでした" -#: ../extensions/file_manager/actions.c:765 +#: ../extensions/file_manager/actions.c:773 msgid "" "The folder cannot be moved to the Trash. Do you want to delete it " "permanently?" msgstr "" -"そのフォルダをゴミ箱へ移動できませんが、代わりにそれらを完全に消去しますか?" +"そのフォルダーをゴミ箱へ移動できませんが、代わりにそれらを完全に消去しますか?" -#: ../extensions/file_manager/actions.c:772 +#: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" -msgstr "フォルダをゴミ箱へ移動できませんでした" +msgstr "フォルダーをゴミ箱へ移動できませんでした" -#: ../extensions/file_manager/actions.c:808 -#: ../gthumb/gth-file-source-vfs.c:826 +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" -msgstr "本当に \"%s\" を完全に消去しますか?" +msgstr "本当に \"%s\" を完全に消去しますか?" -#: ../extensions/file_manager/actions.c:818 -#: ../gthumb/gth-file-source-vfs.c:839 +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "ファイルを削除すると元に戻すことはできません。" -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Move To" msgstr "移動先の選択" -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Copy To" msgstr "コピー先の選択" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Move" msgstr "移動する" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Copy" msgstr "コピーする" #: ../extensions/file_manager/callbacks.c:163 #: ../extensions/file_manager/callbacks.c:199 msgid "Create _Folder" -msgstr "フォルダの作成(_F)" +msgstr "フォルダーの作成(_F)" #: ../extensions/file_manager/callbacks.c:164 #: ../extensions/file_manager/callbacks.c:200 msgid "Create a new empty folder inside this folder" -msgstr "このフォルダの中に新しい空のフォルダを作成します" +msgstr "このフォルダーの中に新しい空のフォルダーを作成します" #: ../extensions/file_manager/callbacks.c:179 msgid "D_uplicate" @@ -2180,7 +2205,7 @@ #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 -#: ../gthumb/gth-file-source-vfs.c:800 +#: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" msgstr "ゴミ箱へ移動する(_V)" @@ -2200,7 +2225,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "ファイル名の変更(_R)" @@ -2210,11 +2235,11 @@ #: ../extensions/file_manager/callbacks.c:195 msgid "Open with the _File Manager" -msgstr "ファイル・マネージャで開く(_F)" +msgstr "ファイルマネージャーで開く(_F)" #: ../extensions/file_manager/callbacks.c:215 msgid "_Paste Into Folder" -msgstr "フォルダの中に貼り付け(_P)" +msgstr "フォルダーの中に貼り付け(_P)" #: ../extensions/file_manager/callbacks.c:227 #: ../extensions/file_manager/callbacks.c:236 @@ -2223,7 +2248,7 @@ #: ../extensions/file_manager/callbacks.c:228 msgid "Copy the selected folder to another folder" -msgstr "選択したフォルダを別のフォルダへコピーします" +msgstr "選択したフォルダーを別のフォルダーへコピーします" #: ../extensions/file_manager/callbacks.c:231 #: ../extensions/file_manager/callbacks.c:240 @@ -2232,29 +2257,29 @@ #: ../extensions/file_manager/callbacks.c:232 msgid "Move the selected folder to another folder" -msgstr "選択したフォルダを別のフォルダへ移動します" +msgstr "選択したフォルダーを別のフォルダーへ移動します" #: ../extensions/file_manager/callbacks.c:237 msgid "Copy the selected files to another folder" -msgstr "選択したファイルを別のフォルダへコピーします" +msgstr "選択したファイルを別のフォルダーへコピーします" #: ../extensions/file_manager/callbacks.c:241 msgid "Move the selected files to another folder" -msgstr "選択したファイルを別のフォルダへ移動します" +msgstr "選択したファイルを別のフォルダーへ移動します" -#: ../extensions/file_manager/callbacks.c:1009 -#: ../extensions/find_duplicates/gth-find-duplicates.c:610 -#: ../gthumb/gth-browser.c:4945 ../gthumb/gth-browser.c:4979 +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:581 +#: ../gthumb/gth-browser.c:5015 ../gthumb/gth-browser.c:5049 msgid "Could not perform the operation" msgstr "処理を実行できませんでした" #: ../extensions/file_manager/file_manager.extension.in.in.h:1 msgid "File manager" -msgstr "ファイル・マネージャ" +msgstr "ファイルマネージャー" #: ../extensions/file_manager/file_manager.extension.in.in.h:2 msgid "File manager operations." -msgstr "ファイル・マネージャの操作を提供します" +msgstr "ファイルマネージャーの操作を提供します" #: ../extensions/file_manager/gth-delete-task.c:62 msgid "Deleting files" @@ -2305,10 +2330,10 @@ msgid "_Position:" msgstr "位置(_P):" -#. this is used to separate the dimensions, for example: 120 × 250 +#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "×" -msgstr "×" +msgid "×" +msgstr "×" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 msgid "_Grid:" @@ -2349,7 +2374,7 @@ #: ../extensions/file_tools/data/ui/crop-options.ui.h:15 msgid "C_rop" -msgstr "切りつめる(_R)" +msgstr "切り抜く(_R)" #: ../extensions/file_tools/data/ui/resize-options.ui.h:1 #: ../extensions/resize_images/data/ui/resize-images.ui.h:3 @@ -2391,7 +2416,7 @@ msgstr "新しい寸法:" #: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -#: ../extensions/image_print/data/ui/print-layout.ui.h:1 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "ピクセル" @@ -2475,10 +2500,10 @@ #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 msgid "Crop borders" -msgstr "境界線を切り詰める" +msgstr "境界線で切り抜く" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 msgid "_Preview:" msgstr "プレビュー(_P):" @@ -2502,210 +2527,210 @@ msgid "Basic tools to modify images." msgstr "画像を変更するための基本ツールを提供します" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors..." msgstr "色の調整...." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors" msgstr "色の調整" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:528 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 msgid "Change brightness, contrast, saturation and gamma level of the image" -msgstr "画像の輝度やコントラスト、彩度、ガンマ・レベルを変更します" +msgstr "画像の輝度やコントラスト、彩度、ガンマレベルを変更します" -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 msgid "Square" msgstr "矩形" -#: ../extensions/file_tools/gth-file-tool-crop.c:423 -#: ../extensions/file_tools/gth-file-tool-resize.c:494 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:499 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (画像)" -#: ../extensions/file_tools/gth-file-tool-crop.c:426 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:503 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (画面)" -#: ../extensions/file_tools/gth-file-tool-crop.c:430 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:508 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:431 -#: ../extensions/file_tools/gth-file-tool-resize.c:504 +#: ../extensions/file_tools/gth-file-tool-crop.c:433 +#: ../extensions/file_tools/gth-file-tool-resize.c:509 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD や書籍)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:505 +#: ../extensions/file_tools/gth-file-tool-crop.c:434 +#: ../extensions/file_tools/gth-file-tool-resize.c:510 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:506 +#: ../extensions/file_tools/gth-file-tool-crop.c:435 +#: ../extensions/file_tools/gth-file-tool-resize.c:511 msgid "3:2 (Postcard)" msgstr "3:2 (はがき)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:507 +#: ../extensions/file_tools/gth-file-tool-crop.c:436 +#: ../extensions/file_tools/gth-file-tool-resize.c:512 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:437 +#: ../extensions/file_tools/gth-file-tool-resize.c:513 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:438 +#: ../extensions/file_tools/gth-file-tool-resize.c:514 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:439 +#: ../extensions/file_tools/gth-file-tool-resize.c:515 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 -#: ../extensions/rename_series/gth-template-selector.c:260 +#: ../extensions/file_tools/gth-file-tool-crop.c:440 +#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "指定する" -#: ../extensions/file_tools/gth-file-tool-crop.c:449 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:455 +#: ../extensions/file_tools/gth-file-tool-rotate.c:416 msgid "Rule of Thirds" msgstr "1/3 の規則" -#: ../extensions/file_tools/gth-file-tool-crop.c:450 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:456 +#: ../extensions/file_tools/gth-file-tool-rotate.c:417 msgid "Golden Sections" msgstr "黄金分割" -#: ../extensions/file_tools/gth-file-tool-crop.c:451 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:457 +#: ../extensions/file_tools/gth-file-tool-rotate.c:418 msgid "Center Lines" msgstr "中央線" -#: ../extensions/file_tools/gth-file-tool-crop.c:452 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:458 +#: ../extensions/file_tools/gth-file-tool-rotate.c:419 msgid "Uniform" msgstr "均一" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop..." -msgstr "切りつめ..." +msgstr "切り抜き..." -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop" -msgstr "切りつめ" +msgstr "切り抜き" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:65 -#: ../extensions/file_tools/gth-file-tool-negative.c:65 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 msgid "Applying changes" msgstr "変更点の適用中" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:189 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 msgid "Desaturate" msgstr "脱色" -#: ../extensions/file_tools/gth-file-tool-enhance.c:116 +#: ../extensions/file_tools/gth-file-tool-enhance.c:119 msgid "White balance correction" -msgstr "ホワイト・バランスの補正中" +msgstr "ホワイトバランスの補正中" -#: ../extensions/file_tools/gth-file-tool-enhance.c:339 +#: ../extensions/file_tools/gth-file-tool-enhance.c:342 msgid "Enhance Colors" msgstr "色を鮮やかにする" -#: ../extensions/file_tools/gth-file-tool-enhance.c:340 +#: ../extensions/file_tools/gth-file-tool-enhance.c:343 msgid "Automatic white balance correction" -msgstr "自動的にホワイト・バランスを補正します" +msgstr "自動的にホワイトバランスを補正します" -#: ../extensions/file_tools/gth-file-tool-equalize.c:83 +#: ../extensions/file_tools/gth-file-tool-equalize.c:86 msgid "Equalizing image histogram" msgstr "画像のヒストグラムの均一化中" -#: ../extensions/file_tools/gth-file-tool-equalize.c:261 +#: ../extensions/file_tools/gth-file-tool-equalize.c:275 msgid "Equalize" msgstr "均一化" -#: ../extensions/file_tools/gth-file-tool-equalize.c:262 +#: ../extensions/file_tools/gth-file-tool-equalize.c:276 msgid "Equalize image histogram" msgstr "画像のヒストグラムを均一にします" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "ひっくり返す" -#: ../extensions/file_tools/gth-file-tool-flip.c:74 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 msgid "Flip the image vertically" msgstr "画像を垂直方向にひっくり返します" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "ミラーリング" -#: ../extensions/file_tools/gth-file-tool-mirror.c:74 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 msgid "Mirror the image horizontally" msgstr "画像を水平方向に写像します" -#: ../extensions/file_tools/gth-file-tool-negative.c:183 +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "ネガティブ" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "やり直す" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize..." msgstr "サイズの変更..." -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize" msgstr "サイズの変更..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate..." msgstr "回転する..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate" msgstr "回転する" -#: ../extensions/file_tools/gth-file-tool-rotate.c:597 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Freely rotate the image" msgstr "画像を自在に回転します" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "反時計回りに回転する" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 msgid "Rotate the image by 90 degrees counterclockwise" msgstr "画像を反時計回りに90°回転します" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "時計回りに回転する" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 msgid "Rotate the image by 90 degrees clockwise" msgstr "画像を時計回りに90°回転します" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "別名で保存する" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "保存する" @@ -2713,15 +2738,15 @@ msgid "Sharpening image" msgstr "画像の鮮明化" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus..." msgstr "焦点を合わせる..." -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus" msgstr "焦点を合わせる" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "元に戻す" @@ -2731,11 +2756,11 @@ #: ../extensions/find_duplicates/callbacks.c:49 msgid "Find duplicated files in the current location" -msgstr "現在のフォルダで重複しているファイルを検索します" +msgstr "現在のフォルダーで重複しているファイルを検索します" #: ../extensions/find_duplicates/data/ui/find-duplicates-choose-folders.ui.h:1 msgid "_Folders:" -msgstr "フォルダの一覧(_F):" +msgstr "フォルダーの一覧(_F):" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 msgid "Search for Duplicates" @@ -2750,7 +2775,7 @@ msgstr "ファイルの一覧:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -#: ../gthumb/gth-browser-actions-entries.h:32 +#: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "表示(_V)" @@ -2764,14 +2789,14 @@ msgstr "重複したファイルの検索" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "開始(_A):" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" -msgstr "フィルタ(_F):" +msgstr "フィルター(_F):" #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:2 msgid "Find duplicated files." @@ -2787,7 +2812,7 @@ #: ../extensions/find_duplicates/gth-find-duplicates.c:55 msgid "by folder..." -msgstr "フォルダ順..." +msgstr "フォルダー順..." #: ../extensions/find_duplicates/gth-find-duplicates.c:56 msgid "all files" @@ -2797,44 +2822,42 @@ msgid "no file" msgstr "なし" -#: ../extensions/find_duplicates/gth-find-duplicates.c:426 -#: ../extensions/find_duplicates/gth-find-duplicates.c:521 +#: ../extensions/find_duplicates/gth-find-duplicates.c:397 +#: ../extensions/find_duplicates/gth-find-duplicates.c:492 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d個あり" -msgstr[1] "%d個あり" -#: ../extensions/find_duplicates/gth-find-duplicates.c:565 +#: ../extensions/find_duplicates/gth-find-duplicates.c:536 msgid "Search completed" msgstr "検索が完了しました" -#: ../extensions/find_duplicates/gth-find-duplicates.c:577 +#: ../extensions/find_duplicates/gth-find-duplicates.c:548 msgid "Searching for duplicates" msgstr "検索中です" -#: ../extensions/find_duplicates/gth-find-duplicates.c:580 +#: ../extensions/find_duplicates/gth-find-duplicates.c:551 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format msgid "%d file remaining" msgid_plural "%d files remaining" msgstr[0] "残り%d個" -msgstr[1] "残り%d個" -#: ../extensions/find_duplicates/gth-find-duplicates.c:663 +#: ../extensions/find_duplicates/gth-find-duplicates.c:634 msgid "Getting the file list" msgstr "ファイルの一覧の取得中" -#: ../extensions/find_duplicates/gth-find-duplicates.c:769 +#: ../extensions/find_duplicates/gth-find-duplicates.c:740 msgid "Duplicates" msgstr "重複しているファイル" -#: ../extensions/find_duplicates/gth-find-duplicates.c:1023 +#: ../extensions/find_duplicates/gth-find-duplicates.c:997 msgid "Select" msgstr "選択" -#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:63 +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "Flickr(_F)..." @@ -2842,7 +2865,7 @@ msgid "Download photos from Flickr" msgstr "写真を Flickr からダウンロードします" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "写真を Flickr へアップロードします" @@ -2855,13 +2878,13 @@ msgstr "画像を Flickr へアップロードします" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "空き容量:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "フォトセット(_O):" @@ -2901,45 +2924,45 @@ msgid "Restricted content" msgstr "制限ありのコンテンツ" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "_Import" msgstr "インポート(_I)" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:357 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:827 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "写真の一覧を取得できませんでした" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:394 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:559 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:861 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1024 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 msgid "No album selected" msgstr "アルバムが選択されていません" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:577 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 #, c-format msgid "Import from %s" msgstr "%s からのインポート" -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1118 -#: ../gthumb/gth-browser.c:2008 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 +#: ../gthumb/gth-browser.c:2019 msgid "Could not save the file" msgstr "ファイルを保存できませんでした" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "スクリーンショットを撮れませんでした" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1266 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 msgid "Save Image" msgstr "画像の保存" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Screenshot" @@ -2949,7 +2972,7 @@ msgstr "遅くします" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:656 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 msgid "Play" msgstr "再生します" @@ -2961,30 +2984,23 @@ msgid "Time:" msgstr "時間:" -#. this is an empty time -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 msgid "--:--" msgstr "--:--" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 -msgctxt "time" -msgid "/" -msgstr "/" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:9 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Toggle volume" msgstr "ミュートを ON/OFF します" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 msgid "Change volume level" msgstr "音量のレベルを変更します" #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 -#: ../extensions/photo_importer/dlg-photo-importer.c:614 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" -msgstr "フォルダの選択" +msgstr "フォルダーの選択" #: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:1 msgid "Audio/Video support" @@ -2994,29 +3010,29 @@ msgid "Play audio and video files." msgstr "オーディオや動画ファイルを再生します" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:93 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "スクリーンショット" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:94 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "スクリーンショットを撮ります" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:633 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 msgid "Playing video" msgstr "動画を再生します" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:646 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Pause" msgstr "一時停止します" #: ../extensions/gstreamer_tools/main.c:31 -#: ../gthumb/gth-main-default-tests.c:211 +#: ../gthumb/gth-main-default-tests.c:247 msgid "Video" msgstr "動画" #: ../extensions/gstreamer_tools/main.c:32 -#: ../gthumb/gth-main-default-tests.c:218 +#: ../gthumb/gth-main-default-tests.c:254 msgid "Audio" msgstr "オーディオ" @@ -3035,7 +3051,7 @@ #: ../extensions/gstreamer_tools/main.c:42 msgid "Encoder" -msgstr "エンコーダ" +msgstr "エンコーダー" #: ../extensions/gstreamer_tools/main.c:44 #: ../extensions/gstreamer_tools/main.c:49 @@ -3047,13 +3063,13 @@ msgstr "フレームレート" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_viewer/gth-image-viewer-page.c:222 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "幅" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:28 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "高さ" @@ -3075,10 +3091,10 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1318 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 #: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:429 -#: ../extensions/webalbums/gth-web-exporter.c:2456 +#: ../extensions/webalbums/dlg-web-exporter.c:442 +#: ../extensions/webalbums/gth-web-exporter.c:2446 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3091,96 +3107,96 @@ msgid "Print the selected images" msgstr "選択した画像を印刷します" -#: ../extensions/image_print/data/ui/print-layout.ui.h:2 -msgid "millimeters" -msgstr "ミリ" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -msgid "inches" -msgstr "インチ" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 msgid "Centered" msgstr "中央に配置する" -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/image_print/data/ui/print-layout.ui.h:13 msgid "The total number of files" msgstr "ファイルの総数" -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +#: ../extensions/image_print/data/ui/print-layout.ui.h:14 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 msgid "The event description" msgstr "イベント名" -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 msgid "_Rows:" msgstr "縦に並べる数(_R):" -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 msgid "Image" msgstr "画像" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 msgid "Position:" msgstr "位置:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:21 msgid "Left" msgstr "左側" -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "上側" -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 msgid "Rotation:" msgstr "回転:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:30 +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "単位:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/image_print/data/ui/print-layout.ui.h:28 msgid "Preview" msgstr "プレビュー" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Fonts" -msgstr "フォント" +#: ../extensions/image_print/data/ui/print-layout.ui.h:30 +msgid "millimeters" +msgstr "ミリ" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "インチ" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 msgid "Select Caption Font" msgstr "見出しのフォント" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" -msgstr "ヘッダのフォント" +msgstr "ヘッダーのフォント" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 msgid "Select Footer Font" -msgstr "フッタのフォント" +msgstr "フッターのフォント" -#: ../extensions/image_print/gth-image-print-job.c:997 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "フォント" + +#: ../extensions/image_print/gth-image-print-job.c:971 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "%d / %d ページ" -#: ../extensions/image_print/gth-image-print-job.c:1761 -#: ../extensions/image_print/gth-image-print-job.c:1888 -#: ../extensions/image_print/gth-image-print-job.c:1925 +#: ../extensions/image_print/gth-image-print-job.c:1734 +#: ../extensions/image_print/gth-image-print-job.c:1861 +#: ../extensions/image_print/gth-image-print-job.c:1898 msgid "Could not print" msgstr "印刷できませんでした" -#: ../extensions/image_print/gth-image-print-job.c:1823 -#: ../gthumb/gth-main-default-tests.c:204 +#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "画像" -#: ../extensions/image_print/gth-image-print-job.c:1890 -#: ../gthumb/gth-image-loader.c:233 ../gthumb/gth-image-loader.c:306 +#: ../extensions/image_print/gth-image-print-job.c:1863 +#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 msgid "No suitable loader available for this file type" -msgstr "この種類のファイルに対して利用できる妥当なローダはありません" +msgstr "この種類のファイルに対して利用できる妥当なローダーはありません" #. translators: %s is a filename #: ../extensions/image_print/gth-load-image-info-task.c:164 @@ -3189,7 +3205,7 @@ msgstr "\"%s\" の読み込み中" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2695 +#: ../extensions/webalbums/gth-web-exporter.c:2685 msgid "Loading images" msgstr "画像の読み込み中" @@ -3201,7 +3217,7 @@ msgid "Allow to print images choosing the page layout." msgstr "ページのレイアウトを選択しながら画像を印刷できるようにします" -#: ../extensions/image_print/preferences.c:76 +#: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "印刷" @@ -3209,30 +3225,30 @@ msgid "Rotate the selected images 90° to the right" msgstr "選択した画像を時計回りに90°回転します" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" msgstr "選択した画像を反時計回りに90°回転します" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "物理的に回転する" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" msgstr "選択した画像を埋め込まれた EXIF の向き情報に従って回転します" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" msgstr "EXIF の向き情報のリセット" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" -msgstr "画像を回転させずに埋め込まれた EXIF の向き情報にリセットします" +msgstr "画像を回転させずに埋め込まれた EXIF の向き情報をリセットします" #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2349 -#: ../extensions/webalbums/gth-web-exporter.c:2433 +#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "画像の保存中" @@ -3244,12 +3260,12 @@ msgid "Rotate images without data loss." msgstr "品質を維持したまま画像を回転します" -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "画像を変換する際に問題が発生しました: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" "This transformation may introduce small image distortions along one or more " "edges, because the image dimensions are not multiples of 8.\n" @@ -3272,141 +3288,141 @@ "際の使用では、このモードは最良の結果を提供してくれますが、変換についてはそれ" "ほど厳しく品質を維持するようなことはしていません。" -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" msgstr "角度(_T)" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "歪みを受け入れる(_A)" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "" -"Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, " -"fit-width, fit-width-if-larger." -msgstr "" -"設定可能な値: actual-size、keep-prev、fit-size、fit-size-if-larger、fit-" -"width、fit-width-if-larger" - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -msgid "Whether to resize the window to fit the size of the image" -msgstr "画像のサイズに合わせてウィンドウの大きさを変更するかどうかです。" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "画像を読み込んだ後:" +msgid "Set to actual size" +msgstr "オリジナルのサイズにする" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 +msgid "Keep previous zoom" +msgstr "前と同じ拡大率にする" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 +msgid "Fit to window" +msgstr "ウィンドウに合わせる" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "ウィンドウサイズよりも大きい場合はウィンドウに合わせる" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 +msgid "Fit to width" +msgstr "幅に合わせる" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +msgid "Fit to width if larger" +msgstr "ウィンドウサイズよりも大きい場合は幅に合わせる" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 msgid "Reset scrollbar positions" msgstr "スクロールバーの位置をリセットする" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "画像を読み込んだ後:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 +msgid "_Zoom quality:" +msgstr "ズーム時の品質(_Z):" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 msgid "Transparency _type:" msgstr "透明な背景の種類(_T):" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 -msgid "_Zoom quality:" -msgstr "ズーム時の品質(_Z)" - -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 msgid "High" msgstr "高品質" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 msgid "Low" msgstr "低品質" -#: ../extensions/image_viewer/gth-image-histogram.c:74 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "白色" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "黒色" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "格子縞" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "ヒストグラム" -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 msgid "Copy Image" msgstr "画像のコピー" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 msgid "Copy the image to the clipboard" msgstr "画像をコピーしてクリップボードに格納します" -#: ../extensions/image_viewer/gth-image-viewer-page.c:197 +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 msgid "Paste Image" msgstr "画像の貼り付け" -#: ../extensions/image_viewer/gth-image-viewer-page.c:198 +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 msgid "Paste the image from the clipboard" msgstr "クリップボードから画像を貼り付けます" -#: ../extensions/image_viewer/gth-image-viewer-page.c:202 +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "拡大" -#: ../extensions/image_viewer/gth-image-viewer-page.c:203 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "この画像を拡大します" -#: ../extensions/image_viewer/gth-image-viewer-page.c:207 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "縮小" -#: ../extensions/image_viewer/gth-image-viewer-page.c:208 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "この画像を縮小します" -#: ../extensions/image_viewer/gth-image-viewer-page.c:212 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:213 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "実サイズで表示します" -#: ../extensions/image_viewer/gth-image-viewer-page.c:217 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "フィット" -#: ../extensions/image_viewer/gth-image-viewer-page.c:218 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "ウィンドウに合わせてズームします" -#: ../extensions/image_viewer/gth-image-viewer-page.c:223 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "ウィンドウの幅に合わせてズームします" -#: ../extensions/image_viewer/gth-image-viewer-page.c:230 -msgid "_Fit Window to Image" -msgstr "画像に合わせる(_F)" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:231 -msgid "Resize the window to the size of the image" -msgstr "画像のサイズに合わせてウィンドウの大きさを変更します" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 msgid "Image viewer" -msgstr "画像ビューア" +msgstr "画像ビューアー" #: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Basic image viewing." -msgstr "画像の基本的なビューア機能です" - -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "オリジナルのサイズにする" +msgstr "画像の基本的なビューアー機能です" -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "幅に合わせる" - -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" -msgstr "ビューア" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "設定可能な値: none、file_date、current_date" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "設定可能な値: yyyymmdd、yyyymm、yyyy" +msgstr "ビューアー" #: ../extensions/importer/data/ui/import-preferences.ui.h:1 msgid "_Destination" @@ -3414,11 +3430,11 @@ #: ../extensions/importer/data/ui/import-preferences.ui.h:2 msgid "_Automatic subfolder" -msgstr "自動的にサブフォルダを作成する(_A)" +msgstr "自動的にサブフォルダーを作成する(_A)" #: ../extensions/importer/data/ui/import-preferences.ui.h:3 msgid "as _single subfolder" -msgstr "単一のサブフォルダにする(_S)" +msgstr "単一のサブフォルダーにする(_S)" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 msgid "The year" @@ -3444,41 +3460,41 @@ msgid "The seconds" msgstr "秒" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "格納場所が間違っています" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "例: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:326 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "ファイルの日付" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:336 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "年/月/日" -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "年/月" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "年" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "次の形式にする" #: ../extensions/importer/gth-import-task.c:442 #: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:643 +#: ../extensions/importer/gth-import-task.c:648 msgid "Importing files" msgstr "ファイルのインポート中" @@ -3490,25 +3506,25 @@ msgid "The selected files are already present in the destination." msgstr "選択したファイルは既に格納場所に存在していました。" -#: ../extensions/importer/gth-import-task.c:619 -#: ../gthumb/gth-file-source-vfs.c:685 +#: ../extensions/importer/gth-import-task.c:622 +#: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "このファイルを削除できませんでした" -#: ../extensions/importer/gth-import-task.c:620 +#: ../extensions/importer/gth-import-task.c:623 msgid "Delete operation not supported." msgstr "削除の操作はサポートしていません。" -#: ../extensions/importer/gth-import-task.c:704 +#: ../extensions/importer/gth-import-task.c:709 msgid "Last imported" msgstr "最後のインポート" -#: ../extensions/importer/gth-import-task.c:839 +#: ../extensions/importer/gth-import-task.c:815 msgid "No file specified." msgstr "ファイルが指定されていません。" #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:876 +#: ../extensions/importer/gth-import-task.c:852 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3517,17 +3533,15 @@ "'%s' の空き容量が十分ではありません。\n" "%s の空きが必要ですが実際には %s しかありません。" -#: ../extensions/list_tools/callbacks.c:65 ../gthumb/gth-filterbar.c:303 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 msgid "Personalize..." msgstr "指定する..." -#: ../extensions/list_tools/callbacks.c:238 -#: ../extensions/list_tools/callbacks.c:249 +#: ../extensions/list_tools/callbacks.c:320 msgid "Tools" msgstr "ツール" -#: ../extensions/list_tools/callbacks.c:240 -#: ../extensions/list_tools/callbacks.c:251 +#: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" msgstr "指定したツールを使って複数のファイルを一括処理します" @@ -3553,7 +3567,7 @@ #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 msgid "_Terminal command (shell script)" -msgstr "端末から実行する (SHELL スクリプト)" +msgstr "端末から実行する (シェルスクリプト)(_T)" #: ../extensions/list_tools/data/ui/script-editor.ui.h:5 msgid "Sh_ortcut:" @@ -3573,7 +3587,7 @@ #: ../extensions/list_tools/data/ui/script-editor.ui.h:9 msgid "The parent folder path" -msgstr "親フォルダのパス" +msgstr "親フォルダーのパス" #. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:14 @@ -3592,7 +3606,7 @@ msgstr "%attr{ 属性名 }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:19 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:24 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 msgid "A file attribute" msgstr "ファイルの属性" @@ -3637,7 +3651,7 @@ msgstr "ショートカット" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "表示する" @@ -3655,34 +3669,34 @@ #: ../extensions/list_tools/dlg-personalize-scripts.c:461 msgid "Are you sure you want to delete the selected command?" -msgstr "本当に選択したコマンドを削除しますか?" +msgstr "本当に選択したコマンドを削除しますか?" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" msgstr "値の入力:" -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:570 -#: ../extensions/webalbums/gth-web-exporter.c:582 -#: ../extensions/webalbums/gth-web-exporter.c:590 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:560 +#: ../extensions/webalbums/gth-web-exporter.c:572 +#: ../extensions/webalbums/gth-web-exporter.c:580 msgid "Malformed command" msgstr "コマンドがおかしいです" -#: ../extensions/list_tools/gth-script-editor-dialog.c:176 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "なし" -#: ../extensions/list_tools/gth-script-editor-dialog.c:182 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "テンキーの %d キー" -#: ../extensions/list_tools/gth-script-editor-dialog.c:325 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "コマンドが指定されていません。" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "コマンドが %d のステータスを返して異常終了しました" @@ -3695,33 +3709,33 @@ msgid "Scripting and batch manipulation of files." msgstr "ファイルのスクリプト処理やバッチ処理を提供します" -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "S" msgstr "S" -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "N" msgstr "N" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "W" msgstr "W" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "E" msgstr "E" -#: ../extensions/map_view/gth-map-view.c:196 +#: ../extensions/map_view/gth-map-view.c:205 #: ../extensions/map_view/map_view.extension.in.in.h:1 msgid "Map" msgstr "Map" #. No GPS label -#: ../extensions/map_view/gth-map-view.c:265 +#: ../extensions/map_view/gth-map-view.c:276 msgid "The geographical position information is not available for this image." msgstr "この画像では地理的な位置情報は利用できません" @@ -3737,42 +3751,42 @@ msgid "Upload photos to Photobucket" msgstr "写真を Photobucket へアップロードします" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -msgid "_Scramble filenames" -msgstr "ランダムなファイル名にする(_S)" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 msgid "Tiny ( 100 x 75 )" msgstr "極小 ( 100 x 75 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 msgid "Small ( 160 x 120 )" msgstr "小さい ( 160 x 120 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 msgid "Medium ( 320 x 240 )" msgstr "中ぐらい ( 320 x 240 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 msgid "Large ( 640 x 480 )" msgstr "大きい ( 640 x 480 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 msgid "15ʺ screen ( 800 x 600 )" msgstr "15ʺ の画面 ( 800 x 600 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 msgid "17ʺ screen ( 1024 x 768 )" msgstr "17ʺ の画面 ( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 #: ../extensions/photobucket/dlg-export-to-photobucket.c:297 msgid "1 megabyte file size" msgstr "1 Mバイトのファイル" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +msgid "_Scramble filenames" +msgstr "ランダムなファイル名にする(_S)" + #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" -msgstr "コンテナ(_C):" +msgstr "コンテナー(_C):" #: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Tiny ( 100 × 75 )" @@ -3816,33 +3830,33 @@ #: ../extensions/photo_importer/callbacks.c:52 msgid "_Removable Device..." -msgstr "リムーバブル・デバイス(_R)..." +msgstr "リムーバブルデバイス(_R)..." #: ../extensions/photo_importer/callbacks.c:53 msgid "Import photos and other files from a removable device" -msgstr "リムーバブル・デバイスから写真などをダウンロードします" +msgstr "リムーバブルデバイスから写真などをダウンロードします" #: ../extensions/photo_importer/callbacks.c:56 msgid "F_older..." -msgstr "フォルダ(_O)..." +msgstr "フォルダー(_O)..." #: ../extensions/photo_importer/callbacks.c:57 msgid "Import photos and other files from a folder" -msgstr "フォルダから写真やその他のファイルをインポートします" +msgstr "フォルダーから写真やその他のファイルをインポートします" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "デバイスからインポートした後:" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 msgid "_Rotate the images physically" msgstr "画像を物理的に回転する(_R)" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "デバイスからインポートした後:" + #. view label #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../gthumb/gth-filterbar.c:413 +#: ../gthumb/gth-filterbar.c:414 msgid "S_how:" -msgstr "フィルタ(_H):" +msgstr "フィルター(_H):" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 msgid "_Tags:" @@ -3856,37 +3870,37 @@ msgid "_Delete the imported files from the source" msgstr "インポートした画像をソースから削除する(_D)" -#: ../extensions/photo_importer/dlg-photo-importer.c:222 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:173 +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 msgid "Could not import the files" msgstr "ファイルをインポートできませんでした" #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:294 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "インポートするファイル数: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:334 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" -msgstr "フォルダを読み込めませんでした" +msgstr "フォルダーを読み込めませんでした" -#: ../extensions/photo_importer/dlg-photo-importer.c:364 -#: ../gthumb/gth-browser.c:1921 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:1932 msgid "Getting folder listing..." -msgstr "フォルダの一覧を取得してます..." +msgstr "フォルダーの一覧を取得しています..." -#: ../extensions/photo_importer/dlg-photo-importer.c:410 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "空です" -#: ../extensions/photo_importer/dlg-photo-importer.c:580 +#: ../extensions/photo_importer/dlg-photo-importer.c:586 msgid "Import from Removable Device" -msgstr "リムーバブル・デバイスからのインポート" +msgstr "リムーバブルデバイスからのインポート" -#: ../extensions/photo_importer/dlg-photo-importer.c:612 +#: ../extensions/photo_importer/dlg-photo-importer.c:618 msgid "Import from Folder" -msgstr "フォルダからのインポート" +msgstr "フォルダーからのインポート" #: ../extensions/photo_importer/photo_importer.extension.in.in.h:1 msgid "Import photos" @@ -3894,40 +3908,40 @@ #: ../extensions/photo_importer/photo_importer.extension.in.in.h:2 msgid "Import photos from removable devices." -msgstr "リムーバブル・デバイスから写真をインポートします" +msgstr "リムーバブルデバイスから写真をインポートします" #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." -msgstr "Picasa ウェブ・アルバム(_P)..." +msgstr "Picasa ウェブアルバム(_P)..." #: ../extensions/picasaweb/callbacks.c:60 msgid "Download photos from Picasa Web Album" -msgstr "写真を Picasa ウェブ・アルバムからダウンロードします" +msgstr "写真を Picasa ウェブアルバムからダウンロードします" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" -msgstr "写真を Picasa ウェブ・アルバムへアップロードします" +msgstr "写真を Picasa ウェブアルバムへアップロードします" #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" -msgstr "Picasa ウェブ・アルバムへのエキスポート" +msgstr "Picasa ウェブアルバムへのエクスポート" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "アルバムの一覧(_A):" #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 msgid "Import from Picasa Web Album" -msgstr "Picasa ウェブ・アルバムからのインポート" +msgstr "Picasa ウェブアルバムからのインポート" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 msgid "_Album:" msgstr "アルバム(_A):" #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 msgid "_E-Mail:" -msgstr "E-メール:" +msgstr "E-メール(_E):" #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 msgid "" @@ -3945,43 +3959,31 @@ msgstr "一般公開" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:307 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "アルバムの一覧を取得できませんでした" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:391 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" -msgstr "Picasa ウェブ・アルバム" +msgstr "Picasa ウェブアルバム" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:478 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "アカウント" -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:133 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 msgid "Could not load the file" msgstr "ファイルを読み込めませんでした" #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 msgid "Picasa Web Albums" -msgstr "Picasa ウェブ・アルバム" +msgstr "Picasa ウェブアルバム" #: ../extensions/picasaweb/picasaweb.extension.in.in.h:2 msgid "Upload images to Picasa Web Albums" -msgstr "画像を Picasa のウェブ・アルバムへアップロードします" - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: jpeg, jpg." -msgstr "指定可能な値: jpeg、jpg" - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:2 -msgid "Possible values are: tiff, tif." -msgstr "指定可能な値: tiff、tif" - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:3 -msgid "Possible values are: none, deflate, jpeg." -msgstr "指定可能な値: none、deflate、jpeg" +msgstr "画像を Picasa のウェブアルバムへアップロードします" #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 @@ -3989,20 +3991,20 @@ msgstr "デフォルトの拡張子(_D):" #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "Opti_mize" -msgstr "最適化する(_M)" +msgid "_Quality:" +msgstr "品質の度合い(_Q):" #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "プログレッシブを有効にする(_P)" +msgid "_Smoothing:" +msgstr "平滑化の度合い(_S):" #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "_Quality:" -msgstr "品質の度合い(_Q):" +msgid "Opti_mize" +msgstr "最適化する(_M)" #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Smoothing:" -msgstr "平滑化の度合い(_S):" +msgid "_Progressive" +msgstr "プログレッシブを有効にする(_P)" #: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 msgid "Compression _level:" @@ -4017,47 +4019,47 @@ msgstr "RLE で圧縮する(_R)" #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "Compression" -msgstr "圧縮" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 msgid "_No compression" msgstr "圧縮しない(_N)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 msgid "No_rmal (Deflate)" msgstr "標準(収縮)(_R)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 msgid "_Loss compression (JPEG)" msgstr "低圧縮(JPEG)(_L)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "Resolution" -msgstr "解像度" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +msgid "Compression" +msgstr "圧縮" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 msgid "dpi" msgstr "dpi" -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:527 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +msgid "Resolution" +msgstr "解像度" + +#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 msgid "JPEG" msgstr "JPEG" -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 +#: ../extensions/pixbuf_savers/gth-png-saver.c:140 msgid "PNG" msgstr "PNG" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 #: ../gthumb/gth-buffer-data.c:84 msgid "Insufficient memory" msgstr "メモリが足りません" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 msgid "TGA" msgstr "TGA" -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:542 +#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 msgid "TIFF" msgstr "TIFF" @@ -4085,15 +4087,15 @@ msgid "_Y:" msgstr "Y位置(_Y):" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." msgstr "赤目の軽減..." -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "赤目の軽減" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:470 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" msgstr "カメラのフラッシュが引き起こす赤目の効果を取り除きます" @@ -4105,18 +4107,6 @@ msgid "Tool to remove the red-eye effect from a photo." msgstr "写真から赤目の効果を取り除くツールです" -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "" -"Possible values include: general::unsorted, file::name, file::size, file::" -"mtime, exif::photo::datetimeoriginal" -msgstr "" -"指定可能な値: general::unsorted、file::name、file::size、file::mtime、exif::" -"photo::datetimeoriginal" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "指定可能な値: 0 (なし)、1 (下部)、2 (上部)" - #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 msgid "digits" msgstr "桁" @@ -4138,113 +4128,113 @@ msgstr "名前の変更" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" msgstr "大/小文字(_E):" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 msgid "Edit template" msgstr "テンプレートの編集" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 msgid "The original filename" msgstr "オリジナルのファイル名" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 msgid "The original extension" msgstr "オリジナルの拡張子" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 msgid "The original enumerator" msgstr "オリジナルが持つ通番" #. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 #, no-c-format msgid "%M{ format }" msgstr "%M{ フォーマット }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 msgid "The modification date" -msgstr "最終修正日時" +msgstr "更新日時" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 msgid "The digitalization date" msgstr "EXIF の日時" #. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:24 #, no-c-format msgid "%A{ identifier }" msgstr "%A{ 属性の識別子 }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "テンプレート(_T):" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 msgid "Re_verse Order" msgstr "逆順にする(_V)" -#: ../extensions/rename_series/dlg-rename-series.c:64 +#: ../extensions/rename_series/dlg-rename-series.c:58 msgid "Enumerator" msgstr "通番の数字" -#: ../extensions/rename_series/dlg-rename-series.c:65 +#: ../extensions/rename_series/dlg-rename-series.c:59 msgid "Original filename" msgstr "オリジナルのファイル名" -#: ../extensions/rename_series/dlg-rename-series.c:66 +#: ../extensions/rename_series/dlg-rename-series.c:60 msgid "Original extension" msgstr "オリジナルの拡張子" -#: ../extensions/rename_series/dlg-rename-series.c:67 +#: ../extensions/rename_series/dlg-rename-series.c:61 msgid "Original enumerator" msgstr "オリジナルが持つ通番" -#: ../extensions/rename_series/dlg-rename-series.c:68 +#: ../extensions/rename_series/dlg-rename-series.c:62 msgid "Modification date" -msgstr "最終修正日時" +msgstr "更新日時" -#: ../extensions/rename_series/dlg-rename-series.c:69 +#: ../extensions/rename_series/dlg-rename-series.c:63 msgid "Digitalization date" msgstr "EXIF の日時" -#: ../extensions/rename_series/dlg-rename-series.c:70 +#: ../extensions/rename_series/dlg-rename-series.c:64 msgid "File attribute" msgstr "ファイルの属性" -#: ../extensions/rename_series/dlg-rename-series.c:556 -#: ../extensions/rename_series/dlg-rename-series.c:687 +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 msgid "Could not rename the files" msgstr "ファイル名を変更できませんでした" -#: ../extensions/rename_series/dlg-rename-series.c:784 +#: ../extensions/rename_series/dlg-rename-series.c:780 msgid "Could not save the template" msgstr "テンプレートを保存できませんでした" -#: ../extensions/rename_series/dlg-rename-series.c:802 +#: ../extensions/rename_series/dlg-rename-series.c:798 msgid "Edit Template" msgstr "テンプレートの編集" -#: ../extensions/rename_series/dlg-rename-series.c:859 +#: ../extensions/rename_series/dlg-rename-series.c:856 msgid "Old Name" msgstr "古い名前" -#: ../extensions/rename_series/dlg-rename-series.c:870 +#: ../extensions/rename_series/dlg-rename-series.c:867 msgid "New Name" msgstr "新しい名前" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:944 msgid "Keep original case" msgstr "オリジナルと同じ大/小文字にする" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:945 msgid "Convert to lower-case" msgstr "小文字に変換する" -#: ../extensions/rename_series/dlg-rename-series.c:947 +#: ../extensions/rename_series/dlg-rename-series.c:946 msgid "Convert to upper-case" msgstr "大文字に変換する" @@ -4293,11 +4283,11 @@ msgid "pixel" msgstr "ピクセル" -#: ../extensions/resize_images/dlg-resize-images.c:166 +#: ../extensions/resize_images/dlg-resize-images.c:168 msgid "Resizing images" msgstr "画像サイズの変更中" -#: ../extensions/resize_images/dlg-resize-images.c:408 +#: ../extensions/resize_images/dlg-resize-images.c:412 msgid "Keep the original format" msgstr "オリジナルと同じ形式にする" @@ -4326,23 +4316,23 @@ msgid "Find files" msgstr "ファイルを検索します" -#: ../extensions/search/callbacks.c:133 +#: ../extensions/search/callbacks.c:132 msgid "Search again" msgstr "もう一度検索します" #. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 +#: ../extensions/search/callbacks.c:174 #: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "検索" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:195 +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "以下の条件の全て" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:196 +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "以下の条件のいずれか" @@ -4351,11 +4341,11 @@ msgid "Files found until now: %s" msgstr "見つかったファイル数: %s" -#: ../extensions/search/gth-search-task.c:270 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "検索中..." -#: ../extensions/search/gth-search-task.c:276 +#: ../extensions/search/gth-search-task.c:277 msgid "Cancel the operation" msgstr "操作をキャンセルします" @@ -4363,6 +4353,44 @@ msgid "File search tool." msgstr "ファイルを検索するツールです" +#: ../extensions/selections/callbacks.c:77 +msgid "Add to _Selection" +msgstr "セレクションに追加(_S)" + +#: ../extensions/selections/callbacks.c:86 +msgid "Selection 1" +msgstr "セレクション 1" + +#: ../extensions/selections/callbacks.c:91 +msgid "Selection 2" +msgstr "セレクション 2" + +#: ../extensions/selections/callbacks.c:96 +msgid "Selection 3" +msgstr "セレクション 3" + +#: ../extensions/selections/callbacks.c:285 +#, c-format +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" +"セレクションにファイルを追加するには Alt-%d 、確認するには Ctrl-%d を使いま" +"す。" + +#: ../extensions/selections/gth-selections-manager.c:239 +#, c-format +msgid "Selection %d" +msgstr "セレクション %d" + +#: ../extensions/selections/gth-selections-manager.c:242 +#: ../extensions/selections/selections.extension.in.in.h:1 +msgid "Selections" +msgstr "セレクション" + +#: ../extensions/selections/selections.extension.in.in.h:2 +msgid "Advanced file selection." +msgstr "高度なファイルの選択方法です。" + #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" msgstr "スライドショー(_S)" @@ -4371,9 +4399,9 @@ msgid "View as a slideshow" msgstr "スライドショーで表示します" -#: ../extensions/slideshow/callbacks.c:406 +#: ../extensions/slideshow/callbacks.c:410 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "スライドショー" @@ -4415,15 +4443,15 @@ msgid "Playing slideshow" msgstr "スライドショーを実行する" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 msgid "Choose the files to play" msgstr "演奏するファイルの選択" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 msgid "Audio files" msgstr "楽曲ファイル" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 msgid "Random" msgstr "ランダム" @@ -4445,7 +4473,7 @@ #: ../extensions/slideshow/main.c:307 msgid "Fade in" -msgstr "フェード・イン" +msgstr "フェードイン" #: ../extensions/slideshow/main.c:313 msgid "Flip page" @@ -4465,11 +4493,11 @@ #: ../extensions/webalbums/callbacks.c:71 msgid "_Web Album..." -msgstr "ウェブ・アルバム(_W)..." +msgstr "ウェブアルバム(_W)..." #: ../extensions/webalbums/callbacks.c:72 msgid "Create a static web album" -msgstr "ローカルのウェブ・アルバムを作成します" +msgstr "ローカルのウェブアルバムを作成します" #: ../extensions/webalbums/data/albumthemes/text.h:26 msgid "Click to view the image" @@ -4489,12 +4517,12 @@ msgstr "目次" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "次へ" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:105 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "前へ" @@ -4529,7 +4557,7 @@ #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 msgid "Web Album" -msgstr "ウェブ・アルバム" +msgstr "ウェブアルバム" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 #, no-c-format @@ -4584,104 +4612,111 @@ msgid "Image Attributes" msgstr "画像の属性値" -#: ../extensions/webalbums/gth-web-exporter.c:1812 +#: ../extensions/webalbums/gth-web-exporter.c:1802 msgid "Could not show the destination" -msgstr "フォルダを表示できませんでした" +msgstr "フォルダーを表示できませんでした" -#: ../extensions/webalbums/gth-web-exporter.c:1848 +#: ../extensions/webalbums/gth-web-exporter.c:1838 msgid "The album has been created successfully." msgstr "アルバムの作成が完了しました。" -#: ../extensions/webalbums/gth-web-exporter.c:2116 -#: ../extensions/webalbums/gth-web-exporter.c:2143 +#: ../extensions/webalbums/gth-web-exporter.c:2106 +#: ../extensions/webalbums/gth-web-exporter.c:2133 msgid "Saving thumbnails" msgstr "サムネイルの保存中" -#: ../extensions/webalbums/gth-web-exporter.c:2171 +#: ../extensions/webalbums/gth-web-exporter.c:2161 msgid "Saving HTML pages: Images" msgstr "HTML ページの保存中: 画像" -#: ../extensions/webalbums/gth-web-exporter.c:2229 +#: ../extensions/webalbums/gth-web-exporter.c:2219 msgid "Saving HTML pages: Indexes" msgstr "HTML ページの保存中: 目録" -#: ../extensions/webalbums/gth-web-exporter.c:2512 +#: ../extensions/webalbums/gth-web-exporter.c:2502 msgid "Copying original images" msgstr "オリジナルの画像をコピーする" -#: ../extensions/webalbums/gth-web-exporter.c:2938 +#: ../extensions/webalbums/gth-web-exporter.c:2929 msgid "Could not find the style folder" -msgstr "スタイルのフォルダが見つかりませんでした" +msgstr "スタイルのフォルダーが見つかりませんでした" -#: ../extensions/webalbums/gth-web-exporter.c:2971 +#: ../extensions/webalbums/gth-web-exporter.c:2967 msgid "Could not create a temporary folder" -msgstr "作業フォルダを作成できませんでした" +msgstr "作業フォルダーを作成できませんでした" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 msgid "Web Albums" -msgstr "ウェブ・アルバム" +msgstr "ウェブアルバム" #: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Create static web albums." -msgstr "ローカルのウェブ・アルバムを作成します" +msgstr "ローカルのウェブアルバムを作成します" + +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1251 +#: ../gthumb/gth-browser.c:1820 ../gthumb/gth-browser.c:5975 +#: ../gthumb/gth-browser.c:5994 ../gthumb/gth-browser.c:6018 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "\"%s\" を読み込めませんでした" -#: ../gthumb/dlg-personalize-filters.c:236 +#: ../gthumb/dlg-personalize-filters.c:237 msgid "Filter" -msgstr "フィルタ" +msgstr "フィルター" -#: ../gthumb/dlg-personalize-filters.c:314 +#: ../gthumb/dlg-personalize-filters.c:315 msgid "Could not save the filter" -msgstr "フィルタを保存できませんでした" +msgstr "フィルターを保存できませんでした" -#: ../gthumb/dlg-personalize-filters.c:357 +#: ../gthumb/dlg-personalize-filters.c:358 msgid "New Filter" -msgstr "新しいフィルタ" +msgstr "新しいフィルター" -#: ../gthumb/dlg-personalize-filters.c:386 +#: ../gthumb/dlg-personalize-filters.c:387 msgid "Edit Filter" -msgstr "フィルタの編集" +msgstr "フィルターの編集" -#: ../gthumb/dlg-preferences-extensions.c:68 ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 msgid "All" msgstr "全て" -#: ../gthumb/dlg-preferences-extensions.c:69 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" msgstr "有効" -#: ../gthumb/dlg-preferences-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" msgstr "無効" -#: ../gthumb/dlg-preferences-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" -msgstr "ビューア系" +msgstr "ビューアー系" -#: ../gthumb/dlg-preferences-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "メタデータ系" -#: ../gthumb/dlg-preferences-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "ファイル系" -#: ../gthumb/dlg-preferences-extensions.c:76 +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "一覧系" -#: ../gthumb/dlg-preferences-extensions.c:77 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "インポート系" -#: ../gthumb/dlg-preferences-extensions.c:78 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" -msgstr "エキスポート系" +msgstr "エクスポート系" -#: ../gthumb/dlg-preferences-extensions.c:215 +#: ../gthumb/dlg-preferences-extensions.c:216 msgid "Could not activate the extension" msgstr "拡張機能を有効にできませんでした" -#: ../gthumb/dlg-preferences-extensions.c:225 +#: ../gthumb/dlg-preferences-extensions.c:226 msgid "Could not deactivate the extension" msgstr "拡張機能を無効にできませんでした" @@ -4711,7 +4746,7 @@ msgid "File _Format: %s" msgstr "ファイルの形式(_F): %s" -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:197 +#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 msgid "All Files" msgstr "全てのファイル" @@ -4734,8 +4769,8 @@ #: ../gthumb/eggfileformatchooser.c:681 #, c-format msgid "" -"The program was not able to find out the file format you want to use for `" -"%s'. Please make sure to use a known extension for that file or manually " +"The program was not able to find out the file format you want to use for `%" +"s'. Please make sure to use a known extension for that file or manually " "choose a file format from the list below." msgstr "" "'%s' で拡張子として使用しているファイル形式を見つけることができませんでした。" @@ -4747,30 +4782,30 @@ msgstr "不明なファイル形式です" #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1355 +#: ../gthumb/gio-utils.c:1351 #, c-format msgid "%s of %s" msgstr "%s / %s" -#: ../gthumb/gio-utils.c:1390 +#: ../gthumb/gio-utils.c:1386 #, c-format msgid "Moving \"%s\" to \"%s\"" msgstr "\"%s\" から \"%s\" へ移動中" -#: ../gthumb/gio-utils.c:1392 +#: ../gthumb/gio-utils.c:1388 #, c-format msgid "Copying \"%s\" to \"%s\"" msgstr "\"%s\" から \"%s\" へコピー中" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Moving files" msgstr "ファイルの移動中" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Copying files" msgstr "ファイルのコピー中" -#: ../gthumb/gio-utils.c:1734 +#: ../gthumb/gio-utils.c:1751 msgid "Getting file information" msgstr "ファイル情報の取得中" @@ -4780,7 +4815,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2749 +#: ../gthumb/glib-utils.c:2945 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4792,13 +4827,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2758 +#: ../gthumb/glib-utils.c:2954 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%2d" -#: ../gthumb/gth-browser-actions-callbacks.c:361 +#: ../gthumb/gth-browser-actions-callbacks.c:400 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4809,7 +4844,7 @@ "衆利用許諾契約書の第二版、あるいはそれ以降の版が定める条項の下で本プログラム" "を再頒布または変更することができます。" -#: ../gthumb/gth-browser-actions-callbacks.c:365 +#: ../gthumb/gth-browser-actions-callbacks.c:404 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -4820,7 +4855,7 @@ "適用については暗黙の保証を含めて、いかなる保証も行ないません。詳細には GNU 一" "般公衆利用許諾契約書をご覧下さい。" -#: ../gthumb/gth-browser-actions-callbacks.c:369 +#: ../gthumb/gth-browser-actions-callbacks.c:408 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." @@ -4828,404 +4863,412 @@ "あなたは gThumb と一緒に GNU 一般公衆利用許諾契約書の写しを受け取っているはず" "です。もしくは http://www.gnu.org/licenses/ をご覧下さい。" -#: ../gthumb/gth-browser-actions-callbacks.c:388 +#: ../gthumb/gth-browser-actions-callbacks.c:427 msgid "An image viewer and browser for GNOME." -msgstr "GNOME 向けの画像ビューア/画像ブラウザです。" +msgstr "GNOME 向けの画像ビューアー/画像ブラウザーです。" -#: ../gthumb/gth-browser-actions-callbacks.c:391 +#: ../gthumb/gth-browser-actions-callbacks.c:430 msgid "translator_credits" msgstr "" "相花 毅 \n" +"松澤 二郎 \n" +"Ritsuko Sato \n" "日本GNOMEユーザー会 http://www.gnome.gr.jp" -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "ファイル(_F)" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "編集(_E)" -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "ジャンプ(_G)" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" msgstr "次で開く(_W)" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" -msgstr "インポート(_I)" +msgstr "インポート(_M)" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" -msgstr "エキスポート(_X)" +msgstr "エクスポート(_X)" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" -msgstr "新しいウィンドウ(_N)" +msgstr "新しいウィンドウ(_W)" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" msgstr "別のウィンドウを開きます" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "開く" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "新しいウィンドウで開く" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "gThumb の設定を変更します" -#: ../gthumb/gth-browser-actions-entries.h:85 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." -msgstr "並び替え(_S)..." +msgstr "並べ替え(_S)..." -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." -msgstr "フィルタ(_F)..." +msgstr "フィルター(_F)..." -#: ../gthumb/gth-browser-actions-entries.h:96 +#: ../gthumb/gth-browser-actions-entries.h:108 msgid "Stop loading the current location" msgstr "この場所の読み込みを停止します" -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:114 msgid "Reload the current location" msgstr "この場所の画像を再度読み込みます" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" msgstr "前の画像を表示します" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "次の画像を表示します" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "フルスクリーン表示に切り替えます" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" msgstr "フルスクリーン表示を解除します" -#: ../gthumb/gth-browser-actions-entries.h:126 ../gthumb/gth-browser.c:3647 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3658 msgid "Go to the previous visited location" msgstr "前に訪れた場所へジャンプします" -#: ../gthumb/gth-browser-actions-entries.h:131 ../gthumb/gth-browser.c:3668 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3676 msgid "Go to the next visited location" msgstr "次に訪れた場所へジャンプします" -#: ../gthumb/gth-browser-actions-entries.h:136 ../gthumb/gth-browser.c:3689 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3694 msgid "Go up one level" msgstr "一つ上の場所に上がります" -#: ../gthumb/gth-browser-actions-entries.h:145 ../gthumb/gth-browser.c:667 +#: ../gthumb/gth-browser-actions-entries.h:161 +msgid "_Location..." +msgstr "場所(_L)..." + +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "場所を指定して開く" + +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:673 msgid "_Delete History" msgstr "履歴の削除(_D)" -#: ../gthumb/gth-browser-actions-entries.h:146 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "Delete the list of visited locations" msgstr "最近訪れた場所の一覧を削除します" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "View the folders" -msgstr "フォルダを表示します" +msgstr "フォルダーを表示します" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Show information about gthumb" msgstr "gThumb の情報を表示します" -#: ../gthumb/gth-browser-actions-entries.h:160 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "Contents" msgstr "目次" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:192 msgid "Display the gthumb Manual" msgstr "gThumb のマニュアルを表示します" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:197 msgid "_Keyboard Shortcuts" msgstr "キー操作(_K)" -#: ../gthumb/gth-browser-actions-entries.h:174 +#: ../gthumb/gth-browser-actions-entries.h:206 msgid "_Toolbar" msgstr "ツールバー(_T)" -#: ../gthumb/gth-browser-actions-entries.h:175 +#: ../gthumb/gth-browser-actions-entries.h:207 msgid "View or hide the toolbar of this window" msgstr "このウィンドウのツールバーの表示を ON/OFF します" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:211 msgid "_Statusbar" msgstr "ステータスバー(_S)" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "View or hide the statusbar of this window" msgstr "このウィンドウのステータスバーの表示を ON/OFF します" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:216 msgid "_Filterbar" -msgstr "フィルタバー(_F)" +msgstr "フィルターバー(_F)" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "View or hide the filterbar of this window" -msgstr "このウィンドウのフィルタバーの表示を ON/OFF します" +msgstr "このウィンドウのフィルターバーの表示を ON/OFF します" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:221 msgid "_Sidebar" msgstr "サイドバー(_S)" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "View or hide the sidebar of this window" msgstr "このウィンドウのサイドバーの表示を ON/OFF します" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:226 msgid "_Thumbnail Pane" msgstr "サムネイルの一覧(_T)" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "View or hide the thumbnail pane in viewer mode" msgstr "サムネイルの一覧表示を ON/OFF します" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:231 msgid "_Thumbnails" msgstr "サムネイル(_T)" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "View thumbnails" msgstr "サムネイルで表示します" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:236 msgid "_Hidden Files" msgstr "隠しファイル(_H)" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "Show hidden files and folders" -msgstr "隠しファイルや隠しフォルダを表示します" +msgstr "隠しファイルや隠しフォルダーを表示します" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:242 +#: ../gthumb/gth-browser-actions-entries.h:247 msgid "View file properties" msgstr "ファイルのプロパティを表示します" -#: ../gthumb/gth-browser-actions-entries.h:214 +#: ../gthumb/gth-browser-actions-entries.h:251 msgid "Edit" msgstr "編集する" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:252 msgid "Edit file" msgstr "ファイルを編集します" -#: ../gthumb/gth-browser.c:363 +#: ../gthumb/gth-browser-actions-entries.h:256 +msgid "_Fit Window to Image" +msgstr "画像に合わせる(_F)" + +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Resize the window to the size of the image" +msgstr "画像のサイズに合わせてウィンドウの大きさを変更します" + +#: ../gthumb/gth-browser.c:370 #, c-format msgid "Open %s" msgstr "%s を開きます" -#: ../gthumb/gth-browser.c:503 +#: ../gthumb/gth-browser.c:510 msgid "[modified]" msgstr "[変更済]" -#: ../gthumb/gth-browser.c:991 +#: ../gthumb/gth-browser.c:1007 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d個のファイルを選択しました (%s)" -msgstr[1] "%d個のファイルを選択しました(%s)" -#: ../gthumb/gth-browser.c:1026 +#: ../gthumb/gth-browser.c:1042 #, c-format msgid "%s of free space" msgstr "%sの空き" -#: ../gthumb/gth-browser.c:1235 ../gthumb/gth-browser.c:1809 -#: ../gthumb/gth-browser.c:5797 ../gthumb/gth-browser.c:5816 -#: ../gthumb/gth-browser.c:5841 -#, c-format -msgid "Could not load the position \"%s\"" -msgstr "\"%s\" を読み込めませんでした" - -#: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:1932 +#: ../gthumb/gth-browser.c:1916 ../gthumb/gth-browser.c:1943 #, c-format msgid "No suitable module found for %s" msgstr "%s に適したモジュールではありませんでした" -#: ../gthumb/gth-browser.c:2052 +#: ../gthumb/gth-browser.c:2063 #, c-format msgid "Save changes to file '%s'?" -msgstr "'%s' の変更点を保存しますか?" +msgstr "'%s' の変更点を保存しますか?" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2068 msgid "If you don't save, changes to the file will be permanently lost." msgstr "保存しないと、そのファイルに対する変更点は完全に失われます。" -#: ../gthumb/gth-browser.c:2058 +#: ../gthumb/gth-browser.c:2069 msgid "Do _Not Save" msgstr "保存しない(_N)" -#: ../gthumb/gth-browser.c:2863 ../gthumb/gth-browser.c:2883 -#: ../gthumb/gth-source-tree.c:178 ../gthumb/gth-source-tree.c:200 +#: ../gthumb/gth-browser.c:2842 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "名前を変更できませんでした" -#: ../gthumb/gth-browser.c:3328 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3271 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" -msgstr "修正日時" +msgstr "更新日時" -#: ../gthumb/gth-browser.c:3648 ../gthumb/gth-browser.c:3669 +#: ../gthumb/gth-browser.c:3659 ../gthumb/gth-browser.c:3677 msgid "View the list of visited locations" msgstr "最近訪れた場所の一覧を表示します" -#: ../gthumb/gth-browser.c:3690 +#: ../gthumb/gth-browser.c:3695 msgid "View the list of upper locations" msgstr "上にある場所の一覧を表示します" -#: ../gthumb/gth-browser.c:5798 +#: ../gthumb/gth-browser.c:5976 #, c-format msgid "File type not supported" msgstr "サポートしていない種類のファイルです" -#: ../gthumb/gth-browser.c:5842 +#: ../gthumb/gth-browser.c:6019 #, c-format msgid "No suitable module found" msgstr "妥当なモジュールが見つかりませんでした" -#: ../gthumb/gth-extensions.c:228 +#: ../gthumb/gth-extensions.c:203 #, c-format msgid "Could not open the module `%s`: %s" msgstr "'%s' というモジュールをオープンできませんでした: %s" -#: ../gthumb/gth-extensions.c:831 +#: ../gthumb/gth-extensions.c:744 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "拡張機能の '%2$s' にはこの '%1$s' が必要です。" -#: ../gthumb/gth-file-source-vfs.c:116 +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" -msgstr "ホーム・フォルダ" +msgstr "ホームフォルダー" -#: ../gthumb/gth-file-source-vfs.c:121 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" -msgstr "ファイル・システム" +msgstr "ファイルシステム" -#: ../gthumb/gth-file-source-vfs.c:730 +#: ../gthumb/gth-file-source-vfs.c:739 msgid "" "The files cannot be moved to the Trash. Do you want to delete them " "permanently?" msgstr "" -"ファイルをゴミ箱へ移動できませんが、代わりにそれらを完全に消去しますか?" +"ファイルをゴミ箱へ移動できませんが、代わりにそれらを完全に消去しますか?" -#: ../gthumb/gth-file-source-vfs.c:741 +#: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" msgstr "ファイルをゴミ箱へ移動できませんでした" -#: ../gthumb/gth-file-source-vfs.c:785 +#: ../gthumb/gth-file-source-vfs.c:797 #, c-format msgid "Are you sure you want to move \"%s\" to trash?" -msgstr "本当に \"%s\" をゴミ箱に移動しますか?" +msgstr "本当に \"%s\" をゴミ箱に移動しますか?" -#: ../gthumb/gth-file-source-vfs.c:788 +#: ../gthumb/gth-file-source-vfs.c:801 #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" -msgstr[0] "本当に選択した%'d個のファイルをゴミ箱へ移動しますか?" -msgstr[1] "本当に選択した%'d個のファイルをゴミ箱へ移動しますか?" +msgstr[0] "本当に選択した%'d個のファイルをゴミ箱へ移動しますか?" -#: ../gthumb/gth-file-source-vfs.c:829 +#: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" msgid_plural "" "Are you sure you want to permanently delete the %'d selected files?" -msgstr[0] "本当に選択した%'d個のファイルを完全に消去しますか?" -msgstr[1] "本当に選択した%'d個のファイルを完全に消去しますか?" +msgstr[0] "本当に選択した%'d個のファイルを完全に消去しますか?" -#: ../gthumb/gth-filterbar.c:405 +#: ../gthumb/gth-filterbar.c:406 msgid "Hide the filterbar" -msgstr "フィルタバーを隠します" +msgstr "フィルターバーを隠します" -#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" -msgstr "Kバイト" +msgstr "KB" -#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" -msgstr "Mバイト" +msgstr "MB" -#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" -msgstr "Gバイト" +msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:279 ../gthumb/gth-filter-editor-dialog.c:207 +#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "個のファイル" -#: ../gthumb/gth-filter-editor-dialog.c:254 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" msgstr "で昇順" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" msgstr "で降順" -#: ../gthumb/gth-filter-editor-dialog.c:545 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "制限なし" -#: ../gthumb/gth-folder-tree.c:848 +#: ../gthumb/gth-folder-tree.c:857 msgid "Loading..." msgstr "読み込み中..." -#: ../gthumb/gth-folder-tree.c:1119 +#: ../gthumb/gth-folder-tree.c:1100 msgid "(Open Parent)" -msgstr "(親フォルダを開く)" +msgstr "(親フォルダーを開く)" -#: ../gthumb/gth-histogram-view.c:800 +#: ../gthumb/gth-histogram-view.c:826 msgid "Linear scale" msgstr "線形比にします" -#: ../gthumb/gth-histogram-view.c:812 +#: ../gthumb/gth-histogram-view.c:838 msgid "Logarithmic scale" msgstr "対数比にします" -#: ../gthumb/gth-histogram-view.c:832 +#: ../gthumb/gth-histogram-view.c:858 msgid "Channel:" msgstr "チャンネル:" -#: ../gthumb/gth-histogram-view.c:864 +#: ../gthumb/gth-histogram-view.c:890 msgid "Value" -msgstr "値" +msgstr "明度" -#: ../gthumb/gth-histogram-view.c:870 +#: ../gthumb/gth-histogram-view.c:896 msgid "Red" msgstr "赤" -#: ../gthumb/gth-histogram-view.c:876 +#: ../gthumb/gth-histogram-view.c:902 msgid "Green" msgstr "緑" -#: ../gthumb/gth-histogram-view.c:882 +#: ../gthumb/gth-histogram-view.c:908 msgid "Blue" msgstr "青" -#: ../gthumb/gth-histogram-view.c:888 +#: ../gthumb/gth-histogram-view.c:914 msgid "Alpha" msgstr "アルファ" -#: ../gthumb/gth-histogram-view.c:895 +#: ../gthumb/gth-histogram-view.c:921 msgid "RGB" msgstr "RGB" @@ -5242,7 +5285,7 @@ msgstr "名前" #: ../gthumb/gth-main-default-metadata.c:40 -#: ../gthumb/gth-main-default-tests.c:248 +#: ../gthumb/gth-main-default-tests.c:284 msgid "Size" msgstr "サイズ" @@ -5256,7 +5299,7 @@ #: ../gthumb/gth-main-default-metadata.c:48 msgid "Duration" -msgstr "彩度" +msgstr "再生時間" #: ../gthumb/gth-main-default-sort-types.c:131 msgid "file name" @@ -5272,33 +5315,33 @@ #: ../gthumb/gth-main-default-sort-types.c:134 msgid "file modified date" -msgstr "最終修正日時" +msgstr "更新日時" #: ../gthumb/gth-main-default-sort-types.c:135 msgid "no sorting" -msgstr "並び替えない" +msgstr "並べ替えない" #: ../gthumb/gth-main-default-sort-types.c:136 msgid "dimensions" msgstr "画像の寸法" -#: ../gthumb/gth-main-default-tests.c:225 +#: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "メディア" -#: ../gthumb/gth-main-default-tests.c:232 +#: ../gthumb/gth-main-default-tests.c:268 msgid "Text Files" msgstr "通常のファイル" -#: ../gthumb/gth-main-default-tests.c:240 +#: ../gthumb/gth-main-default-tests.c:276 msgid "Filename" msgstr "ファイル名" -#: ../gthumb/gth-main-default-tests.c:272 +#: ../gthumb/gth-main-default-tests.c:308 msgid "Title (embedded)" msgstr "(埋め込まれた) タイトル" -#: ../gthumb/gth-main-default-tests.c:278 +#: ../gthumb/gth-main-default-tests.c:316 msgid "Description (embedded)" msgstr "(埋め込まれた) 説明" @@ -5310,7 +5353,7 @@ msgid "No options available for this file type" msgstr "この種類のファイルで利用できるオプションはありません" -#: ../gthumb/gth-progress-dialog.c:142 +#: ../gthumb/gth-progress-dialog.c:144 msgid "Cancel operation" msgstr "この操作をキャンセルします" @@ -5318,60 +5361,60 @@ msgid "Saving file information" msgstr "ファイル情報の保存中" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-tags-entry.c:388 #, c-format msgid "Create tag «%s»" msgstr "タグ «%s» の生成" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:735 msgid "Show all the tags" msgstr "全てのタグを表示します" -#: ../gthumb/gth-tags-file.c:234 +#: ../gthumb/gth-tags-file.c:236 msgid "Holidays" msgstr "祝日" -#: ../gthumb/gth-tags-file.c:235 +#: ../gthumb/gth-tags-file.c:237 msgid "Temporary" msgstr "作業用" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:238 msgid "Screenshots" msgstr "スクリーンショット" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:239 msgid "Science" msgstr "科学" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:240 msgid "Favorite" msgstr "お気に入り" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:241 msgid "Important" msgstr "重要" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:242 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:243 msgid "Games" msgstr "ゲーム" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:244 msgid "Party" msgstr "パーティ" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:245 msgid "Birthday" msgstr "誕生日" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:246 msgid "Astronomy" msgstr "宇宙" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:247 msgid "Family" msgstr "家族" @@ -5389,18 +5432,18 @@ msgid "is not" msgstr "が次ではない" -#: ../gthumb/gth-test-category.c:374 ../gthumb/gth-test-simple.c:800 -#: ../gthumb/gth-test-simple.c:826 ../gthumb/gth-test-simple.c:847 -#: ../gthumb/gth-test-simple.c:873 +#: ../gthumb/gth-test-category.c:394 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "テストする定義が足りません。" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:252 msgid "Add a new rule" msgstr "新しい条件を追加します" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:263 msgid "Remove this rule" msgstr "この条件を削除します" @@ -5444,13 +5487,13 @@ msgid "is after" msgstr "が次より後" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:477 msgid "Today" msgstr "今日" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:485 msgid "Now" -msgstr "今すぐ" +msgstr "現在日時" #: ../gthumb/gth-window-actions-entries.h:32 msgid "Close this window" @@ -5460,56 +5503,160 @@ msgid "Close _All Windows" msgstr "全てのウィンドウを閉じる(_A)" -#: ../gthumb/gtk-utils.c:704 +#: ../gthumb/gtk-utils.c:551 msgid "Could not display help" msgstr "ヘルプを表示することができませんでした" -#: ../gthumb/gtk-utils.c:991 ../gthumb/gtk-utils.c:1000 +#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 msgid "Could not launch the application" msgstr "アプリケーションを起動できませんでした" -#: ../gthumb/gtk-utils.c:1103 +#: ../gthumb/gtk-utils.c:978 msgid "_Copy Here" -msgstr "ここへコピーする(C)" +msgstr "ここへコピーする(_C)" -#: ../gthumb/gtk-utils.c:1108 +#: ../gthumb/gtk-utils.c:983 msgid "_Move Here" msgstr "ここへ移動する(_M)" -#: ../gthumb/gtk-utils.c:1113 +#: ../gthumb/gtk-utils.c:988 msgid "_Link Here" msgstr "リンクの作成(_L)" -#: ../gthumb/gtk-utils.c:1122 +#: ../gthumb/gtk-utils.c:997 msgid "Cancel" msgstr "キャンセル" -#: ../gthumb/main.c:72 +#: ../gthumb/main.c:59 msgid "Open a new window" msgstr "新しいウィンドウを開く" -#: ../gthumb/main.c:76 +#: ../gthumb/main.c:63 msgid "Start in fullscreen mode" msgstr "全画面モードで起動する" -#: ../gthumb/main.c:80 +#: ../gthumb/main.c:67 msgid "Automatically start a slideshow" msgstr "自動的にスライドショーを起動する" -#: ../gthumb/main.c:84 +#: ../gthumb/main.c:71 msgid "Automatically import digital camera photos" -msgstr "自動的にディジタル・カメラの写真をインポートする" +msgstr "自動的にデジタルカメラの写真をインポートする" -#: ../gthumb/main.c:88 +#: ../gthumb/main.c:75 msgid "Show version" msgstr "バージョンを表示する" -#. command line options -#: ../gthumb/main.c:539 +#: ../gthumb/main.c:344 msgid "- Image browser and viewer" -msgstr "- 画像ブラウザ/画像ビューア" +msgstr "- 画像ブラウザー/画像ビューアー" #: ../gthumb/pixbuf-io.c:174 #, c-format msgid "Could not find a suitable module to save the image as \"%s\"" msgstr "画像を \"%s\" として保存するのに適したモジュールが見つかりませんでした" + +#~ msgid "Choose another tag" +#~ msgstr "別のタグを選択します" + +#~ msgid "New tag" +#~ msgstr "新しいタグ" + +#~ msgid "Possible values are: list, thumbnails." +#~ msgstr "設定可能な値: list、thumbnails" + +#~ msgid "Possible values are: high, low." +#~ msgstr "設定可能な値: high、low" + +#~ msgid "" +#~ "Possible values are: actual_size, fit, keep_prev, fit_if_larger, " +#~ "fit_width_if_larger." +#~ msgstr "" +#~ "設定可能な値: actual_size、fit、keep_prev、fit_if_larger、" +#~ "fit_width_if_larger" + +#~ msgid "Possible values are: light, midtone, dark." +#~ msgstr "設定可能な値: light、midtone、dark" + +#~ msgid "Possible values are: small, medium, large." +#~ msgstr "設定可能な値: small、medium、large" + +#~ msgid "" +#~ "Possible values are: system, text_below, text_beside, text_only, " +#~ "icons_only." +#~ msgstr "" +#~ "設定可能な値: system、text_below、text_beside、text_only、icons_only" + +#~ msgid "Follow Nautilus behaviour" +#~ msgstr "Nautilus の設定に従う" + +#~ msgid "Activate items with a single click" +#~ msgstr "シングル・クリックで有効にする" + +#~ msgid "Activate items with a double click" +#~ msgstr "ダブル・クリックで有効にする" + +#~ msgid "Set image to actual size" +#~ msgstr "オリジナルのサイズにする" + +#~ msgid "Possible values: pixels, percentage" +#~ msgstr "設定可能な値: pixels、percentage" + +#~ msgid " " +#~ msgstr " " + +#~ msgid "%p" +#~ msgstr "%p" + +#~ msgid "%n" +#~ msgstr "%n" + +#~ msgid "###" +#~ msgstr "###" + +#~ msgid "#" +#~ msgstr "#" + +#~ msgid "×" +#~ msgstr "×" + +#~ msgctxt "time" +#~ msgid "/" +#~ msgstr "/" + +#~ msgid "" +#~ "Possible values are: actual-size, keep-prev, fit-size, fit-size-if-" +#~ "larger, fit-width, fit-width-if-larger." +#~ msgstr "" +#~ "設定可能な値: actual-size、keep-prev、fit-size、fit-size-if-larger、fit-" +#~ "width、fit-width-if-larger" + +#~ msgid "Possible values are: none, file_date, current_date" +#~ msgstr "設定可能な値: none、file_date、current_date" + +#~ msgid "Possible values are: yyyymmdd, yyyymm, yyyy" +#~ msgstr "設定可能な値: yyyymmdd、yyyymm、yyyy" + +#~ msgid "%U" +#~ msgstr "%U" + +#~ msgid "%F" +#~ msgstr "%F" + +#~ msgid "%B" +#~ msgstr "%B" + +#~ msgid "Possible values are: none, deflate, jpeg." +#~ msgstr "指定可能な値: none、deflate、jpeg" + +#~ msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" +#~ msgstr "指定可能な値: 0 (なし)、1 (下部)、2 (上部)" + +#~ msgid "%i" +#~ msgstr "%i" + +#~ msgid "%I" +#~ msgstr "%I" + +#~ msgid "%C" +#~ msgstr "%C" diff -Nru gthumb-2.14.3/po/lt.po gthumb-3.0.0/po/lt.po --- gthumb-2.14.3/po/lt.po 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/po/lt.po 2012-04-08 08:49:35.000000000 +0000 @@ -8,238 +8,271 @@ msgid "" msgstr "" "Project-Id-Version: lt\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-16 22:57+0300\n" -"PO-Revision-Date: 2010-09-16 22:57+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-03-25 17:42+0000\n" +"PO-Revision-Date: 2012-04-05 21:31+0300\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Language: lt\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Virtaal 0.6.1\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Failas nėra tinkamas .desktop failas" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Neatpažinta .desktop failo versija „%s“" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "Paleidžiama %s" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "Programa nepriima dokumentų komandų eilutėje" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "Neatpažinta paleisties parinktis: %d" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "Negalima perduoti dokumento URI .desktop įrašui „Type=Link“" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "Nėra paleidžiamas elementas" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "Uždrausti prisijungimą prie seansų tvarkyklės" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "Nurodykite failą, kuriame įrašyta konfigūracija" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "FAILAS" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "Nurodykite seanso valdymo ID" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "ID" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "Seanso valdymo parinktys:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "Rodyti sesijos valdymo parinktis" +#. manually set name and icon #: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "Paveikslėlių peržiūros programa" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "Peržiūrėti ir tvarkyti paveikslėlius" - -#: ../data/gthumb.desktop.in.in.h:3 ../data/gthumb-import.desktop.in.in.h:3 +#: ../gthumb/gth-browser.c:529 +#: ../gthumb/gth-progress-dialog.c:388 +#: ../gthumb/main.c:313 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Paveikslėlių peržiūros programa" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "Paveikslėlių peržiūros programa gThumb" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Peržiūrėti ir tvarkyti paveikslėlius" + #: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "Importuoti fotografijas iš skaitmeninio fotoaparato" +msgid "Import with gThumb" +msgstr "Importuoti su gThumb" #: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "Fotografijų importavimo įrankis" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "gThumb fotografijų importavimo įrankis" -#: ../data/gthumb.schemas.in.h:1 -msgid "" -"Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " -"to generate thumbnails for all images." -msgstr "" -"Paveikslėlių, viršijančių šį dydį (baitais), miniatiūros nebus rodomos. " -"Naudokite 0, jeigu norite matyti visų paveikslėlių miniatiūras." +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Importuoti fotografijas iš skaitmeninio fotoaparato" -#: ../data/gthumb.schemas.in.h:2 -msgid "" -"Possible values are: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." -msgstr "" -"Galimos reikšmės yra: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 +msgid "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want to generate thumbnails for all images." +msgstr "Paveikslėlių, viršijančių šį dydį (baitais), miniatiūros nebus rodomos. Naudokite 0, jeigu norite matyti visų paveikslėlių miniatiūras." -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "Galimos reikšmės yra: high, low." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "Galimos reikšmės yra: light, midtone, dark." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "Galimos reikšmės yra: list, thumbnails." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "Galimos reikšmės yra: small, medium, large." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" +msgstr "Ar keisti lango dydį pagal paveikslėlio dydį" -#: ../data/gthumb.schemas.in.h:7 -msgid "" -"Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "" -"Galimos reikšmės yra: system, text_below, text_beside, text_only, icons_only." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +#| msgid "Open another window" +msgid "Open files in the active window" +msgstr "Atverti failus aktyviame lange" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "Galimos reikšmės yra: white, black, checked, none." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +#| msgid "Whether to reset the scrollbar positions after changing image" +msgid "Whether to reset the scrollbars position after changing image" +msgstr "Ar pakeitus paveikslėlį atstatyti slinkties juostų pozicijas" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to always use a black background." msgstr "Ar visada naudoti juodą foną." -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" -msgstr "Ar pakeitus paveikslėlį atstatyti slinkties juostų pozicijas" - -#: ../data/ui/extensions.ui.h:1 -msgid "Available _extensions:" -msgstr "_Prieinami papildiniai:" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +#| msgid "Possible values are: png, jpeg." +msgid "Possible values are: jpeg, jpg." +msgstr "Galimos vertės yra: jpeg, jpg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +#| msgid "Possible values are: high, low." +msgid "Possible values are: tiff, tif." +msgstr "Galimos reikšmės yra: tiff, tif." + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" +msgstr "Galimos reikšmės: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" + +#: ../data/ui/extensions-preferences.ui.h:1 +#| msgid "Extensions" +msgid "_Extensions:" +msgstr "_Plėtiniai:" -#: ../data/ui/extensions.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "Daugiau papildinių..." -#: ../data/ui/extensions.ui.h:3 -msgid "_Categories:" -msgstr "Kate_gorijos:" - -#: ../data/ui/extensions.ui.h:4 -msgid "gthumb Extensions" -msgstr "gThumb papildiniai" +#: ../data/ui/extensions-preferences.ui.h:3 +msgid "Some extensions are configurable." +msgstr "Kai kurie plėtiniai turi nustatymus" #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "_Filtro pavadinimas:" -#. limit label -#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 -msgid "_Limit to" -msgstr "_Riboti iki" - -#: ../data/ui/filter-editor.ui.h:3 +#: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "_Ieškoti" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 +#: ../gthumb/gth-filter.c:270 +#: ../gthumb/gth-filter.c:342 +msgid "_Limit to" +msgstr "_Riboti iki" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "pažymėtas" +#: ../data/ui/histogram-info.ui.h:1 +#| msgid "Media" +msgid "Mean:" +msgstr "Vidurkis:" + +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Std. nuokr." + +#: ../data/ui/histogram-info.ui.h:4 +#| msgid "Media" +msgid "Median:" +msgstr "Mediana:" + +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +#| msgid "Pi_xels" +msgid "Pixels:" +msgstr "Pikseliai:" + +#. After the colon there is a percentile. +#: ../data/ui/histogram-info.ui.h:8 +msgctxt "Pixels" +msgid "Max:" +msgstr "Max:" + +#. After the colon there is the percentile of selected pixels. +#: ../data/ui/histogram-info.ui.h:10 +#| msgid "selected by" +msgctxt "Pixels" +msgid "Selected:" +msgstr "Pažymėta:" + +#: ../data/ui/location.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +msgid "_Location:" +msgstr "_Vieta:" + #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "Neperrašyti _senojo paveikslėlio" +msgid "Overwrite the old file with the new one?" +msgstr "Perrašyti senąjį failą naujuoju?" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Senasis failas:" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "Failo pavadinimas:" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Dydis:" + +#: ../data/ui/overwrite-dialog.ui.h:5 msgid "Modified:" msgstr "Pakeista:" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "Naujasis failas:" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "Senasis failas:" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "Per_rašyti senąjį failą" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "Perrašyti _visus failus" - #: ../data/ui/overwrite-dialog.ui.h:8 -msgid "Overwrite the old file with the new one?" -msgstr "Perrašyti senąjį failą naujuoju?" +msgid "Do not overwrite _the old file" +msgstr "Neperrašyti _senojo paveikslėlio" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Size:" -msgstr "Dydis:" +msgid "Overwrite _all files" +msgstr "Perrašyti _visus failus" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -262,201 +295,228 @@ msgstr "_Kiti filtrai:" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Aktyvuoti elementus dvigubu spragtelėjimu" +#| msgid "View the folders" +msgid "below the folder list" +msgstr "žemiau aplankų sąrašo" #: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Aktyvuoti elementus vienu spragtelėjimu" +#| msgid "on the side" +msgid "on the right" +msgstr "dešinėje" #: ../data/ui/preferences.ui.h:3 -msgid "Appearance" -msgstr "Išvaizda" +#| msgid "gthumb Preferences" +msgid "gThumb Preferences" +msgstr "gThumb nustatymai" #: ../data/ui/preferences.ui.h:4 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "Pakla_usti patvirtinimo prieš trinant paveikslėlius ar katalogus" +msgid "_Toolbar style:" +msgstr "Įran_kinės stilius:" #: ../data/ui/preferences.ui.h:5 -msgid "Ask whether to save _modified files" -msgstr "Paklausti, ar į_rašyti pakeistus failus" +msgid "T_humbnails in viewer:" +msgstr "Miniati_ūros žiūryklėje:" -#: ../data/ui/preferences.ui.h:6 ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Juodas" +#: ../data/ui/preferences.ui.h:6 +msgid "System settings" +msgstr "Sistemos nustatymai" -#: ../data/ui/preferences.ui.h:7 ../gthumb/dlg-extensions.c:69 -#: ../gthumb/gth-browser-actions-entries.h:155 -msgid "Browser" -msgstr "Naršyklė" +#: ../data/ui/preferences.ui.h:7 +msgid "Text below icons" +msgstr "Tekstas po piktogramomis" #: ../data/ui/preferences.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:1 -msgid "Caption" -msgstr "Antraštė" +msgid "Text beside icons" +msgstr "Tekstas šalia piktogramų" -#: ../data/ui/preferences.ui.h:9 ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "Languotas" +#: ../data/ui/preferences.ui.h:9 +msgid "Icons only" +msgstr "Tik piktogramos" #: ../data/ui/preferences.ui.h:10 -msgid "Choose startup folder" -msgstr "Pasirinkite pradinį aplanką" +msgid "Text only" +msgstr "Tik tekstas" #: ../data/ui/preferences.ui.h:11 -msgid "D_etermine image type from content (slower)" -msgstr "Nustat_yti paveikslėlio tipą pagal turinį (lėčiau)" +msgid "on the bottom" +msgstr "apačioje" -#: ../data/ui/preferences.ui.h:12 ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Jei didesnis, pritaikyti prie pločio" +#: ../data/ui/preferences.ui.h:12 +msgid "on the side" +msgstr "šone" -#: ../data/ui/preferences.ui.h:13 ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Pritaikyti prie lango dydžio" +#: ../data/ui/preferences.ui.h:13 +msgid "File _properties in browser:" +msgstr "Failo _savybės naršyklėje:" -#: ../data/ui/preferences.ui.h:14 ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Jei didesnis, pritaikyti prie lango dydžio" +#: ../data/ui/preferences.ui.h:14 +msgid "Appearance" +msgstr "Išvaizda" #: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "Sekti Nautilus elgseną" +msgid "Go to last _visited location" +msgstr "Atverti paskiausiai aplankytą _vietą" #: ../data/ui/preferences.ui.h:16 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:310 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "Bendri" +msgid "Go to this _folder:" +msgstr "Atverti šį _aplanką:" #: ../data/ui/preferences.ui.h:17 -msgid "Go to last _visited location" -msgstr "Atverti paskiausiai aplankytą _vietą" +msgid "Choose startup folder" +msgstr "Pasirinkite pradinį aplanką" #: ../data/ui/preferences.ui.h:18 -msgid "Go to this _folder:" -msgstr "Atverti šį _aplanką:" +msgid "Set to C_urrent" +msgstr "Nustatyti į _dabartinį" -#: ../data/ui/preferences.ui.h:19 ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Tik piktogramos" +#: ../data/ui/preferences.ui.h:19 +#| msgid "Resize the window to the size of the image" +msgid "_Reuse the active window to open files" +msgstr "Paka_rtotinai naudoti aktyvų langą failams atverti" -#: ../data/ui/preferences.ui.h:20 ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Išlaikyti ankstesnį mastelį" +#: ../data/ui/preferences.ui.h:20 +msgid "On startup:" +msgstr "Paleidimo metu:" #: ../data/ui/preferences.ui.h:21 -#: ../extensions/file_tools/gth-file-tool-crop.c:399 -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:422 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:278 -msgid "None" -msgstr "Nėra" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "Pakla_usti patvirtinimo prieš trinant paveikslėlius ar katalogus" #: ../data/ui/preferences.ui.h:22 -msgid "On startup:" -msgstr "Paleidimo metu:" +msgid "Ask whether to save _modified files" +msgstr "Paklausti, ar į_rašyti pakeistus failus" #: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:190 +msgid "_Store metadata inside files if possible" +msgstr "Į_rašyti metaduomenis failuose, jei įmanoma" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 msgid "Other" msgstr "Kita" -#: ../data/ui/preferences.ui.h:24 -msgid "Set image to actual size" -msgstr "Nustatyti paveikslėlį į tikrąjį dydį" - #: ../data/ui/preferences.ui.h:25 -msgid "Set to C_urrent" -msgstr "Nustatyti į _dabartinį" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Bendri" -#. Set widgets data. -#: ../data/ui/preferences.ui.h:26 ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Sistemos nustatymai" +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Antraštė" #: ../data/ui/preferences.ui.h:27 -msgid "T_humbnails in viewer:" -msgstr "Miniati_ūros žiūryklėje:" - -#: ../data/ui/preferences.ui.h:28 ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Tekstas po piktogramomis" - -#: ../data/ui/preferences.ui.h:29 ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Tekstas šalia piktogramų" +msgid "Thumbnail _size:" +msgstr "_Miniatiūrų dydis:" -#: ../data/ui/preferences.ui.h:30 ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Tik tekstas" +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" #: ../data/ui/preferences.ui.h:31 -msgid "Thumbnail _size:" -msgstr "_Miniatiūrų dydis:" +msgid "95" +msgstr "95" -#: ../data/ui/preferences.ui.h:32 ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Baltas" +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" #: ../data/ui/preferences.ui.h:33 -msgid "_Store metadata inside files if possible" -msgstr "Į_rašyti metaduomenis failuose, jei įmanoma" +msgid "128" +msgstr "128" #: ../data/ui/preferences.ui.h:34 -msgid "_Toolbar style:" -msgstr "Įran_kinės stilius:" +msgid "164" +msgstr "164" #: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "gThumb nustatymai" +msgid "200" +msgstr "200" #: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "apačioje" +msgid "256" +msgstr "256" #: ../data/ui/preferences.ui.h:37 -msgid "on the side" -msgstr "šone" +msgid "D_etermine image type from content (slower)" +msgstr "Nustat_yti paveikslėlio tipą pagal turinį (lėčiau)" + +#: ../data/ui/preferences.ui.h:38 +#: ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Naršyklė" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "Rikiuoti pagal" #: ../data/ui/sort-order.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 +msgid "_Sort by:" +msgstr "_Rikiuoti pagal:" + +#: ../data/ui/sort-order.ui.h:3 msgid "_Inverse order" msgstr "At_virkštinė tvarka" -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 -msgid "_Sort by:" -msgstr "_Rikiuoti pagal:" +#: ../extensions/23hq/23hq.extension.in.in.h:1 +#| msgid "2" +msgid "23" +msgstr "23" + +#: ../extensions/23hq/23hq.extension.in.in.h:2 +#| msgid "Upload images to Facebook" +msgid "Upload images to 23hq.com" +msgstr "Įkelti paveikslėlius į 23hq.com" + +#: ../extensions/23hq/callbacks.c:68 +#| msgid "..." +msgid "_23..." +msgstr "_23..." + +#: ../extensions/23hq/callbacks.c:69 +#| msgid "Upload photos to Flickr" +msgid "Upload photos to 23" +msgstr "Įkelti fotografijas į 23" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -msgid "Add bookmarks support." -msgstr "Pridėti žymelių funkciją." - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "Žymelės" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Pridėti žymelių funkciją." + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 #: ../extensions/change_date/change_date.extension.in.in.h:3 #: ../extensions/comments/comments.extension.in.in.h:3 +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:3 #: ../extensions/convert_format/convert_format.extension.in.in.h:3 #: ../extensions/desktop_background/desktop_background.extension.in.in.h:3 #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:3 #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:3 #: ../extensions/file_manager/file_manager.extension.in.in.h:3 #: ../extensions/file_tools/file_tools.extension.in.in.h:3 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:3 #: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:3 #: ../extensions/image_print/image_print.extension.in.in.h:3 #: ../extensions/image_rotation/image_rotation.extension.in.in.h:3 @@ -469,32 +529,33 @@ #: ../extensions/rename_series/rename_series.extension.in.in.h:3 #: ../extensions/resize_images/resize_images.extension.in.in.h:3 #: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" msgstr "gThumb kūrėjų komanda" -#: ../extensions/bookmarks/callbacks.c:52 +#: ../extensions/bookmarks/callbacks.c:54 msgid "_Bookmarks" msgstr "Ž_ymelės" -#: ../extensions/bookmarks/callbacks.c:53 +#: ../extensions/bookmarks/callbacks.c:55 msgid "_System Bookmarks" msgstr "_Sisteminės žymelės" -#: ../extensions/bookmarks/callbacks.c:56 +#: ../extensions/bookmarks/callbacks.c:58 msgid "_Add Bookmark" msgstr "_Pridėti žymelę" -#: ../extensions/bookmarks/callbacks.c:57 +#: ../extensions/bookmarks/callbacks.c:59 msgid "Add current location to bookmarks" msgstr "Įtraukti esamą vietą į žymeles" -#: ../extensions/bookmarks/callbacks.c:61 +#: ../extensions/bookmarks/callbacks.c:63 msgid "_Edit Bookmarks..." msgstr "K_eisti žymeles..." -#: ../extensions/bookmarks/callbacks.c:62 +#: ../extensions/bookmarks/callbacks.c:64 msgid "Edit bookmarks" msgstr "Keisti žymeles" @@ -503,13 +564,13 @@ msgstr "Ž_ymelės:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "_Vieta" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "_Pavadinimas" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Vieta" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "Nepavyko pašalinti žymelės" @@ -543,149 +604,179 @@ msgstr "Esamas aplankas ir jo poaplankiai" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "Šaltinis" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "_Pasirinkti failai" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Šaltinis" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Rašyti į diską" -#: ../extensions/catalogs/actions.c:62 -msgid "Could not remove the files from the catalog" -msgstr "Nepavyko pašalinti failų iš katalogo" - -#: ../extensions/catalogs/actions.c:120 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:633 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:642 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:670 -#: ../extensions/search/gth-search.c:295 -msgid "Invalid file format" -msgstr "Netinkamas failo formatas" +#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#, c-format +msgid "Error interpreting JPEG image file: %s" +msgstr "Klaida interpretuojant JPEG paveikslėlio failą: %s" -#: ../extensions/catalogs/actions.c:189 -#: ../extensions/catalogs/dlg-add-to-catalog.c:265 -msgid "Enter the catalog name: " -msgstr "Įveskite katalogo pavadinimą: " - -#: ../extensions/catalogs/actions.c:193 ../extensions/catalogs/actions.c:259 -#: ../extensions/catalogs/dlg-add-to-catalog.c:269 -#: ../extensions/catalogs/dlg-add-to-catalog.c:335 -#: ../extensions/file_manager/actions.c:45 +#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#, c-format +msgid "Unknown JPEG color space (%d)" +msgstr "Nežinoma JPEG spalvų sritis (%d)" + +#: ../extensions/catalogs/actions.c:92 +#: ../extensions/catalogs/actions.c:213 +#: ../extensions/catalogs/dlg-add-to-catalog.c:274 +#: ../extensions/catalogs/dlg-add-to-catalog.c:394 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 +#, c-format +msgid "No name specified" +msgstr "Nenurodytas pavadinimas" + +#: ../extensions/catalogs/actions.c:99 +#: ../extensions/catalogs/actions.c:220 +#: ../extensions/catalogs/dlg-add-to-catalog.c:281 +#: ../extensions/catalogs/dlg-add-to-catalog.c:401 +#: ../extensions/file_manager/actions.c:75 +#, c-format +msgid "Invalid name. The following characters are not allowed: %s" +msgstr "Netinkamas pavadinimas. Šie simboliai yra neleistini: %s" + +#: ../extensions/catalogs/actions.c:155 +#: ../extensions/catalogs/actions.c:267 +#: ../extensions/catalogs/dlg-add-to-catalog.c:338 +#: ../extensions/catalogs/dlg-add-to-catalog.c:448 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 +msgid "Name already used" +msgstr "Pavadinimas jau naudojamas" + +#: ../extensions/catalogs/actions.c:178 +#: ../extensions/catalogs/dlg-add-to-catalog.c:359 +#| msgid "_New Catalog" +msgid "New catalog" +msgstr "Naujas katalogas" + +#: ../extensions/catalogs/actions.c:179 +#: ../extensions/catalogs/dlg-add-to-catalog.c:360 +#| msgid "Enter the catalog name: " +msgid "Enter the catalog name:" +msgstr "Įveskite katalogo pavadinimą:" + +#: ../extensions/catalogs/actions.c:181 +#: ../extensions/catalogs/actions.c:293 +#: ../extensions/catalogs/dlg-add-to-catalog.c:362 +#: ../extensions/catalogs/dlg-add-to-catalog.c:474 +#: ../extensions/file_manager/actions.c:136 msgid "C_reate" msgstr "Suku_rti" -#: ../extensions/catalogs/actions.c:233 -#: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/catalogs/dlg-add-to-catalog.c:310 -#: ../extensions/search/gth-search-task.c:332 -msgid "Could not create the catalog" -msgstr "Nepavyko sukurti katalogo" - -#: ../extensions/catalogs/actions.c:255 -#: ../extensions/catalogs/dlg-add-to-catalog.c:331 -msgid "Enter the library name: " -msgstr "Įveskite bibliotekos pavadinimą: " - -#: ../extensions/catalogs/actions.c:299 -#: ../extensions/catalogs/dlg-add-to-catalog.c:375 -msgid "Could not create the library" -msgstr "Nepavyko sukurti bibliotekos" +#: ../extensions/catalogs/actions.c:290 +#: ../extensions/catalogs/dlg-add-to-catalog.c:471 +#| msgid "New Library" +msgid "New library" +msgstr "Nauja biblioteka" + +#: ../extensions/catalogs/actions.c:291 +#: ../extensions/catalogs/dlg-add-to-catalog.c:472 +#| msgid "Enter the library name: " +msgid "Enter the library name:" +msgstr "Įveskite bibliotekos pavadinimą:" -#: ../extensions/catalogs/actions.c:331 +#: ../extensions/catalogs/actions.c:326 msgid "Could not remove the catalog" msgstr "Nepavyko pervadinti katalogo" -#: ../extensions/catalogs/actions.c:365 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" msgstr "Ar tikrai norite ištrinti „%s“?" -#: ../extensions/catalogs/callbacks.c:98 +#: ../extensions/catalogs/callbacks.c:102 msgid "_Add to Catalog" msgstr "Į_dėti į katalogą" -#: ../extensions/catalogs/callbacks.c:101 +#: ../extensions/catalogs/callbacks.c:105 msgid "Open _Folder" msgstr "Atverti _aplanką" -#: ../extensions/catalogs/callbacks.c:102 +#: ../extensions/catalogs/callbacks.c:106 msgid "Go to the folder that contains the selected file" msgstr "Atverti aplanką, kuriame yra pasirinktas failas" -#: ../extensions/catalogs/callbacks.c:106 -#: ../extensions/edit_metadata/callbacks.c:106 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:87 +#: ../extensions/catalogs/callbacks.c:110 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Kitas..." -#: ../extensions/catalogs/callbacks.c:107 +#: ../extensions/catalogs/callbacks.c:111 msgid "Choose another catalog" msgstr "Pasirinkti kitą katalogą" -#: ../extensions/catalogs/callbacks.c:111 +#: ../extensions/catalogs/callbacks.c:115 msgid "_Add to Catalog..." msgstr "Į_dėti į katalogą..." -#: ../extensions/catalogs/callbacks.c:112 +#: ../extensions/catalogs/callbacks.c:116 msgid "Add selected images to a catalog" msgstr "Įdėti pasirinktus paveikslėlius į katalogą" -#: ../extensions/catalogs/callbacks.c:116 +#: ../extensions/catalogs/callbacks.c:120 msgid "Remo_ve from Catalog" msgstr "Pašalin_ti iš katalogo" -#: ../extensions/catalogs/callbacks.c:117 +#: ../extensions/catalogs/callbacks.c:121 msgid "Remove selected images from the catalog" msgstr "Iš katalogo pašalinti pasirinktus paveikslėlius" -#: ../extensions/catalogs/callbacks.c:121 +#: ../extensions/catalogs/callbacks.c:125 msgid "Create _Catalog" msgstr "Sukurti _katalogą" -#: ../extensions/catalogs/callbacks.c:126 +#: ../extensions/catalogs/callbacks.c:130 msgid "Create _Library" msgstr "Sukurti _biblioteką" -#: ../extensions/catalogs/callbacks.c:136 +#: ../extensions/catalogs/callbacks.c:140 msgid "Rena_me" msgstr "_Pervadinti" -#: ../extensions/catalogs/callbacks.c:263 -#: ../extensions/catalogs/callbacks.c:266 +#: ../extensions/catalogs/callbacks.c:279 +#: ../extensions/catalogs/callbacks.c:282 msgid "Command Line" msgstr "Komandų eilutė" -#: ../extensions/catalogs/callbacks.c:481 -#: ../extensions/catalogs/callbacks.c:486 -#: ../extensions/photo_importer/dlg-photo-importer.c:313 -#: ../extensions/photo_importer/dlg-photo-importer.c:353 -#: ../gthumb/gth-file-list.c:44 ../gthumb/gth-folder-tree.c:874 +#: ../extensions/catalogs/callbacks.c:497 +#: ../extensions/catalogs/callbacks.c:502 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 +#: ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(tuščia)" -#: ../extensions/catalogs/callbacks.c:679 +#: ../extensions/catalogs/callbacks.c:697 msgid "Catalog Properties" msgstr "Katalogo savybės" -#: ../extensions/catalogs/callbacks.c:693 +#: ../extensions/catalogs/callbacks.c:711 msgid "Organize" msgstr "Sutvarkyti" -#: ../extensions/catalogs/callbacks.c:694 +#: ../extensions/catalogs/callbacks.c:712 msgid "Automatically organize files by date" msgstr "Automatiškai sutvarkyti failus pagal datą" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1024 +#: ../extensions/catalogs/gth-catalog.c:1025 msgid "Catalogs" msgstr "Katalogai" @@ -702,122 +793,130 @@ msgstr "K_atalogai:" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "Nauja _biblioteka" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "_Naujas katalogas" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "Nauja _biblioteka" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/webalbums/gth-web-exporter.c:1833 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1842 msgid "_View the destination" msgstr "Žiū_rėti paskirties aplanką" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "Katalogas" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:199 +#: ../gthumb/gth-file-properties.c:212 msgid "Properties" msgstr "Savybės" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Pavadinimas:" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "_Data:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:36 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "_Pavadinimas:" +msgid "Catalog" +msgstr "Katalogas" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -msgid "Catalog _Preview:" -msgstr "Katalogo _peržiūra:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 -msgid "Organization:" -msgstr "Tvarkymas:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "Tvarkyti failus" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" msgstr "Tvarkomi failai" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Tvarkymas:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Select All" msgstr "Pasirinkti visus" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "Nepasirinkti nieko" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "Katalogo _peržiūra:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:445 -#: ../gthumb/gth-main-default-tests.c:264 +#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Fotografavimo data" #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -#: ../gthumb/gth-main-default-tests.c:256 +#: ../gthumb/gth-main-default-tests.c:292 msgid "File modified date" msgstr "Failo pakeitimo data" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "Nepaisyti katalogų, kuriuose yra vienas failas" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "Dėti pavienius failus į katalogą:" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "Pavieniai" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:225 +#: ../extensions/comments/main.c:159 msgid "Tag" msgstr "Žyma" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 -#: ../gthumb/gth-main-default-tests.c:284 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "žyma" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "Žyma (įtaisyta)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "_Grupuoti failus pagal:" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "Į_traukti ir poaplankius" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Nepaisyti katalogų, kuriuose yra vienas failas" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Dėti pavienius failus į katalogą:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "žyma" +msgid "Singles" +msgstr "Pavieniai" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 msgid "Could not add the files to the catalog" msgstr "Nepavyko įdėti failų į katalogą" +#: ../extensions/catalogs/dlg-add-to-catalog.c:217 +#: ../extensions/search/gth-search-task.c:356 +msgid "Could not create the catalog" +msgstr "Nepavyko sukurti katalogo" + #: ../extensions/catalogs/dlg-catalog-properties.c:80 msgid "Could not save the catalog" msgstr "Nepavyko įrašyti katalogo" -#: ../extensions/catalogs/dlg-catalog-properties.c:166 +#: ../extensions/catalogs/dlg-catalog-properties.c:159 msgid "Could not load the catalog" msgstr "Nepavyko įkelti katalogo" @@ -825,17 +924,66 @@ msgid "Files will be organized in catalogs. No file will be moved on disk." msgstr "Failai bus suskirstyti katalogais. Jokie failai nebus perkelti diske." -#: ../extensions/catalogs/gth-catalog.c:1145 +#: ../extensions/catalogs/gth-catalog.c:1122 +#: ../extensions/comments/main.c:44 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Žymos" -#: ../extensions/catalogs/gth-file-source-catalogs.c:790 +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 +#, c-format +#| msgid "" +#| "An image named \"%s\" is already present. Do you want to overwrite it?" +msgid "The catalog '%s' already exists, do you want to overwrite it?" +msgstr "Katalogas pavadinimu „%s“ jau yra. Ar norite jį perrašyti?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 +#, c-format +#| msgid "" +#| "An image named \"%s\" is already present. Do you want to overwrite it?" +msgid "The library '%s' already exists, do you want to overwrite it?" +msgstr "Biblioteka pavadinimu „%s“ jau yra. Ar norite ją perrašyti?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 +#| msgid "Overwrite" +msgid "Over_write" +msgstr "Per_rašyti" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 +#| msgid "Could not move the files" +msgid "Cannot move the files" +msgstr "Nepavyko perkelti failų" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 +#| msgid "Could not move the files" +msgid "Cannot copy the files" +msgstr "Nepavyko perkopijuoti failų" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 +#| msgid "Invalid Destination" +msgid "Invalid destination." +msgstr "Netinkamas tikslas." + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format msgid "Copying files to '%s'" msgstr "Kopijuojami failai į „%s“" -#: ../extensions/catalogs/gth-organize-task.c:203 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1388 +msgid "Could not remove the files from the catalog" +msgstr "Nepavyko pašalinti failų iš katalogo" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1446 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/search/gth-search.c:265 +msgid "Invalid file format" +msgstr "Netinkamas failo formatas" + +#: ../extensions/catalogs/gth-organize-task.c:202 #, c-format msgid "Operation completed. Catalogs: %d. Images: %d." msgstr "Operacija baigta. Katalogų: %d. Paveikslėlių: %d." @@ -857,32 +1005,32 @@ msgstr "Pakeisti failo datą" #: ../extensions/change_date/data/ui/change-date.ui.h:1 -msgid "A_djust by" -msgstr "_Pakoreguoti" - -#: ../extensions/change_date/data/ui/change-date.ui.h:2 msgid "Change Date" msgstr "Pakeisti datą" -#: ../extensions/change_date/data/ui/change-date.ui.h:3 +#: ../extensions/change_date/data/ui/change-date.ui.h:2 msgid "Change the following values:" msgstr "Pakeisti šias reikšmes:" -#: ../extensions/change_date/data/ui/change-date.ui.h:4 -msgid "Change to:" -msgstr "Pakeisti į:" +#: ../extensions/change_date/data/ui/change-date.ui.h:3 +msgid "_Last modified date" +msgstr "_Paskutiniojo pakeitimo data" -#: ../extensions/change_date/data/ui/change-date.ui.h:5 +#: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Co_mment date" msgstr "Ko_mentaro data" +#: ../extensions/change_date/data/ui/change-date.ui.h:5 +msgid "Exif DateTimeOriginal tag" +msgstr "Exif DateTimeOriginal žyma" + #: ../extensions/change_date/data/ui/change-date.ui.h:6 -msgid "Date p_hoto was taken" -msgstr "_Fotografavimo data" +msgid "Change to:" +msgstr "Pakeisti į:" #: ../extensions/change_date/data/ui/change-date.ui.h:7 -msgid "Exif DateTimeOriginal tag" -msgstr "Exif DateTimeOriginal žyma" +msgid "The _following date:" +msgstr "Š_i data:" #: ../extensions/change_date/data/ui/change-date.ui.h:8 msgid "File _modified date" @@ -893,27 +1041,53 @@ msgstr "Failo sukū_rimo data" #: ../extensions/change_date/data/ui/change-date.ui.h:10 -msgid "The _following date:" -msgstr "Š_i data:" +msgid "Date p_hoto was taken" +msgstr "_Fotografavimo data" #: ../extensions/change_date/data/ui/change-date.ui.h:11 -msgid "_Last modified date" -msgstr "_Paskutiniojo pakeitimo data" +msgid "A_djust by" +msgstr "_Pakoreguoti" #: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "hours" msgstr "valandos" -#: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "Pridėti komentarus ir žymas visų tipų failams." +#: ../extensions/change_date/data/ui/change-date.ui.h:13 +#| msgid "The minutes" +msgid "minutes" +msgstr "minutės" -#: ../extensions/comments/comments.extension.in.in.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 +msgid "seconds" +msgstr "sekundės" + +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +msgid "+" +msgstr "+" + +#: ../extensions/change_date/data/ui/change-date.ui.h:16 +msgid "-" +msgstr "-" + +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Importuoti integruotus metaduomenis" + +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "Importuoti failuose įrašytus metaduomenis į gThumb komentarų sistemą" + +#: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "Komentarai ir žymos" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Pridėti komentarus ir žymas visų tipų failams." + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Nustatymai" @@ -921,112 +1095,508 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Sinchronizuoti su įtaisytais metaduomenimis" -#: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:101 +#: ../extensions/comments/main.c:34 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Komentaras" -#: ../extensions/comments/main.c:209 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +#: ../extensions/comments/main.c:40 +#: ../gthumb/gth-main-default-metadata.c:46 +msgid "Title" +msgstr "Pavadinimas" + +#: ../extensions/comments/main.c:41 +#: ../extensions/comments/main.c:143 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 +#: ../extensions/image_print/data/ui/print-layout.ui.h:8 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Aprašymas" -#: ../extensions/comments/main.c:217 ../gthumb/gth-main-default-metadata.c:50 +#: ../extensions/comments/main.c:42 +#: ../extensions/comments/main.c:151 +#: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Vieta" -#: ../extensions/convert_format/callbacks.c:45 -msgid "Convert Format..." -msgstr "Konvertuoti formatą..." +#: ../extensions/comments/main.c:43 +#: ../gthumb/gth-main-default-metadata.c:51 +msgid "Date" +msgstr "Data" -#: ../extensions/convert_format/callbacks.c:46 -msgid "Convert image format" -msgstr "Konvertuoti paveikslėlio formatą" +#: ../extensions/comments/main.c:45 +#: ../gthumb/gth-main-default-metadata.c:54 +msgid "Rating" +msgstr "Įvertinimas" -#: ../extensions/convert_format/convert_format.extension.in.in.h:1 -msgid "Convert format" -msgstr "Konvertuoti formatą" +#: ../extensions/contact_sheet/callbacks.c:59 +msgid "Contact _Sheet" +msgstr "Kontaktų _lapas" + +#: ../extensions/contact_sheet/callbacks.c:61 +msgid "Contact _Sheet..." +msgstr "Kontaktų _lapas..." + +#: ../extensions/contact_sheet/callbacks.c:62 +#| msgid "Create a new category" +msgid "Create a contact sheet" +msgstr "Sukurti kontaktų lapą" + +#: ../extensions/contact_sheet/callbacks.c:65 +#| msgid "I_mage Caption..." +msgid "Image _Wall..." +msgstr "Paveikslėlių _siena..." + +#: ../extensions/contact_sheet/callbacks.c:66 +#| msgid "Create Index Image" +msgid "Create an image-wall" +msgstr "Sukurti paveikslėlių sieną" + +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 +msgid "Contact Sheet" +msgstr "Kontaktų lapas" + +#: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 +#| msgid "Edit the comment and other information of the selected files" +msgid "Create an index image displaying the thumbnails of the selected files." +msgstr "Sukurti indekso paveikslėlį, rodantį pasirinktų failų miniatiūras." + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-crop.c:454 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Nėra" -#: ../extensions/convert_format/convert_format.extension.in.in.h:2 -msgid "Save images in a different format" -msgstr "Įrašyti paveikslėlius kitu formatu" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 +#| msgid "Singles" +msgid "Simple" +msgstr "Paprastas" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 +msgid "Simple with shadow" +msgstr "Paprastas su šešėliu" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 +msgid "Shadow only" +msgstr "Tik šešėlis" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 +#| msgid "Slideshow" +msgid "Slide" +msgstr "Skaidrė" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 +msgid "Inward Shadow" +msgstr "Vidinis šešėlis" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 +msgid "Outward Shadow" +msgstr "Išorinis šešėlis" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 +#| msgid "Desktop background" +msgid "Background" +msgstr "Fonas" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 +msgid "_Solid color" +msgstr "_Vientisa spalva" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 +msgid "_Gradient" +msgstr "_Perėjimas" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Choose destination folder" -msgstr "Pasirinkite paskirties aplanką" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +msgid "_Horizontal:" +msgstr "_Horizontalus:" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 -msgid "Convert Format" -msgstr "Konvertuoti formatą" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 +msgid "_Vertical:" +msgstr "_Vertikalus:" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -msgid "Destination" -msgstr "Tikslas" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 +msgid "Select a color" +msgstr "Pasirinkite spalvą" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 +#| msgid "Framerate" +msgid "Frame" +msgstr "Rėmelis" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 +#| msgid "St_yle" +msgid "_Style:" +msgstr "_Stilius:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 +#| msgid "Colo_r:" +msgid "C_olor:" +msgstr "S_palva:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 +#: ../extensions/rename_series/dlg-rename-series.c:57 +#| msgid "Next" +msgid "Text" +msgstr "Tekstas" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "Naujas formatas" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "A_ntraštė:" -#: ../extensions/convert_format/dlg-convert-format.c:91 -msgid "Converting images" -msgstr "Konvertuojami paveikslėliai" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 +#| msgid "Select None" +msgid "Select a font" +msgstr "Pasirinkite šriftą" -#: ../extensions/desktop_background/actions.c:139 -msgid "Could not show the desktop background properties" -msgstr "Nepavyko parodyti darbastalio fono savybių" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "P_oraštė:" -#: ../extensions/desktop_background/actions.c:203 -#: ../extensions/desktop_background/actions.c:221 -msgid "Could not set the desktop background" -msgstr "Nepavyko nustatyti darbastalio fono" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +#| msgid "Caption" +msgid "Caption:" +msgstr "Antraštė:" -#: ../extensions/desktop_background/callbacks.c:49 -msgid "Set as Desktop Background" -msgstr "Padaryti paveikslėlį darbalaukio fonu" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "Dabartinio puslapio numeris" -#: ../extensions/desktop_background/callbacks.c:50 -#: ../extensions/desktop_background/desktop_background.extension.in.in.h:2 -msgid "Set the image as desktop background" -msgstr "Padaryti paveikslėlį darbalaukio fonu" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Iš viso puslapių" -#: ../extensions/desktop_background/desktop_background.extension.in.in.h:1 -msgid "Desktop background" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Specialus kodas" + +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ formatas }" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "Dabartinė data" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "Paskirties _vieta:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "Pasirinkite paskirties aplanką" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#| msgid "Filename:" +msgid "File_name:" +msgstr "Failo pavadi_nimas:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Naujas išskaičiavimo skaitmuo" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +msgid "Create _HTML image map" +msgstr "Sukurti _HTML paveikslėlių žemėlapį" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/pixbuf_savers/preferences.c:134 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Įrašoma" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 +#| msgid "Create a new category" +msgid "Create a new theme" +msgstr "Sukurti naują temą" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 +#| msgid "Print the selected images" +msgid "Edit the selected theme" +msgstr "Keisti pasirinktą temą" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 +#| msgid "Delete the selected files" +msgid "Delete the selected theme" +msgstr "Ištrinti pasirinktą temą" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Tema" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Stulpeliai:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Paveikslėlių puslapyje:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Visus paveikslėlius viename puslapyje" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 +msgid "_All pages with the same size" +msgstr "_Visi puslapiai vienodo dydžio" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Išdėstymas" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "_Rikiuoti:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "At_virkštinė tvarka" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 +#| msgid "_Size :" +msgid "_Size:" +msgstr "_Dydis:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +#| msgid "Square" +msgid "Sq_uared" +msgstr "_Kvadratinis" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 +#| msgid "_Thumbnails" +msgid "Thumbnails" +msgstr "Miniatiūros" + +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 +#| msgid "Image Page" +msgid "Image Wall" +msgstr "Paveikslėlių siena" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 +#| msgid "Could not save the filter" +msgid "Could not save the theme" +msgstr "Nepavyko įrašyti temos" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 +#| msgid "Could not delete the files" +msgid "Could not delete the theme" +msgstr "Nepavyko ištrinti temos" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 +#| msgid "Creating image: %s.%s" +msgid "Creating images" +msgstr "Kuriami paveikslėliai" + +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 +#| msgid "Saving thumbnails" +msgid "Generating thumbnails" +msgstr "Generuojamos miniatiūros" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:32 +msgid "Header" +msgstr "Antraštė" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:33 +#| msgid "_Footer:" +msgid "Footer" +msgstr "Poraštė" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 +#| msgid "Properties" +msgid "Theme Properties" +msgstr "Temos savybės" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 +msgid "Copy _From" +msgstr "Kopijuoti _iš" + +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 +#| msgid "New Name" +msgid "New theme" +msgstr "Nauja tema" + +#: ../extensions/convert_format/callbacks.c:45 +msgid "Convert Format..." +msgstr "Konvertuoti formatą..." + +#: ../extensions/convert_format/callbacks.c:46 +msgid "Convert image format" +msgstr "Konvertuoti paveikslėlio formatą" + +#: ../extensions/convert_format/convert_format.extension.in.in.h:1 +msgid "Convert format" +msgstr "Konvertuoti formatą" + +#: ../extensions/convert_format/convert_format.extension.in.in.h:2 +msgid "Save images in a different format" +msgstr "Įrašyti paveikslėlius kitu formatu" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 +msgid "Convert Format" +msgstr "Konvertuoti formatą" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Naujas formatas" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:3 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +msgid "Destination" +msgstr "Tikslas" + +#: ../extensions/convert_format/data/ui/convert-format.ui.h:5 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#| msgid "Restore the original desktop wallpaper" +msgid "_Use the original image folder" +msgstr "Na_udoti originalų paveikslėlio aplanką" + +#: ../extensions/convert_format/dlg-convert-format.c:93 +msgid "Converting images" +msgstr "Konvertuojami paveikslėliai" + +#: ../extensions/desktop_background/actions.c:162 +msgid "Could not show the desktop background properties" +msgstr "Nepavyko parodyti darbastalio fono savybių" + +#: ../extensions/desktop_background/actions.c:228 +#: ../extensions/desktop_background/actions.c:246 +msgid "Could not set the desktop background" +msgstr "Nepavyko nustatyti darbastalio fono" + +#: ../extensions/desktop_background/callbacks.c:49 +msgid "Set as Desktop Background" +msgstr "Padaryti paveikslėlį darbalaukio fonu" + +#: ../extensions/desktop_background/callbacks.c:50 +#: ../extensions/desktop_background/desktop_background.extension.in.in.h:2 +msgid "Set the image as desktop background" +msgstr "Padaryti paveikslėlį darbalaukio fonu" + +#: ../extensions/desktop_background/desktop_background.extension.in.in.h:1 +msgid "Desktop background" msgstr "Darbastalio fonas" -#: ../extensions/edit_metadata/callbacks.c:98 +#: ../extensions/edit_metadata/actions.c:66 +#| msgid "Are you sure you want to permanently delete the %'d selected file?" +#| msgid_plural "" +#| "Are you sure you want to permanently delete the %'d selected files?" +msgid "Are you sure you want to permanently delete the metadata of the selected files?" +msgstr "Ar tikrai norite negrįžtamai ištrinti pasirinktų failų metaduomenis?" + +#: ../extensions/edit_metadata/actions.c:73 +#| msgid "If you delete a file, it will be permanently lost." +msgid "If you delete the metadata, it will be permanently lost." +msgstr "Jei ištrinsite metaduomenis, jie bus negrįžtamai prarasti." + +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "_Žymos:" -#: ../extensions/edit_metadata/callbacks.c:102 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" msgstr "Taisyti pasirinktų failų komentarą ir kitą informaciją" #: ../extensions/edit_metadata/callbacks.c:107 -msgid "Choose another tag" -msgstr "Pasirinkti kitą žymą" +#| msgid "Delete the selected files" +msgid "Set the tags of the selected files" +msgstr "Nustatyti pasirinktų failų žymas" + +#: ../extensions/edit_metadata/callbacks.c:112 +#| msgid "Metadata" +msgid "Delete Metadata" +msgstr "Ištrinti metaduomenis" + +#: ../extensions/edit_metadata/callbacks.c:113 +#| msgid "Edit the comment and other information of the selected files" +msgid "Delete the comment and the embedded metadata of the selected files" +msgstr "Ištrinti pasirinktų failų komentarus ir integruotus metaduomenis" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "_Aprašymas:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Vieta:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "_Žymos:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "_Vieta:" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "Į_vertinimas:" @@ -1035,86 +1605,95 @@ msgid "_Title:" msgstr "_Pavadinimas:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:56 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "Nepavyko įrašyti failo metaduomenų" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:109 -#: ../extensions/rename_series/actions.c:37 -#: ../gthumb/gth-overwrite-dialog.c:162 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "Nepavyko perskaityti failo informacijos" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Taisyti metaduomenis" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Allow to edit files metadata." msgstr "Leisti taisyti failų metaduomenis." -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 -msgid "Edit metadata" -msgstr "Taisyti metaduomenis" +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "%s metaduomenys" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d failas" +msgstr[1] "%d failai" +msgstr[2] "%d failų" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +#| msgid "Da_te and Time" +msgid "Sa_ve and Close" +msgstr "Įrašyti ir už_verti" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Įrašyti tik pa_keistus laukelius" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:442 +#: ../extensions/edit_metadata/gth-edit-general-page.c:547 msgid "No date" msgstr "Nėra datos" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:443 +#: ../extensions/edit_metadata/gth-edit-general-page.c:548 msgid "The following date" msgstr "Ši data" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:444 -#: ../extensions/importer/gth-import-preferences-dialog.c:328 +#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Dabartinė data" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:446 +#: ../extensions/edit_metadata/gth-edit-general-page.c:551 msgid "Last modified date" msgstr "Paskutiniojo pakeitimo data" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:447 +#: ../extensions/edit_metadata/gth-edit-general-page.c:552 msgid "File creation date" msgstr "Failo sukūrimo data" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:448 +#: ../extensions/edit_metadata/gth-edit-general-page.c:553 msgid "Do not modify" msgstr "Nekeisti" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:106 -msgid "Save only cha_nged fields" -msgstr "Įrašyti tik pa_keistus laukelius" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:162 -#, c-format -msgid "%s Metadata" -msgstr "%s metaduomenys" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:166 -#: ../extensions/flicker/dlg-import-from-flickr.c:331 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d failas" -msgstr[1] "%d failai" -msgstr[2] "%d failų" +#| msgid "Tags" +msgid "%s Tags" +msgstr "%s Žymos" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Nauja žyma" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 msgid "Assign Tags" msgstr "Priskirti žymas" -#: ../extensions/edit_metadata/gth-tag-task.c:113 -#: ../extensions/edit_metadata/gth-tag-task.c:130 +#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:132 msgid "Assigning tags to the selected files" msgstr "Priskirti žymas pasirinktiems failams" -#: ../extensions/edit_metadata/gth-tag-task.c:113 +#: ../extensions/edit_metadata/gth-tag-task.c:115 msgid "Writing files" msgstr "Įrašomi failai" -#: ../extensions/edit_metadata/gth-tag-task.c:130 +#: ../extensions/edit_metadata/gth-tag-task.c:132 msgid "Reading files" msgstr "Skaitomi failai" @@ -1127,58 +1706,53 @@ msgstr "Plėtinio pavyzdys." #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "Autoriaus eilutės _antraštė:" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "_Autoriaus teisės:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "Ša_lis:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Kodas:" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "Kū_rėjai:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "_Byline:" -msgstr "Autoriaus _eilutė:" - #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_City:" -msgstr "_Miestas:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Šaltinis:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_Code:" -msgstr "_Kodas:" +msgid "_Urgency:" +msgstr "Sk_ubumas:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:41 -msgid "_Destination:" -msgstr "Paskirties _vieta:" +msgid "_Object Name:" +msgstr "_Objekto pavadinimas:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -msgid "_Language:" -msgstr "Ka_lba:" +msgid "Byline _Title:" +msgstr "Autoriaus eilutės _antraštė:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Object Name:" -msgstr "_Objekto pavadinimas:" +msgid "_Byline:" +msgstr "Autoriaus _eilutė:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Source:" -msgstr "_Šaltinis:" +msgid "_City:" +msgstr "_Miestas:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -msgid "_Urgency:" -msgstr "Sk_ubumas:" +msgid "_Language:" +msgstr "Ka_lba:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 +msgid "State/Province:" +msgstr "Valstija/provincija:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1232,11 +1806,11 @@ msgid "XMP Attached" msgstr "XPM prisegtas" -#: ../extensions/exiv2_tools/main.c:245 +#: ../extensions/exiv2_tools/main.c:256 msgid "date photo was taken" msgstr "fotografavimo data" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" msgstr "Dalytis" @@ -1249,174 +1823,205 @@ msgstr "Įkelti fotografijas į Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 -msgid "A_lbum:" -msgstr "A_lbumas:" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +msgid "Export to Flickr" +msgstr "Eksportuoti į Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 -msgid "Add a new album" -msgstr "Pridėti naują albumą" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "S_iųsti" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "Keisti paskyras" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +msgid "_Account:" +msgstr "_Paskyra:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "Eksportuoti į Flickr" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Keisti paskyras" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:13 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -msgid "_Account:" -msgstr "_Paskyra:" +msgid "A_lbum:" +msgstr "A_lbumas:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "S_iųsti" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +msgid "Add a new album" +msgstr "Pridėti naują albumą" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +#| msgid "_Resize if larger than:" +msgid "Resize the images if larger than this size" +msgstr "Keisti dydį, jei didesnis nei" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +msgid "_Resize to:" +msgstr "_Keisti dydį į:" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 +#| msgid "200 x 200" +msgid "720 x 720" +msgstr "720 x 720" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 +msgid "1024 x 1024" +msgstr "1024 x 1024" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 +msgid "1280 x 1280" +msgstr "1280 x 1280" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 +#| msgid "800 x 600" +msgid "1600 x 1600" +msgstr "1600 x 1600" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 +#| msgid "48 x 48" +msgid "2048 x 2048" +msgstr "2048 x 2048" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 msgid "A_ccount:" msgstr "P_askyra:" #: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-account-manager.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 #: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 #: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 msgid "A_ccounts:" msgstr "P_askyros:" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "Private" -msgstr "Privatus" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 +msgid "Public photos" +msgstr "Viešos fotografijos" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Private photos, visible to friends" msgstr "Privačios fotografijos, matomos draugams" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:10 -msgid "Public photos" -msgstr "Viešos fotografijos" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Privatus" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 -msgid "_Location:" -msgstr "_Vieta:" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 msgid "_Visibility:" msgstr "_Matomumas:" #: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-ask-authorization.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 msgid "_Authorize..." msgstr "_Nustatyti tapatybę..." #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-complete-authorization.ui.h:1 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Kai baigsite, spustelėkite žemiau esantį mygtuką „Tęsti“." + +#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 +#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 msgid "C_ontinue" msgstr "_Tęsti" -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker/flickr-authentication.c:438 -#: ../extensions/oauth/oauth-authentication.c:450 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Kai baigsite, spustelėkite žemiau esantį mygtuką „Tęsti“." - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-export-completed.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:1 msgid "Files successfully uploaded to the server." msgstr "Failai sėkmingai nusiųsti serveriui." #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:2 -#: ../extensions/flicker/data/ui/flicker-export-completed.ui.h:2 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1832 +#: ../extensions/webalbums/gth-web-exporter.c:1841 msgid "_Open in the Browser" msgstr "_Atverti naršyklėje" -#: ../extensions/facebook/dlg-export-to-facebook.c:121 -#: ../extensions/facebook/dlg-export-to-facebook.c:312 -#: ../extensions/facebook/facebook-authentication.c:219 -#: ../extensions/flicker/dlg-export-to-flickr.c:137 -#: ../extensions/flicker/dlg-export-to-flickr.c:395 -#: ../extensions/flicker/dlg-import-from-flickr.c:234 -#: ../extensions/flicker/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:374 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:421 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:363 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "Nepavyko prisijungti prie serverio" -#: ../extensions/facebook/dlg-export-to-facebook.c:172 -#: ../extensions/flicker/dlg-export-to-flickr.c:242 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:181 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:191 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:182 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 msgid "Could not upload the files" msgstr "Nepavyko nusiųsti failų" -#: ../extensions/facebook/dlg-export-to-facebook.c:388 -#: ../extensions/flicker/dlg-export-to-flickr.c:186 -#: ../extensions/flicker/dlg-export-to-flickr.c:220 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:459 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:713 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 msgid "Could not create the album" msgstr "Nepavyko sukurti albumo" -#: ../extensions/facebook/dlg-export-to-facebook.c:456 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:530 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:778 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 msgid "New Album" msgstr "Naujas albumas" -#: ../extensions/facebook/dlg-export-to-facebook.c:535 -#: ../extensions/flicker/dlg-export-to-flickr.c:521 -#: ../extensions/image_print/gth-image-print-job.c:1542 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:610 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:997 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 +#: ../extensions/image_print/gth-image-print-job.c:1789 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 msgid "No valid file selected." msgstr "Nepasirinkta tinkamų failų." -#: ../extensions/facebook/dlg-export-to-facebook.c:536 -#: ../extensions/flicker/dlg-export-to-flickr.c:522 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:611 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:998 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 msgid "Could not export the files" msgstr "Nepavyko eksportuoti failų" -#: ../extensions/facebook/dlg-export-to-facebook.c:543 -#: ../extensions/flicker/dlg-export-to-flickr.c:529 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:618 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1004 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:785 -#: ../gthumb/gth-browser.c:939 ../gthumb/gth-browser.c:940 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:255 +#: ../extensions/find_duplicates/gth-find-duplicates.c:347 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:1005 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" @@ -1424,78 +2029,71 @@ msgstr[1] "%d failai (%s)" msgstr[2] "%d failų (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:565 -#: ../extensions/flicker/dlg-export-to-flickr.c:552 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:638 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 #, c-format msgid "Export to %s" msgstr "Eksportuoti į %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:230 -#: ../extensions/flicker/flickr-account-chooser-dialog.c:230 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:230 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "Iš naujo nustatyti tapatybę..." -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." msgstr "Pasirinkite _paskyrą..." -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker/flickr-authentication.c:437 -#: ../extensions/oauth/oauth-authentication.c:449 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 #, c-format -msgid "" -"Return to this window when you have finished the authorization process on %s" +msgid "Return to this window when you have finished the authorization process on %s" msgstr "Grįžkite į šį langą, kai nustatysite tapatybę %s" -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker/flickr-authentication.c:517 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" msgstr "gThumb reikalauja nustatyti jūsų tapatybę fotografijoms siųsti į %s" -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker/flickr-authentication.c:518 -#: ../extensions/oauth/oauth-authentication.c:530 -#, c-format -msgid "" -"Click 'Authorize' to open your web browser and authorize gthumb to upload " -"photos to %s. When you're finished, return to this window to complete the " -"authorization." -msgstr "" -"Spustelėkite „Nustatyti tapatybę“, kad atvertumėte žiniatinklio naršyklę ir " -"nustatytumėte tapatybę norėdami įkelti fotografijas į %s. Kai baigsite, " -"grįžkite į šį langą tapatybės nustatymo procedūrai baigti." - -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker/flickr-authentication.c:618 -#: ../extensions/oauth/oauth-authentication.c:632 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:815 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:666 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 +#, c-format +msgid "Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization." +msgstr "Spustelėkite „Nustatyti tapatybę“, kad atvertumėte žiniatinklio naršyklę ir nustatytumėte tapatybę norėdami įkelti fotografijas į %s. Kai baigsite, grįžkite į šį langą tapatybės nustatymo procedūrai baigti." + +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Pasirinkite paskyrą" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker/flickr-authentication.c:727 -#: ../extensions/oauth/oauth-authentication.c:741 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:876 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:727 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Keisti paskyras" -#: ../extensions/facebook/facebook-connection.c:294 -#: ../extensions/facebook/facebook-connection.c:452 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:291 -#: ../extensions/facebook/facebook-service.c:494 -#: ../extensions/flicker/flickr-connection.c:290 -#: ../extensions/flicker/flickr-connection.c:441 -#: ../extensions/flicker/flickr-service.c:220 -#: ../extensions/flicker/flickr-service.c:423 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:195 +#: ../extensions/flicker_utils/flickr-service.c:398 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -1503,17 +2101,17 @@ msgid "Unknown error" msgstr "Nežinoma klaida" -#: ../extensions/facebook/facebook-connection.c:329 -#: ../extensions/facebook/facebook-connection.c:478 -#: ../extensions/facebook/facebook-service.c:214 -#: ../extensions/facebook/facebook-service.c:316 -#: ../extensions/flicker/flickr-connection.c:316 -#: ../extensions/flicker/flickr-connection.c:467 -#: ../extensions/flicker/flickr-service.c:244 -#: ../extensions/oauth/oauth-connection.c:375 -#: ../extensions/oauth/oauth-connection.c:450 -#: ../extensions/oauth/oauth-connection.c:554 -#: ../extensions/picasaweb/google-connection.c:363 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" msgstr "Jungiamasi prie serverio" @@ -1525,216 +2123,225 @@ msgid "Upload images to Facebook" msgstr "Įkelti paveikslėlius į Facebook" -#: ../extensions/facebook/facebook-service.c:214 -#: ../extensions/facebook/facebook-service.c:316 -#: ../extensions/flicker/flickr-service.c:244 -#: ../extensions/oauth/oauth-connection.c:375 -#: ../extensions/oauth/oauth-connection.c:450 -#: ../extensions/oauth/oauth-connection.c:554 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "Gaunama paskyros informacija" -#: ../extensions/facebook/facebook-service.c:422 -#: ../extensions/flicker/flickr-service.c:348 -#: ../extensions/photobucket/photobucket-service.c:235 -#: ../extensions/picasaweb/picasa-web-service.c:237 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:209 msgid "Getting the album list" msgstr "Gaunamas albumų sąrašas" -#: ../extensions/facebook/facebook-service.c:551 -#: ../extensions/flicker/flickr-service.c:451 -#: ../extensions/flicker/flickr-service.c:571 -#: ../extensions/flicker/flickr-service.c:609 -#: ../extensions/photobucket/photobucket-service.c:344 -#: ../extensions/picasaweb/picasa-web-service.c:328 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:426 +#: ../extensions/flicker_utils/flickr-service.c:546 +#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:300 msgid "Creating the new album" msgstr "Kuriamas naujas albumas" -#: ../extensions/facebook/facebook-service.c:610 -#: ../extensions/flicker/flickr-service.c:659 -#: ../extensions/photobucket/photobucket-service.c:401 -#: ../extensions/picasaweb/picasa-web-service.c:385 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:357 #, c-format msgid "Could not upload '%s': %s" msgstr "Nepavyko įkelti „%s“: %s" #. Translators: %s is a filename -#. send the file -#. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:810 -#: ../extensions/flicker/flickr-service.c:837 -#: ../extensions/photobucket/photobucket-service.c:524 -#: ../extensions/picasaweb/picasa-web-service.c:520 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:412 #, c-format msgid "Uploading '%s'" msgstr "Įkeliama „%s“" #: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker/flickr-service.c:915 -#: ../extensions/photobucket/photobucket-service.c:605 -#: ../extensions/picasaweb/picasa-web-service.c:594 +#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:605 msgid "Uploading the files to the server" msgstr "Failai siunčiami serveriui" -#: ../extensions/facebook/facebook-service.c:1002 -#: ../extensions/flicker/flickr-service.c:1031 -#: ../extensions/picasaweb/picasa-web-service.c:715 +#: ../extensions/facebook/facebook-service.c:1003 +#: ../extensions/flicker_utils/flickr-service.c:1077 +#: ../extensions/picasaweb/picasa-web-service.c:718 msgid "Getting the photo list" msgstr "Gaunamas fotografijų sąrašas" -#: ../extensions/file_manager/actions.c:41 -msgid "Enter the folder name: " -msgstr "Įveskite aplanko pavadinimą: " - -#: ../extensions/file_manager/actions.c:69 -msgid "Could not create the folder" -msgstr "Nepavyko sukurti aplanko" - -#: ../extensions/file_manager/actions.c:328 -#: ../extensions/file_manager/callbacks.c:315 -#: ../extensions/file_manager/callbacks.c:719 +#: ../extensions/file_manager/actions.c:133 +#| msgid "_New Folder..." +msgid "New folder" +msgstr "Naujas aplankas" + +#: ../extensions/file_manager/actions.c:134 +#| msgid "Enter the folder name: " +msgid "Enter the folder name:" +msgstr "Įveskite aplanko pavadinimą:" + +#: ../extensions/file_manager/actions.c:400 +#: ../extensions/file_manager/callbacks.c:380 +#: ../extensions/file_manager/callbacks.c:842 msgid "Could not move the files" msgstr "Nepavyko perkelti failų" -#: ../extensions/file_manager/actions.c:329 -#: ../extensions/file_manager/callbacks.c:316 -#: ../extensions/file_manager/callbacks.c:720 -msgid "" -"Files cannot be moved to the current location, as alternative you can choose " -"to copy them." -msgstr "" -"Failų negalima perkelti į dabartinę vietą, tačiau galite juos nukopijuoti." - -#: ../extensions/file_manager/actions.c:421 -#: ../extensions/importer/gth-import-task.c:615 -msgid "Could not delete the files" -msgstr "Nepavyko ištrinti failų" +#: ../extensions/file_manager/actions.c:401 +#: ../extensions/file_manager/callbacks.c:381 +#: ../extensions/file_manager/callbacks.c:843 +msgid "Files cannot be moved to the current location, as alternative you can choose to copy them." +msgstr "Failų negalima perkelti į dabartinę vietą, tačiau galite juos nukopijuoti." -#: ../extensions/file_manager/actions.c:464 -msgid "" -"The files cannot be moved to the Trash. Do you want to delete them " -"permanently?" -msgstr "" -"Paveikslėlių negalima perkelti į šiukšlinę. Ar norite juos ištrinti " -"negrįžtamai?" +#: ../extensions/file_manager/actions.c:563 +msgid "Could not open the location" +msgstr "Nepavyko atverti vietos" -#: ../extensions/file_manager/actions.c:475 -msgid "Could not move the files to the Trash" -msgstr "Nepavyko perkelti failų į šiukšlinę" +#: ../extensions/file_manager/actions.c:696 +msgid "The folder is not empty, do you want to delete the folder and its content permanently?" +msgstr "Aplankas ne tuščias, ar norite negrįžtamai ištrinti aplanką ir jo turinį?" -#: ../extensions/file_manager/actions.c:524 -#, c-format -msgid "Are you sure you want to move \"%s\" to trash?" -msgstr "Ar tikrai norite perkelti „%s“ į šiukšlinę?" +#: ../extensions/file_manager/actions.c:712 +msgid "Could not delete the folder" +msgstr "Nepavyko ištrinti aplanko" -#: ../extensions/file_manager/actions.c:527 -#, c-format -msgid "Are you sure you want to move to trash the %'d selected file?" -msgid_plural "Are you sure you want to move to trash the %'d selected files?" -msgstr[0] "Ar tikrai norite perkelti į šiukšlinę %'d pasirinktą failą?" -msgstr[1] "Ar tikrai norite perkelti į šiukšlinę %'d pasirinktus failus?" -msgstr[2] "Ar tikrai norite perkelti į šiukšlinę %'d pasirinktų failų?" +#: ../extensions/file_manager/actions.c:773 +msgid "The folder cannot be moved to the Trash. Do you want to delete it permanently?" +msgstr "Paveikslėlių negalima perkelti į šiukšlinę. Ar norite juos ištrinti negrįžtamai?" -#: ../extensions/file_manager/actions.c:539 -#: ../extensions/file_manager/callbacks.c:168 -#: ../extensions/file_manager/callbacks.c:200 -msgid "Mo_ve to Trash" -msgstr "Perkel_ti į šiukšlinę" +#: ../extensions/file_manager/actions.c:780 +msgid "Could not move the folder to the Trash" +msgstr "Nepavyko perkelti aplanko į šiukšlinę" -#: ../extensions/file_manager/actions.c:571 -#: ../extensions/file_manager/actions.c:862 +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" msgstr "Ar tikrai norite negrįžtamai ištrinti „%s“?" -#: ../extensions/file_manager/actions.c:574 -#, c-format -msgid "Are you sure you want to permanently delete the %'d selected file?" -msgid_plural "" -"Are you sure you want to permanently delete the %'d selected files?" -msgstr[0] "Ar tikrai norite negrįžtamai ištrinti %'d pasirinktą failą?" -msgstr[1] "Ar tikrai norite negrįžtamai ištrinti %'d pasirinktus failus?" -msgstr[2] "Ar tikrai norite negrįžtamai ištrinti %'d pasirinktų failų?" - -#: ../extensions/file_manager/actions.c:584 -#: ../extensions/file_manager/actions.c:872 +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "Jei ištrinsite failą, jis bus negrįžtamai prarastas." -#: ../extensions/file_manager/actions.c:614 -msgid "Could not open the location" -msgstr "Nepavyko atverti vietos" - -#: ../extensions/file_manager/actions.c:746 -msgid "" -"The folder is not empty, do you want to delete the folder and its content " -"permanently?" -msgstr "" -"Aplankas ne tuščias, ar norite negrįžtamai ištrinti aplanką ir jo turinį?" - -#: ../extensions/file_manager/actions.c:762 -msgid "Could not delete the folder" -msgstr "Nepavyko ištrinti aplanko" - -#: ../extensions/file_manager/actions.c:821 -msgid "" -"The folder cannot be moved to the Trash. Do you want to delete it " -"permanently?" -msgstr "" -"Paveikslėlių negalima perkelti į šiukšlinę. Ar norite juos ištrinti " -"negrįžtamai?" - -#: ../extensions/file_manager/actions.c:828 -msgid "Could not move the folder to the Trash" -msgstr "Nepavyko perkelti aplanko į šiukšlinę" +#: ../extensions/file_manager/actions.c:920 +#| msgid "_Move" +msgid "Move To" +msgstr "Perkelti į" + +#: ../extensions/file_manager/actions.c:920 +msgid "Copy To" +msgstr "Kopijuoti į" + +#: ../extensions/file_manager/actions.c:924 +#| msgid "_Move" +msgid "Move" +msgstr "Perkelti" + +#: ../extensions/file_manager/actions.c:924 +#| msgid "Crop" +msgid "Copy" +msgstr "Kopijuoti" -#: ../extensions/file_manager/callbacks.c:148 -#: ../extensions/file_manager/callbacks.c:180 +#: ../extensions/file_manager/callbacks.c:163 +#: ../extensions/file_manager/callbacks.c:199 msgid "Create _Folder" msgstr "Sukurti _aplanką" -#: ../extensions/file_manager/callbacks.c:149 -#: ../extensions/file_manager/callbacks.c:181 +#: ../extensions/file_manager/callbacks.c:164 +#: ../extensions/file_manager/callbacks.c:200 msgid "Create a new empty folder inside this folder" msgstr "Sukurti naują tuščią aplanką šiame aplanke" -#: ../extensions/file_manager/callbacks.c:164 +#: ../extensions/file_manager/callbacks.c:179 msgid "D_uplicate" msgstr "D_ubliuoti" -#: ../extensions/file_manager/callbacks.c:165 +#: ../extensions/file_manager/callbacks.c:180 msgid "Duplicate the selected files" msgstr "Dubliuoti pasirinktus failus" -#: ../extensions/file_manager/callbacks.c:169 +#: ../extensions/file_manager/callbacks.c:183 +#: ../extensions/file_manager/callbacks.c:219 +#: ../gthumb/gth-file-source-vfs.c:813 +msgid "Mo_ve to Trash" +msgstr "Perkel_ti į šiukšlinę" + +#: ../extensions/file_manager/callbacks.c:184 msgid "Move the selected files to the Trash" msgstr "Perkelti pasirinktus failus į šiukšlinę" -#: ../extensions/file_manager/callbacks.c:172 -#: ../extensions/file_manager/callbacks.c:204 +#: ../extensions/file_manager/callbacks.c:187 +#: ../extensions/file_manager/callbacks.c:223 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 msgid "_Delete" msgstr "Iš_trinti" -#: ../extensions/file_manager/callbacks.c:173 +#: ../extensions/file_manager/callbacks.c:188 msgid "Delete the selected files" msgstr "Ištrinti pasirinktus failus" -#: ../extensions/file_manager/callbacks.c:176 -msgid "Open with the _File Manager" -msgstr "Atverti _failų naršyklėje" - -#: ../extensions/file_manager/callbacks.c:184 -#: ../extensions/rename_series/callbacks.c:47 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +#: ../extensions/file_manager/callbacks.c:191 +#: ../extensions/file_manager/callbacks.c:203 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "Pe_rvadinti" -#: ../extensions/file_manager/callbacks.c:196 +#: ../extensions/file_manager/callbacks.c:192 +msgid "Rename the selected files" +msgstr "Pervadinti pasirinktus failus" + +#: ../extensions/file_manager/callbacks.c:195 +msgid "Open with the _File Manager" +msgstr "Atverti _failų naršyklėje" + +#: ../extensions/file_manager/callbacks.c:215 msgid "_Paste Into Folder" msgstr "Į_dėti į aplanką" -#: ../extensions/file_manager/callbacks.c:864 ../gthumb/gth-browser.c:4610 -#: ../gthumb/gth-browser.c:4647 +#: ../extensions/file_manager/callbacks.c:227 +#: ../extensions/file_manager/callbacks.c:236 +#| msgid "Crop..." +msgid "Copy to..." +msgstr "Kopijuoti į..." + +#: ../extensions/file_manager/callbacks.c:228 +#| msgid "Move the selected folder to the Trash" +msgid "Copy the selected folder to another folder" +msgstr "Kopijuoti pasirinktą aplanką į kitą" + +#: ../extensions/file_manager/callbacks.c:231 +#: ../extensions/file_manager/callbacks.c:240 +#| msgid "_Move..." +msgid "Move to..." +msgstr "Perke_lti į..." + +#: ../extensions/file_manager/callbacks.c:232 +#| msgid "Move the selected folder to the Trash" +msgid "Move the selected folder to another folder" +msgstr "Perkelti pasirinktą aplanką į kitą" + +#: ../extensions/file_manager/callbacks.c:237 +#| msgid "Move the selected files to the Trash" +msgid "Copy the selected files to another folder" +msgstr "Perkopijuoti pasirinktus failus į kitą aplanką" + +#: ../extensions/file_manager/callbacks.c:241 +#| msgid "Move the selected files to the Trash" +msgid "Move the selected files to another folder" +msgstr "Perkelti pasirinktus failus į kitą aplanką" + +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:581 +#: ../gthumb/gth-browser.c:4939 +#: ../gthumb/gth-browser.c:4973 msgid "Could not perform the operation" msgstr "Nepavyko įvykdyti operacijos" @@ -1751,315 +2358,626 @@ msgstr "Trinami failai" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "_Skaistis:" +#| msgid "_Preview:" +msgid "_Preview" +msgstr "_Peržiūra" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "Spalvų lygiai" +msgid "B_rightness:" +msgstr "_Skaistis:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "Kon_trastas:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "Žydra – _raudona:" +msgid "_Saturation:" +msgstr "_Grynis:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "G_ama" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "_Violetinė – žalia:" +msgid "Cyan-_Red:" +msgstr "Žydra – _raudona:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Reset" -msgstr "A_tstatyti" +msgid "_Magenta-Green:" +msgstr "_Violetinė – žalia:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -msgid "_Saturation:" -msgstr "_Grynis:" - -#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 msgid "_Yellow-Blue:" msgstr "_Geltona – mėlyna:" -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 +msgid "Color Levels" +msgstr "Spalvų lygiai" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "Proporcija" +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "A_tstatyti" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +msgid "_Position:" +msgstr "_Pozicija:" +#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "C_rop" -msgstr "Ap_kirpti" +msgid "×" +msgstr "×" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "I_nvertuoti proporciją" +msgid "_Grid:" +msgstr "_Tinklelis:" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 +msgid "Maximize" +msgstr "Išdidinti" -#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:7 -msgid "M_ultiple of:" -msgstr "_Kartotinis:" +#| msgid "Centered" +msgid "Center" +msgstr "Centruotas" #: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "Selection" msgstr "Pažymėta sritis" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -msgid "_Grid:" -msgstr "_Tinklelis:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "I_nvert aspect ratio" +msgstr "I_nvertuoti proporciją" +#. after the colon there is a control to select the size in pixels #: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -msgid "_Position:" -msgstr "_Pozicija:" +msgid "M_ultiple of:" +msgstr "_Kartotinis:" #. abbreviation of pixel #: ../extensions/file_tools/data/ui/crop-options.ui.h:13 msgid "px" msgstr "piks" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "Aspect ratio" +msgstr "Proporcija" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "C_rop" +msgstr "Ap_kirpti" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "Pl_otis:" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +msgid "Heigh_t:" +msgstr "_Aukštis:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +#| msgid "Set the image as desktop background" +msgid "Set the image size to this value" +msgstr "Nustatyti paveikslėlio dydį į šią vertę" #: ../extensions/file_tools/data/ui/resize-options.ui.h:4 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Matmenys" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "_Aukštis:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 msgid "High _quality" msgstr "Aukšta _kokybė" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "Information" -msgstr "Informacija" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 -msgid "New dimensions:" -msgstr "Nauji matmenys:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "Options" msgstr "Parinktys" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" msgstr "Pradiniai matmenys:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "Ištempimo koeficientas:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:17 -msgid "_Width:" -msgstr "Pl_otis:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Nauji matmenys:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "pikseliai" -#: ../extensions/file_tools/file_tools.extension.in.in.h:1 -msgid "Basic tools to modify images." -msgstr "Baziniai įrankiai paveikslėliams redaguoti." +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 +msgid "Align" +msgstr "Lygiuoti" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +#| msgid "Singles" +msgid "Angle" +msgstr "Kampas" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Point 1:" +msgstr "Taškas 1:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +msgid "Point 2:" +msgstr "Taškas 2:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +#| msgid "_Keep aspect ratio" +msgid "Keep aspect ratio" +msgstr "Išlaikyti proporcijas" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 +#| msgid "_Image size:" +msgid "Image size" +msgstr "Paveikslėlio dydis" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 +#| msgid "_Grid:" +msgid "Grid:" +msgstr "Tinklelis:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Pick a background color" +msgstr "Pasirinkite fono spalvą" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +#| msgid "Transparency _type:" +msgid "_Transparent" +msgstr "_Permatomas" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 +#| msgid "Desktop background" +msgid "_Background:" +msgstr "_Fonas" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 +#| msgid "_Reset" +msgid "Reset" +msgstr "Atstatyti" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Piešti liniją ant paveikslėlio \n" +"lygiavimui nustatyti." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 +msgid "Parallel" +msgstr "Lygiagretus" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 +msgid "Perpendicular" +msgstr "Stačias" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 +msgid "Alignment" +msgstr "Lygiuotė" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 +#| msgid "Organize" +msgid "Original size" +msgstr "Originalus dydis" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 +msgid "Bounding box" +msgstr "Ribojanti dėžutė" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 +msgid "Crop borders" +msgstr "Apkirpti kraštus" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Peržiūra:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 +msgid "Threshold:" +msgstr "Slenkstis:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Spindulys:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 +#| msgid "_Account:" +msgid "Amount:" +msgstr "Kiekis:" + +#: ../extensions/file_tools/file_tools.extension.in.in.h:1 msgid "Image tools" msgstr "Paveikslėlių įrankiai" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:310 -#: ../extensions/file_tools/gth-file-tool-negative.c:83 -msgid "Applying changes" -msgstr "Pritaikomi pakeitimai" +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +msgid "Basic tools to modify images." +msgstr "Baziniai įrankiai paveikslėliams redaguoti." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:520 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors..." msgstr "Koreguoti spalvas..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:520 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors" msgstr "Koreguoti spalvas" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:521 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Keisti paveikslėlio skaistį, kontrastą, grynį ir gamą lygį" -#: ../extensions/file_tools/gth-file-tool-crop.c:399 -#: ../extensions/file_tools/gth-file-tool-resize.c:422 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 msgid "Square" msgstr "Kvadratas" -#: ../extensions/file_tools/gth-file-tool-crop.c:400 -#: ../extensions/file_tools/gth-file-tool-resize.c:423 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:499 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (paveikslėlis)" -#: ../extensions/file_tools/gth-file-tool-crop.c:403 -#: ../extensions/file_tools/gth-file-tool-resize.c:426 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:503 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (ekranas)" -#: ../extensions/file_tools/gth-file-tool-crop.c:407 -#: ../extensions/file_tools/gth-file-tool-resize.c:430 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:508 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:408 -#: ../extensions/file_tools/gth-file-tool-resize.c:431 +#: ../extensions/file_tools/gth-file-tool-crop.c:433 +#: ../extensions/file_tools/gth-file-tool-resize.c:509 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, knyga)" -#: ../extensions/file_tools/gth-file-tool-crop.c:409 -#: ../extensions/file_tools/gth-file-tool-resize.c:432 +#: ../extensions/file_tools/gth-file-tool-crop.c:434 +#: ../extensions/file_tools/gth-file-tool-resize.c:510 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:410 -#: ../extensions/file_tools/gth-file-tool-resize.c:433 +#: ../extensions/file_tools/gth-file-tool-crop.c:435 +#: ../extensions/file_tools/gth-file-tool-resize.c:511 msgid "3:2 (Postcard)" msgstr "3:2 (atvirukas)" -#: ../extensions/file_tools/gth-file-tool-crop.c:411 -#: ../extensions/file_tools/gth-file-tool-resize.c:434 +#: ../extensions/file_tools/gth-file-tool-crop.c:436 +#: ../extensions/file_tools/gth-file-tool-resize.c:512 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:412 -#: ../extensions/file_tools/gth-file-tool-resize.c:435 +#: ../extensions/file_tools/gth-file-tool-crop.c:437 +#: ../extensions/file_tools/gth-file-tool-resize.c:513 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:413 -#: ../extensions/file_tools/gth-file-tool-resize.c:436 +#: ../extensions/file_tools/gth-file-tool-crop.c:438 +#: ../extensions/file_tools/gth-file-tool-resize.c:514 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:414 -#: ../extensions/file_tools/gth-file-tool-resize.c:437 +#: ../extensions/file_tools/gth-file-tool-crop.c:439 +#: ../extensions/file_tools/gth-file-tool-resize.c:515 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:415 -#: ../extensions/file_tools/gth-file-tool-resize.c:438 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/file_tools/gth-file-tool-crop.c:440 +#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Pasirinktinis" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-crop.c:455 +#: ../extensions/file_tools/gth-file-tool-rotate.c:416 msgid "Rule of Thirds" msgstr "Trečdalių taisyklė" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-crop.c:456 +#: ../extensions/file_tools/gth-file-tool-rotate.c:417 msgid "Golden Sections" msgstr "Aukso pjūviai" -#: ../extensions/file_tools/gth-file-tool-crop.c:553 +#: ../extensions/file_tools/gth-file-tool-crop.c:457 +#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#| msgid "Centered" +msgid "Center Lines" +msgstr "Centruotos linijos" + +#: ../extensions/file_tools/gth-file-tool-crop.c:458 +#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +msgid "Uniform" +msgstr "Vienodas" + +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop..." msgstr "Apkirpti..." -#: ../extensions/file_tools/gth-file-tool-crop.c:553 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop" msgstr "Apkirpti" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:100 -msgid "Desaturating image" -msgstr "Nusodrinamas paveikslėlis" +#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Pritaikomi pakeitimai" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:118 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 msgid "Desaturate" msgstr "Nusodrinti" -#: ../extensions/file_tools/gth-file-tool-enhance.c:248 +#: ../extensions/file_tools/gth-file-tool-enhance.c:119 msgid "White balance correction" msgstr "Baltos spalvos balanso korekcija" -#: ../extensions/file_tools/gth-file-tool-enhance.c:280 +#: ../extensions/file_tools/gth-file-tool-enhance.c:342 msgid "Enhance Colors" msgstr "Pagerinti spalvas" -#: ../extensions/file_tools/gth-file-tool-enhance.c:281 +#: ../extensions/file_tools/gth-file-tool-enhance.c:343 msgid "Automatic white balance correction" msgstr "Automatinė baltos spalvos balanso korekcija" -#: ../extensions/file_tools/gth-file-tool-equalize.c:168 +#: ../extensions/file_tools/gth-file-tool-equalize.c:86 msgid "Equalizing image histogram" msgstr "Išlyginama paveikslėlio histograma" -#: ../extensions/file_tools/gth-file-tool-equalize.c:200 +#: ../extensions/file_tools/gth-file-tool-equalize.c:275 msgid "Equalize" msgstr "Išlyginti" -#: ../extensions/file_tools/gth-file-tool-equalize.c:201 +#: ../extensions/file_tools/gth-file-tool-equalize.c:276 msgid "Equalize image histogram" msgstr "Išlyginti paveikslėlio histogramą" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Apversti" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 +#| msgid "_Rotate the images physically" +msgid "Flip the image vertically" +msgstr "apversti paveikslėlį vertikaliai" + +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Atspindėti" -#: ../extensions/file_tools/gth-file-tool-negative.c:100 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 +#| msgid "Mirror image horizontally (left-right)" +msgid "Mirror the image horizontally" +msgstr "Apsukti paveikslėlį horizontaliai" + +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Negatyvas" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Pakartoti" -#: ../extensions/file_tools/gth-file-tool-resize.c:549 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize..." msgstr "Keisti dydį..." -#: ../extensions/file_tools/gth-file-tool-resize.c:549 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize" msgstr "Keisti dydį" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#| msgid "_Rename..." +msgid "Rotate..." +msgstr "Pasukti..." + +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +#| msgid "Rotate Left" +msgid "Rotate" +msgstr "Pasukti" + +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +#| msgid "Click to view the image" +msgid "Freely rotate the image" +msgstr "Laisvai pasukti paveikslėlį" + +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Pasukti į kairę" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 +#| msgid "Rotate image 90 degrees counter-clockwise" +msgid "Rotate the image by 90 degrees counterclockwise" +msgstr "Pasukti paveikslėlį 90 laipsnių prieš laikrodžio rodyklę" + +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Pasukti į dešinę" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 +#| msgid "Rotate image 90 degrees clockwise" +msgid "Rotate the image by 90 degrees clockwise" +msgstr "Pasukti paveikslėlį 90 laipsnių pagal laikrodžio rodyklę" + +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Įrašyti kaip" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Įrašyti" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +#| msgid "Saving images" +msgid "Sharpening image" +msgstr "Paveikslėlio sodrinimas" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#| msgid "Enhance Colors" +msgid "Enhance Focus..." +msgstr "Pagerinti fokusavimą..." + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +#| msgid "Enhance Colors" +msgid "Enhance Focus" +msgstr "Pagerinti fokusavimą" + +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Atšaukti" -#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:63 +#: ../extensions/find_duplicates/callbacks.c:48 +#| msgid "Found duplicates:" +msgid "Find _Duplicates..." +msgstr "Rasti dublikatus..." + +#: ../extensions/find_duplicates/callbacks.c:49 +#| msgid "Stop loading the current location" +msgid "Find duplicated files in the current location" +msgstr "Rasti dublikatus esamoje vietoje" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-choose-folders.ui.h:1 +#| msgid "_Folders" +msgid "_Folders:" +msgstr "_Aplankai:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Ieškoti dublikatų" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#| msgid "Duplicates" +msgid "Duplicates:" +msgstr "Dublikatai:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 +#| msgid "Files" +msgid "Files:" +msgstr "Failai:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 +#: ../gthumb/gth-browser-actions-entries.h:33 +msgid "_View" +msgstr "_Rodymas" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +#| msgid "Found duplicates:" +msgid "No duplicates found." +msgstr "Dublikatai nerasta." + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 +#| msgid "Found duplicates:" +msgid "Find Duplicates" +msgstr "Rasti dublikatus" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 +#: ../extensions/search/data/ui/search-editor.ui.h:1 +msgid "Start _at:" +msgstr "_Pradėti nuo:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +#| msgid "Filter" +msgid "_Filter:" +msgstr "_Filtras:" + +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:2 +#| msgid "Found duplicates:" +msgid "Find duplicated files." +msgstr "Rasti failų dublikatus." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +#| msgid "_Save the new file as:" +msgid "leave the newest duplicates" +msgstr "palikti naujausius dublikatus" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +#| msgid "Change the files date" +msgid "leave the oldest duplicates" +msgstr "palikti seniausius dublikatus" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +#| msgid "_New Folder..." +msgid "by folder..." +msgstr "pagal aplanką..." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +#| msgid "All Files" +msgid "all files" +msgstr "visi failai" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +#| msgid "%d file" +#| msgid_plural "%d files" +msgid "no file" +msgstr "nėra failų" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:397 +#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#, c-format +#| msgid "Found duplicates:" +msgid "%d duplicate" +msgid_plural "%d duplicates" +msgstr[0] "%d dublikatas" +msgstr[1] "%d dublikatai" +msgstr[2] "%d dublikatų" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +#| msgid "Search for Duplicates" +msgid "Search completed" +msgstr "Paieška baigta" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +#| msgid "Search for Duplicates" +msgid "Searching for duplicates" +msgstr "Ieškoti dublikatų" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../gthumb/gth-load-file-data-task.c:106 +#: ../gthumb/gth-save-file-data-task.c:100 +#, c-format +msgid "%d file remaining" +msgid_plural "%d files remaining" +msgstr[0] "liko %d failas" +msgstr[1] "liko %d failai" +msgstr[2] "liko %d failų" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +#| msgid "Getting the album list" +msgid "Getting the file list" +msgstr "Gaunamas failų sąrašas" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +msgid "Duplicates" +msgstr "Dublikatai" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +#| msgid "Selection" +msgid "Select" +msgstr "Pažymėti" + +#: ../extensions/flicker/callbacks.c:59 +#: ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "Į _Flickr..." @@ -2067,144 +2985,140 @@ msgid "Download photos from Flickr" msgstr "Atsisiųsti fotografijų iš Flickr" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "Įkelti fotografijas į Flickr" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 -msgid "Free space:" -msgstr "Laisva vieta:" +#: ../extensions/flicker/flicker.extension.in.in.h:1 +msgid "Flicker" +msgstr "Flickr" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "_Slėpti nuo viešosios paieškos" +#: ../extensions/flicker/flicker.extension.in.in.h:2 +msgid "Upload images to Flickr" +msgstr "Išsiųsti pasirinktus paveikslėlius į Flickr" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:4 -msgid "Moderate content" -msgstr "Nuosaikus turinys" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +msgid "Free space:" +msgstr "Laisva vieta:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "_Fotografijos:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "Privačios fotografijos" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 +msgid "_Privacy:" +msgstr "_Privatumas:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "Privačios fotografijos, matomos šeimai" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 +msgid "Hi_de from public searches" +msgstr "_Slėpti nuo viešosios paieškos" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Saugumas:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:8 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Private photos, visible to family and friends" msgstr "Privačios fotografijos, matomos šeimai ir draugams" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:11 -msgid "Restricted content" -msgstr "Ribojamas turinys" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +msgid "Private photos, visible to family" +msgstr "Privačios fotografijos, matomos šeimai" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos" +msgstr "Privačios fotografijos" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "Safe content" msgstr "Saugus turinys" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:14 -msgid "_Privacy:" -msgstr "_Privatumas:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +msgid "Moderate content" +msgstr "Nuosaikus turinys" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:15 -msgid "_Safety:" -msgstr "_Saugumas:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Restricted content" +msgstr "Ribojamas turinys" -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "_Import" msgstr "_Importuoti" -#: ../extensions/flicker/dlg-import-from-flickr.c:356 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:812 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "Nepavyko gauti fotografijų sąrašo" -#: ../extensions/flicker/dlg-import-from-flickr.c:404 -#: ../extensions/flicker/dlg-import-from-flickr.c:571 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:845 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1008 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 msgid "No album selected" msgstr "Nepasirinkta jokių albumų" -#: ../extensions/flicker/dlg-import-from-flickr.c:589 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 #, c-format msgid "Import from %s" msgstr "Importuoti iš %s" -#: ../extensions/flicker/flicker.extension.in.in.h:1 -msgid "Flicker" -msgstr "Flickr" - -#: ../extensions/flicker/flicker.extension.in.in.h:2 -msgid "Upload images to Flickr" -msgstr "Išsiųsti pasirinktus paveikslėlius į Flickr" - -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:838 -#: ../gthumb/gth-browser.c:1870 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 +#: ../gthumb/gth-browser.c:2008 msgid "Could not save the file" msgstr "Nepavyko įrašyti failo" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "Nepavyko nufotografuoti ekrano" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:982 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 msgid "Save Image" -msgstr "Įrašyti paveiklėlį" +msgstr "Įrašyti paveikslėlį" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Ekrano nuotrauka" -#. this is an empty time -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "--:--" -msgstr "--:--" - -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 -msgid "/" -msgstr "/" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -msgid "Change volume level" -msgstr "Keisti garsumą" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Faster" -msgstr "Greičiau" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Lėčiau" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:627 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 msgid "Play" msgstr "Groti" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 -msgid "Slower" -msgstr "Lėčiau" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 +msgid "Faster" +msgstr "Greičiau" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:9 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Time:" msgstr "Laikas:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--:--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Toggle volume" msgstr "Įjungti / išjungti garsą" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Keisti garsumą" + +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 +#: ../extensions/photo_importer/actions.c:67 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Pasirinkite aplanką" @@ -2216,25 +3130,30 @@ msgid "Play audio and video files." msgstr "Groti garso ir vaizdo įrašus." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:92 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Ekrano nuotrauka" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:93 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Daryti ekrano nuotrauką" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:617 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +#| msgid "Play audio and video files." +msgid "Playing video" +msgstr "Grojamas vaizdo įrašas" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Pause" msgstr "Pauzė" #: ../extensions/gstreamer_tools/main.c:31 -#: ../gthumb/gth-main-default-tests.c:211 +#: ../gthumb/gth-main-default-tests.c:247 msgid "Video" msgstr "Vaizdo įrašas" #: ../extensions/gstreamer_tools/main.c:32 -#: ../gthumb/gth-main-default-tests.c:218 +#: ../gthumb/gth-main-default-tests.c:254 msgid "Audio" msgstr "Garso įrašas" @@ -2243,7 +3162,7 @@ msgstr "Atlikėjas" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "Albumas" @@ -2265,13 +3184,13 @@ msgstr "Kadrų dažnis" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Plotis" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "Aukštis" @@ -2293,14 +3212,15 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1034 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:74 -#: ../extensions/webalbums/dlg-web-exporter.c:408 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 +#: ../extensions/webalbums/dlg-web-exporter.c:442 +#: ../extensions/webalbums/gth-web-exporter.c:2446 #, c-format msgid "%d × %d" msgstr "%d × %d" -#: ../extensions/image_print/actions.c:67 +#: ../extensions/image_print/actions.c:69 msgid "Could not print the selected files" msgstr "Nepavyko atspausdinti pasirinktų failų" @@ -2308,118 +3228,157 @@ msgid "Print the selected images" msgstr "Spausdinti pasirinktus paveikslėlius" -#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 msgid "Centered" msgstr "Centruotas" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:13 +#| msgid "The total number of images" +msgid "The total number of files" +msgstr "Iš viso failų" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:14 +#: ../extensions/importer/data/ui/import-preferences.ui.h:4 +msgid "The event description" +msgstr "Įvykio aprašymas" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "_Eilutės:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 msgid "Image" msgstr "Paveikslėlis" -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Images per page:" -msgstr "Paveikslėlių puslapyje:" +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Pozicija:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/image_print/data/ui/print-layout.ui.h:21 msgid "Left" msgstr "Kairė" -#: ../extensions/image_print/data/ui/print-layout.ui.h:8 -msgid "Position:" -msgstr "Pozicija:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 -msgid "Preview" -msgstr "Peržiūra" +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 +msgid "Top" +msgstr "Viršus" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 msgid "Rotation:" msgstr "Pasukimas:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Select Caption Font" -msgstr "Pasirinkti antraštės šriftą" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Top" -msgstr "Viršus" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:14 +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "Vienetai:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "_Font:" -msgstr "Šri_ftas:" +#: ../extensions/image_print/data/ui/print-layout.ui.h:28 +msgid "Preview" +msgstr "Peržiūra" -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +#: ../extensions/image_print/data/ui/print-layout.ui.h:30 +msgid "millimeters" +msgstr "milimetrai" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 msgid "inches" msgstr "coliai" -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -msgid "millimeters" -msgstr "milimetrai" +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 +msgid "Select Caption Font" +msgstr "Pasirinkti antraštės šriftą" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:5 +#| msgid "Select Caption Font" +msgid "Select Header Font" +msgstr "Pasirinkti antraštės šriftą" -#: ../extensions/image_print/gth-image-print-job.c:814 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +#| msgid "Select Caption Font" +msgid "Select Footer Font" +msgstr "Pasirinkti poraštės šriftą" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +#| msgid "_Font:" +msgid "Fonts" +msgstr "Šriftai" + +#: ../extensions/image_print/gth-image-print-job.c:971 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "%d puslapis iš %d" -#: ../extensions/image_print/gth-image-print-job.c:1491 -#: ../extensions/image_print/gth-image-print-job.c:1593 -#: ../extensions/image_print/gth-image-print-job.c:1614 +#: ../extensions/image_print/gth-image-print-job.c:1734 +#: ../extensions/image_print/gth-image-print-job.c:1861 +#: ../extensions/image_print/gth-image-print-job.c:1898 msgid "Could not print" msgstr "Nepavyko išspausdinti" -#: ../extensions/image_print/gth-image-print-job.c:1549 -msgid "Layout" -msgstr "Išdėstymas" +#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../gthumb/gth-main-default-tests.c:240 +msgid "Images" +msgstr "Paveikslėliai" + +#: ../extensions/image_print/gth-image-print-job.c:1863 +#: ../gthumb/gth-image-loader.c:204 +#: ../gthumb/gth-image-loader.c:278 +msgid "No suitable loader available for this file type" +msgstr "Šio tipo failams nėra tinkamos įkėlimo priemonės" #. translators: %s is a filename -#: ../extensions/image_print/gth-load-image-info-task.c:154 +#: ../extensions/image_print/gth-load-image-info-task.c:164 #, c-format msgid "Loading \"%s\"" msgstr "Įkeliama „%s“" -#: ../extensions/image_print/gth-load-image-info-task.c:156 -#: ../extensions/webalbums/gth-web-exporter.c:2734 +#: ../extensions/image_print/gth-load-image-info-task.c:166 +#: ../extensions/webalbums/gth-web-exporter.c:2685 msgid "Loading images" msgstr "Įkeliami paveikslėliai" #: ../extensions/image_print/image_print.extension.in.in.h:1 +msgid "Image print" +msgstr "Paveikslėlio spausdinimas" + +#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Allow to print images choosing the page layout." msgstr "Leisti spausdinti paveikslėlius pasirenkant puslapio išdėstymą." -#: ../extensions/image_print/image_print.extension.in.in.h:2 -msgid "Image print" -msgstr "Paveikslėlio spausdinimas" +#: ../extensions/image_print/preferences.c:79 +#| msgid "Print..." +msgid "Print" +msgstr "Spausdinti" #: ../extensions/image_rotation/callbacks.c:50 msgid "Rotate the selected images 90° to the right" msgstr "Pasukti pasirinktus paveikslėlius 90° į dešinę" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" msgstr "Pasukti pasirinktus paveikslėlius 90° į kairę" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Pasukti fiziškai" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" msgstr "Pasukti pasirinktus paveikslėlius pagal įtaisytą padėtį" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" msgstr "Atstatyti EXIF padėtį" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" msgstr "Atstatyti įtaisytą padėtį nepasukant paveikslėlių" +#: ../extensions/image_rotation/gth-reset-orientation-task.c:111 +#: ../extensions/image_rotation/gth-transform-task.c:141 +#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2423 +msgid "Saving images" +msgstr "Įrašomi paveikslėliai" + #: ../extensions/image_rotation/image_rotation.extension.in.in.h:1 msgid "Image rotation" msgstr "Paveikslėlio pasukimas" @@ -2428,263 +3387,286 @@ msgid "Rotate images without data loss." msgstr "Pasukti paveikslėlius neprarandant kokybės." -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "Klaida transformuojant paveikslėlį: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" -"This transformation may introduce small image distortions along one or more " -"edges, because the image dimensions are not multiples of 8.\n" +"This transformation may introduce small image distortions along one or more edges, because the image dimensions are not multiples of 8.\n" "\n" -"The distortion is reversible, however. If the resulting image is " -"unacceptable, simply apply the reverse transformation to return to the " -"original image.\n" +"The distortion is reversible, however. If the resulting image is unacceptable, simply apply the reverse transformation to return to the original image.\n" "\n" -"You can also choose to discard (or trim) any untransformable edge pixels. " -"For practical use, this mode gives the best looking results, but the " -"transformation is not strictly lossless anymore." +"You can also choose to discard (or trim) any untransformable edge pixels. For practical use, this mode gives the best looking results, but the transformation is not strictly lossless anymore." msgstr "" -"Dėl šios transformacijos gali atsirasti nedidelių paveikslėlių iškraipymų " -"viename ar daugiau kraštų, kadangi paveikslėlio matmenys nesidalija iš 8.\n" +"Dėl šios transformacijos gali atsirasti nedidelių paveikslėlių iškraipymų viename ar daugiau kraštų, kadangi paveikslėlio matmenys nesidalija iš 8.\n" "\n" -"Tačiau šie iškraipymai yra atstatomi. Jeigu gautasis paveikslėlis " -"nepriimtinas, paprasčiausiai pritaikykite atvirkštinę transformaciją ir " -"gausite pradinį paveikslėlį.\n" +"Tačiau šie iškraipymai yra atstatomi. Jeigu gautasis paveikslėlis nepriimtinas, paprasčiausiai pritaikykite atvirkštinę transformaciją ir gausite pradinį paveikslėlį.\n" "\n" -"Galite taip pat panaikinti (ar padailinti) netransformuojamus kraštinius " -"taškelius. Praktiškai naudojant šią transformaciją gaunamas geriausiai " -"atrodantis paveikslėlis, tačiau ši transformacija neatšaukiama." +"Galite taip pat panaikinti (ar padailinti) netransformuojamus kraštinius taškelius. Praktiškai naudojant šią transformaciją gaunamas geriausiai atrodantis paveikslėlis, tačiau ši transformacija neatšaukiama." -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" msgstr "_Nukarpyti" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "_Priimti iškraipymą" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -msgid "" -"Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, " -"fit-width, fit-width-if-larger." -msgstr "" -"Galimos reikšmės yra: actual-size, keep-prev, fit-size, fit-size-if-larger, " -"fit-width, fit-width-if-larger." - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -msgid "Whether to resize the window to fit the size of the image" -msgstr "Ar keisti lango dydį pagal paveikslėlio dydį" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "Įkėlus paveikslėlį:" +msgid "Set to actual size" +msgstr "Nustatyti į tikrąjį dydį" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Aukšta" +msgid "Keep previous zoom" +msgstr "Išlaikyti ankstesnį mastelį" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Žema" +msgid "Fit to window" +msgstr "Pritaikyti prie lango dydžio" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "Jei didesnis, pritaikyti prie lango dydžio" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 -msgid "Reset scrollbar positions" -msgstr "Atstatyti slankjuosčių pozicijas" +msgid "Fit to width" +msgstr "Pritaikyti prie pločio" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 -msgid "Transparency _type:" -msgstr "Permatomumo _tipas:" +msgid "Fit to width if larger" +msgstr "Jei didesnis, pritaikyti prie pločio" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Atstatyti slankjuosčių pozicijas" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "Įkėlus paveikslėlį:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "_Mastelio keitimo kokybė:" -#: ../extensions/image_viewer/gth-image-viewer-page.c:172 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "Permatomumo _tipas:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Aukšta" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Žema" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Baltas" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Juodas" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Languotas" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 +#| msgid "_Histogram" +msgid "Histogram" +msgstr "Histograma" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 +#| msgid "Crop image" +msgid "Copy Image" +msgstr "Kopijuoti paveikslėlį" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 +#| msgid "Copy this image to another location" +msgid "Copy the image to the clipboard" +msgstr "Kopijuoti paveikslėlį į iškarpinę" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 +#| msgid "Save Image" +msgid "Paste Image" +msgstr "Įdėti paveikslėlį" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 +#| msgid "Delete selected images from the camera" +msgid "Paste the image from the clipboard" +msgstr "Įdėti paveikslėlį iš iškarpinės" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "Padidinti" -#: ../extensions/image_viewer/gth-image-viewer-page.c:173 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Padidinti" -#: ../extensions/image_viewer/gth-image-viewer-page.c:177 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Sumažinti" -#: ../extensions/image_viewer/gth-image-viewer-page.c:178 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Sumažinti" -#: ../extensions/image_viewer/gth-image-viewer-page.c:182 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:183 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Tikras dydis" -#: ../extensions/image_viewer/gth-image-viewer-page.c:187 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Tilpti" -#: ../extensions/image_viewer/gth-image-viewer-page.c:188 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Pakeisti mastelį, kad tilptų lange" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Pakeisti mastelį, kad atitiktų plotį" -#: ../extensions/image_viewer/gth-image-viewer-page.c:200 -msgid "_Fit Window to Image" -msgstr "_Pritaikyti langą prie paveikslėlio" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:201 -msgid "Resize the window to the size of the image" -msgstr "Keisti lango dydį pagal paveikslėlio dydį" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -msgid "Basic image viewing." -msgstr "Paprasta paveikslėlio peržiūra." - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Paveikslėlių peržiūros programa" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Nustatyti į tikrąjį dydį" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Pritaikyti prie pločio" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Paprasta paveikslėlio peržiūra." -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Žiūryklė" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "Galimos reikšmės yra: none, file_date, current_date" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "Galimos reikšmės yra: yyyymmdd, yyyymm, yyyy" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "Paskirties _vieta:" #: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 -msgid "Special code" -msgstr "Specialus kodas" +msgid "_Automatic subfolder" +msgstr "_Automatinis poaplankis" #: ../extensions/importer/data/ui/import-preferences.ui.h:3 -msgid "The day of the month" -msgstr "Mėnesio diena" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:4 -msgid "The event description" -msgstr "Įvykio aprašymas" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "Valandos" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "Minutės" +msgid "as _single subfolder" +msgstr "kaip _vieną poaplankį" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "Mėnuo" +msgid "The year" +msgstr "Metai" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "Sekundės" +msgid "The month" +msgstr "Mėnuo" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "Metai" +msgid "The day of the month" +msgstr "Mėnesio diena" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -msgid "_Automatic subfolder" -msgstr "_Automatinis poaplankis" +msgid "The hour" +msgstr "Valandos" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "Paskirties _vieta:" +msgid "The minutes" +msgstr "Minutės" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -msgid "as _single subfolder" -msgstr "kaip _vieną poaplankį" +msgid "The seconds" +msgstr "Sekundės" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "Netinkamas tikslas" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "pavyzdys: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Failo data" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "metai-mėnuo-diena" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "metai-mėnuo" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "metai" -#: ../extensions/importer/gth-import-preferences-dialog.c:340 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "pasirinktinis formatas" -#: ../extensions/importer/gth-import-task.c:438 -#: ../extensions/importer/gth-import-task.c:473 -#: ../extensions/importer/gth-import-task.c:639 +#: ../extensions/importer/gth-import-task.c:442 +#: ../extensions/importer/gth-import-task.c:477 +#: ../extensions/importer/gth-import-task.c:648 msgid "Importing files" msgstr "Importuojami failai" -#: ../extensions/importer/gth-import-task.c:594 +#: ../extensions/importer/gth-import-task.c:598 msgid "No file imported" msgstr "Neimportuota jokių failų" -#: ../extensions/importer/gth-import-task.c:595 +#: ../extensions/importer/gth-import-task.c:599 msgid "The selected files are already present in the destination." msgstr "Pasirinkti failai jau yra paskirties vietoje." -#: ../extensions/importer/gth-import-task.c:616 +#: ../extensions/importer/gth-import-task.c:622 +#: ../gthumb/gth-file-source-vfs.c:694 +msgid "Could not delete the files" +msgstr "Nepavyko ištrinti failų" + +#: ../extensions/importer/gth-import-task.c:623 msgid "Delete operation not supported." msgstr "Ištrynimo operacija nepalaikoma." -#: ../extensions/importer/gth-import-task.c:700 +#: ../extensions/importer/gth-import-task.c:709 msgid "Last imported" msgstr "Paskutinį kartą importuota" -#: ../extensions/list_tools/callbacks.c:64 ../gthumb/gth-filterbar.c:303 +#: ../extensions/importer/gth-import-task.c:815 +#| msgid "No name specified" +msgid "No file specified." +msgstr "Nenurodytas failas." + +#. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. +#: ../extensions/importer/gth-import-task.c:852 +#, c-format +msgid "" +"Not enough free space in '%s'.\n" +"%s of space is required but only %s is available." +msgstr "" +"„%s“ trūksta vietos.\n" +"Reikia %s vietos, bet yra tik %s." + +#: ../extensions/list_tools/callbacks.c:76 +#: ../gthumb/gth-filterbar.c:304 msgid "Personalize..." msgstr "Suasmeninti..." -#: ../extensions/list_tools/callbacks.c:237 -#: ../extensions/list_tools/callbacks.c:248 +#: ../extensions/list_tools/callbacks.c:320 msgid "Tools" msgstr "Įrankiai" -#: ../extensions/list_tools/callbacks.c:239 -#: ../extensions/list_tools/callbacks.c:250 +#: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" msgstr "Priemonės didesniam skaičiui failų apdoroti" @@ -2693,119 +3675,98 @@ msgstr "Pralei_sti" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "Ko_mandos:" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "Komandos" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "Ko_mandos:" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, no-c-format -msgid "%B" -msgstr "%B" +msgid "_Wait for the command to finish" +msgstr "_Laukti komandos vykdymo pabaigos" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "_Vykdyti komandą kartą kiekvienam failui" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format -msgid "%E" -msgstr "%E" +msgid "_Terminal command (shell script)" +msgstr "_Terminalo komanda (apvalkalo scenarijus)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "_Šaukinys:" #: ../extensions/list_tools/data/ui/script-editor.ui.h:6 -#, no-c-format -msgid "%F" -msgstr "%F" +msgid "The file uri" +msgstr "Failo URI" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 -#, no-c-format -msgid "%N" -msgstr "%N" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:7 +msgid "The file path" +msgstr "Failo kelias" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 -#, no-c-format -msgid "%P" -msgstr "%P" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "Failo bazinis pavadinimas" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:12 -#, no-c-format -msgid "%U" -msgstr "%U" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "Aukštesniojo aplanko kelias" #. Translate only 'message' and 'default_value'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:14 #, no-c-format msgid "%ask{ message }{ default value }" msgstr "%ask{ pranešimas }{ numatytoji reikšmė }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +msgid "Ask an input value" +msgstr "Klausti įvedamos reikšmės" + #. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 #, no-c-format msgid "%attr{ attribute name }" msgstr "%attr{ atributo pavadinimas }" -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -#, no-c-format -msgid "%quote{ text }" -msgstr "%quote{ tekstas }" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 msgid "A file attribute" msgstr "Failo atributas" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -msgid "Ask an input value" -msgstr "Klausti įvedamos reikšmės" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -msgid "E_xecute command once for every file" -msgstr "_Vykdyti komandą kartą kiekvienam failui" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "Quote the text " -msgstr "Cituoti tekstą" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "Sh_ortcut:" -msgstr "_Šaukinys:" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "The file basename" -msgstr "Failo bazinis pavadinimas" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 +#, no-c-format +msgid "%N" +msgstr "%N" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" msgstr "Failo bazinis pavadinimas be plėtinio" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:31 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 +#, no-c-format +msgid "%E" +msgstr "%E" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 msgid "The file extension" msgstr "Failo plėtinys" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:32 -msgid "The file path" -msgstr "Failo kelias" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:33 -msgid "The file uri" -msgstr "Failo URI" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ tekstas }" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:34 -msgid "The parent folder path" -msgstr "Aukštesniojo aplanko kelias" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 +msgid "Quote the text " +msgstr "Cituoti tekstą" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:35 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 msgid "_Command:" msgstr "_Komanda:" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:37 -msgid "_Terminal command (shell script)" -msgstr "_Terminalo komanda (apvalkalo scenarijus)" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:38 -msgid "_Wait for the command to finish" -msgstr "_Laukti komandos vykdymo pabaigos" - #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" msgstr "Scenarijus" @@ -2815,7 +3776,7 @@ msgstr "Šaukinys" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "Rodyti" @@ -2823,46 +3784,47 @@ msgid "Could not save the script" msgstr "Nepavyko įrašyti scenarijaus" -#: ../extensions/list_tools/dlg-personalize-scripts.c:405 +#: ../extensions/list_tools/dlg-personalize-scripts.c:406 msgid "New Command" msgstr "Nauja komanda" -#: ../extensions/list_tools/dlg-personalize-scripts.c:432 +#: ../extensions/list_tools/dlg-personalize-scripts.c:433 msgid "Edit Command" msgstr "Keisti komandą" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/dlg-personalize-scripts.c:461 +#| msgid "Are you sure you want to permanently delete the %'d selected file?" +#| msgid_plural "" +#| "Are you sure you want to permanently delete the %'d selected files?" +msgid "Are you sure you want to delete the selected command?" +msgstr "Ar tikrai norite negrįžtamai ištrinti pasirinktą komandą?" + +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" msgstr "Įveskite reikšmę:" -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:571 -#: ../extensions/webalbums/gth-web-exporter.c:583 -#: ../extensions/webalbums/gth-web-exporter.c:591 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:560 +#: ../extensions/webalbums/gth-web-exporter.c:572 +#: ../extensions/webalbums/gth-web-exporter.c:580 msgid "Malformed command" msgstr "Netinkamai suformuota komanda" -#: ../extensions/list_tools/gth-script-editor-dialog.c:177 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "nėra" -#: ../extensions/list_tools/gth-script-editor-dialog.c:183 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "skaičių klaviatūros klavišas %d" -#: ../extensions/list_tools/gth-script-editor-dialog.c:320 -#: ../gthumb/gth-filter-editor-dialog.c:492 -#, c-format -msgid "No name specified" -msgstr "Nenurodytas pavadinimas" - -#: ../extensions/list_tools/gth-script-editor-dialog.c:326 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "Nenurodyta komanda" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "Komanda netinkamai baigė darbą ir grąžino būseną %d" @@ -2875,6 +3837,42 @@ msgid "Scripting and batch manipulation of files." msgstr "Scenarijai ir masinis failų apdorojimas." +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "S" +msgstr "P" + +#: ../extensions/map_view/gth-map-view.c:130 +#| msgid "%N" +msgctxt "Cardinal point" +msgid "N" +msgstr "Š" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "W" +msgstr "V" + +#: ../extensions/map_view/gth-map-view.c:132 +#| msgid "%E" +msgctxt "Cardinal point" +msgid "E" +msgstr "R" + +#: ../extensions/map_view/gth-map-view.c:205 +#: ../extensions/map_view/map_view.extension.in.in.h:1 +msgid "Map" +msgstr "Žemėlapis" + +#. No GPS label +#: ../extensions/map_view/gth-map-view.c:276 +msgid "The geographical position information is not available for this image." +msgstr "Geografinė informacija neprieinama šiam paveikslėliui." + +#: ../extensions/map_view/map_view.extension.in.in.h:2 +msgid "View the photo position on the map" +msgstr "Rodyti nuotraukos vietą žemėlapyje" + #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." msgstr "Photobucket..." @@ -2884,71 +3882,67 @@ msgstr "Įkelti fotografijas į Photobucket" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 -msgid "1 megabyte file size" -msgstr "1 megabaito dydžio failas" +msgid "Tiny ( 100 x 75 )" +msgstr "Smulkus ( 100 x 75 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "15 colių ekranas ( 800 x 600 )" +msgid "Small ( 160 x 120 )" +msgstr "Mažas ( 160 x 120 )" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "17 colių ekranas ( 1024 x 768 )" +msgid "Medium ( 320 x 240 )" +msgstr "Vidutinis ( 320 x 240 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 msgid "Large ( 640 x 480 )" msgstr "Didelis ( 640 x 480 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "Vidutinis ( 320 x 240 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 -msgid "Small ( 160 x 120 )" -msgstr "Mažas ( 160 x 120 )" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "15 colių ekranas ( 800 x 600 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "Smulkus ( 100 x 75 )" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "17 colių ekranas ( 1024 x 768 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "_Keisti dydį į:" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +msgid "1 megabyte file size" +msgstr "1 megabaito dydžio failas" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 msgid "_Scramble filenames" msgstr "_Sumaišyti failų pavadinimus" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Konteineris:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:289 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Tiny ( 100 × 75 )" msgstr "Mažytis ( 100 x 75 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Small ( 160 × 120 )" msgstr "Mažas ( 160 x 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Medium ( 320 × 240 )" msgstr "Vidutinis ( 320 x 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "Large ( 640 × 480 )" msgstr "Didelis ( 640 x 480 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "15ʺ screen ( 800 × 600 )" msgstr "15 colių ekranas ( 800 x 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "17ʺ screen ( 1024 × 768 )" msgstr "17 colių ekranas ( 1024 x 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:302 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 msgid "2 megabyte file size" msgstr "2 megabaitų dydžio failas" @@ -2960,63 +3954,89 @@ msgid "Upload images to PhotoBucket" msgstr "Išsiųsti paveikslėlius į PhotoBucket" -#: ../extensions/photo_importer/callbacks.c:51 +#: ../extensions/photo_importer/actions.c:71 +#| msgid "_Import" +msgid "Import" +msgstr "Importuoti" + +#: ../extensions/photo_importer/callbacks.c:52 msgid "_Removable Device..." msgstr "_Išimama laikmena..." -#: ../extensions/photo_importer/callbacks.c:52 +#: ../extensions/photo_importer/callbacks.c:53 msgid "Import photos and other files from a removable device" msgstr "Importuoti fotografijas ir kitus failus iš išimamos laikmenos" -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "Po importavimo iš įrenginio:" +#: ../extensions/photo_importer/callbacks.c:56 +#| msgid "_New Folder..." +msgid "F_older..." +msgstr "_Aplankas..." + +#: ../extensions/photo_importer/callbacks.c:57 +#| msgid "Import photos and other files from a removable device" +msgid "Import photos and other files from a folder" +msgstr "Importuoti fotografijas ir kitus failus iš aplanko" -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 msgid "_Rotate the images physically" msgstr "Pasukti paveikslėlius _fiziškai" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -msgid "Import from Removable Device" -msgstr "Importuoti iš išimamos laikmenos" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "Po importavimo iš įrenginio:" #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -#: ../gthumb/gth-filterbar.c:413 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:414 msgid "S_how:" msgstr "_Rodyti:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -msgid "_Delete the imported files from the source" -msgstr "_Ištrinti importuotus failus iš šaltinio" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "_Žymos:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "Įv_ykis:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:8 -msgid "_Tags:" -msgstr "_Žymos:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 +msgid "_Delete the imported files from the source" +msgstr "_Ištrinti importuotus failus iš šaltinio" + +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +#| msgid "Could not export the files" +msgid "Could not import the files" +msgstr "Nepavyko importuoti failų" #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:248 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "Importuotini failai: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:288 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" msgstr "Nepavyko įkelti aplanko" -#: ../extensions/photo_importer/dlg-photo-importer.c:318 -#: ../gthumb/gth-browser.c:1783 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:1921 msgid "Getting folder listing..." msgstr "Gaunamas aplankų sąrašas..." -#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "Tuščia" +#: ../extensions/photo_importer/dlg-photo-importer.c:586 +msgid "Import from Removable Device" +msgstr "Importuoti iš išimamos laikmenos" + +#: ../extensions/photo_importer/dlg-photo-importer.c:618 +#| msgid "Import from %s" +msgid "Import from Folder" +msgstr "Importuoti iš aplanko" + #: ../extensions/photo_importer/photo_importer.extension.in.in.h:1 msgid "Import photos" msgstr "Importuoti fotografijas" @@ -3026,7 +4046,7 @@ msgstr "Importuoti fotografijas iš išimamų laikmenų." #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." msgstr "_Picasa žiniatinklio albumas..." @@ -3034,62 +4054,58 @@ msgid "Download photos from Picasa Web Album" msgstr "Atsisiųsti fotografijas iš Picasa žiniatinklio albumo" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" msgstr "Įkelti fotografijas į Picasa žiniatinklio albumą" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "Eksportuoti į Picasa žiniatinklio albumus" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "_Albumai:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 msgid "Import from Picasa Web Album" msgstr "Importuoti iš Picasa žiniatinklio albumo" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 msgid "_Album:" msgstr "_Albumas:" #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "" -"Type the characters you see in the picture below. Letters are not case-" -"sensitive." -msgstr "" -"Įveskite simbolius, kuriuos matote žemiau esančiame paveikslėlyje. Raidžių " -"registras neturi reikšmės." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 msgid "_E-Mail:" msgstr "_El. paštas:" +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 +msgid "Type the characters you see in the picture below. Letters are not case-sensitive." +msgstr "Įveskite simbolius, kuriuos matote žemiau esančiame paveikslėlyje. Raidžių registras neturi reikšmės." + #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 msgid "_Password:" msgstr "_Slaptažodis:" -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Vieša" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:352 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:294 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "Nepavyko gauti albumų sąrašo" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:434 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:376 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" msgstr "Picasa žiniatinklio albumas" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:521 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:463 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "Paskyra" -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:134 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 msgid "Could not load the file" msgstr "Nepavyko įkelti failo" @@ -3101,26 +4117,28 @@ msgid "Upload images to Picasa Web Albums" msgstr "Nusiųsti paveikslėlius į Picasa internetinius albumus" -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Galimos reikšmės yra: none, deflate, jpeg." - #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "Opti_mizuoti" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 +#| msgid "Default options:" +msgid "_Default extension:" +msgstr "_Numatytasis plėtinys:" #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -msgid "_Progressive" -msgstr "_Progresyvus" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 msgid "_Quality:" msgstr "_Kokybė:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 msgid "_Smoothing:" msgstr "_Glotninimas:" +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_mizuoti" + +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progresyvus" + #: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 msgid "Compression _level:" msgstr "Glaudinimo _lygis:" @@ -3133,60 +4151,48 @@ msgid "_RLE compression" msgstr "_RLE glaudinimas" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "Glaudinimas" - #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "No_rmalus (Deflate)" +msgid "_No compression" +msgstr "_Jokio glaudinimo" #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "Raiška" +msgid "No_rmal (Deflate)" +msgstr "No_rmalus (Deflate)" #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Horizontal:" -msgstr "_Horizontalus:" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 msgid "_Loss compression (JPEG)" msgstr "_Nuostolingas glaudinimas (JPEG)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_No compression" -msgstr "_Jokio glaudinimo" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_Vertical:" -msgstr "_Vertikalus:" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +msgid "Compression" +msgstr "Glaudinimas" #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 msgid "dpi" msgstr "dpi" -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:478 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +msgid "Resolution" +msgstr "Raiška" + +#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 msgid "JPEG" msgstr "JPEG" -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/pixbuf_savers/gth-png-saver.c:140 msgid "PNG" msgstr "PNG" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 #: ../gthumb/gth-buffer-data.c:84 msgid "Insufficient memory" msgstr "Nepakanka atminties" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:13 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 msgid "TGA" msgstr "TGA" -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:497 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:14 +#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 msgid "TIFF" msgstr "TIFF" @@ -3196,39 +4202,33 @@ #: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "" -"Įrašyti paveikslėlius įprastiniais formatais, tokiais kaip JPEG, PNG ir TIFF" - -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "Saving" -msgstr "Įrašoma" +msgstr "Įrašyti paveikslėlius įprastiniais formatais, tokiais kaip JPEG, PNG ir TIFF" #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "Leisti įkelti raw formato paveikslėlius." - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" msgstr "Raw formato palaikymas" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Leisti įkelti raw formato paveikslėlius." + +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_Y:" msgstr "_Y:" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:437 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." msgstr "Raudonų akių šalinimas..." -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:437 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "Raudonų akių efekto pašalinimas" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:438 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" msgstr "Pašalinti raudonų akių efektą, sukeliamą blykstės" @@ -3240,117 +4240,151 @@ msgid "Tool to remove the red-eye effect from a photo." msgstr "Priemonė raudonų akių efektui pašalinti iš fotografijos." -#: ../extensions/rename_series/callbacks.c:48 -msgid "Rename the selected files" -msgstr "Pervadinti pasirinktus failus" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "" -"Possible values include: general::unsorted, file::name, file::size, file::" -"mtime, exif::photo::datetimeoriginal" -msgstr "" -"Galimos reikšmės: general::unsorted, file::name, file::size, file::mtime, " -"exif::photo::datetimeoriginal" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "Galimos reikšmės yra: 0 (none), 1 (lower), 2 (upper)" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:1 +#| msgid "Edit" +msgid "digits" +msgstr "skaitmenys" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 +#| msgid "Format" +msgid "format:" +msgstr "formatas:" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +#| msgid "Rem_ove" +msgid "remove" +msgstr "pašalinti" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "pridėti" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, no-c-format -msgid "%A{ identifier }" -msgstr "%A{ identifikatorius }" - -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, no-c-format -msgid "%D{ format }" -msgstr "%D{ formatas }" - -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, no-c-format -msgid "%M{ format }" -msgstr "%M{ formatas }" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Pervadinti" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" msgstr "_Registras:" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 -msgid "New enumerator digit" -msgstr "Naujas išskaičiavimo skaitmuo" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 +#| msgid "Edit Filter" +msgid "Edit template" +msgstr "Keisti šabloną" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 -msgid "Re_verse Order" -msgstr "At_virkštinė tvarka" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Originalus failo pavadinimas" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 -msgid "Rename" -msgstr "Pervadinti" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "Originalus plėtinys" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/search/data/ui/search-editor.ui.h:1 -msgid "Start _at:" -msgstr "_Pradėti nuo:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "Originalus numeravimas" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 -msgid "The digitalization date" -msgstr "Suskaitmeninimo data" +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ formatas }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 msgid "The modification date" msgstr "Pakeitimo data" #: ../extensions/rename_series/data/ui/rename-series.ui.h:21 -msgid "The original enumerator" -msgstr "Originalus numeravimas" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -msgid "The original extension" -msgstr "Originalus plėtinys" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 -msgid "The original filename" -msgstr "Originalus failo pavadinimas" +msgid "The digitalization date" +msgstr "Suskaitmeninimo data" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -msgid "_Preview:" -msgstr "_Peržiūra:" +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ identifikatorius }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "Ša_blonas:" -#: ../extensions/rename_series/dlg-rename-series.c:380 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "At_virkštinė tvarka" + +#: ../extensions/rename_series/dlg-rename-series.c:58 +#| msgid "New enumerator digit" +msgid "Enumerator" +msgstr "Išvardintojas" + +#: ../extensions/rename_series/dlg-rename-series.c:59 +#| msgid "The original filename" +msgid "Original filename" +msgstr "Originalus failo pavadinimas" + +#: ../extensions/rename_series/dlg-rename-series.c:60 +#| msgid "The original extension" +msgid "Original extension" +msgstr "Originalus plėtinys" + +#: ../extensions/rename_series/dlg-rename-series.c:61 +#| msgid "The original enumerator" +msgid "Original enumerator" +msgstr "Originalus išvardintojas" + +#: ../extensions/rename_series/dlg-rename-series.c:62 +#| msgid "The modification date" +msgid "Modification date" +msgstr "Pakeitimo data" + +#: ../extensions/rename_series/dlg-rename-series.c:63 +#| msgid "The digitalization date" +msgid "Digitalization date" +msgstr "Suskaitmeninimo data" + +#: ../extensions/rename_series/dlg-rename-series.c:64 +#| msgid "A file attribute" +msgid "File attribute" +msgstr "Failo atributas" + +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 msgid "Could not rename the files" msgstr "Nepavyko pervadinti failų" -#: ../extensions/rename_series/dlg-rename-series.c:469 +#: ../extensions/rename_series/dlg-rename-series.c:780 +#| msgid "Could not save the filter" +msgid "Could not save the template" +msgstr "Nepavyko įrašyti šablono" + +#: ../extensions/rename_series/dlg-rename-series.c:798 +#| msgid "_Template:" +msgid "Edit Template" +msgstr "Keisti šabloną" + +#: ../extensions/rename_series/dlg-rename-series.c:856 msgid "Old Name" msgstr "Senasis pavadinimas" -#: ../extensions/rename_series/dlg-rename-series.c:477 +#: ../extensions/rename_series/dlg-rename-series.c:867 msgid "New Name" msgstr "Naujasis pavadinimas" -#: ../extensions/rename_series/dlg-rename-series.c:554 +#: ../extensions/rename_series/dlg-rename-series.c:944 msgid "Keep original case" msgstr "Palikti originalų registrą" -#: ../extensions/rename_series/dlg-rename-series.c:555 +#: ../extensions/rename_series/dlg-rename-series.c:945 msgid "Convert to lower-case" msgstr "Konvertuoti į mažąsias raides" -#: ../extensions/rename_series/dlg-rename-series.c:556 +#: ../extensions/rename_series/dlg-rename-series.c:946 msgid "Convert to upper-case" msgstr "Konvertuoti į didžiąsias raides" -#: ../extensions/rename_series/gth-rename-task.c:166 +#: ../extensions/rename_series/gth-rename-task.c:167 msgid "Renaming files" msgstr "Pervadinami failai" @@ -3370,46 +4404,40 @@ msgid "Resize the selected images" msgstr "Keisti pasirinktų paveikslėlių didį" -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "Galimos reikšmės: pixels, percentage" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -msgid "Ask" -msgstr "Klausti" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "New dimensions" -msgstr "Nauji matmenys" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 -msgid "Overwrite" -msgstr "Perrašyti" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 msgid "Resize Images" msgstr "Keisti paveikslėlių dydį" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 -msgid "Skip" -msgstr "Praleisti" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 +msgid "New dimensions" +msgstr "Nauji matmenys" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:15 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "A_ukštis:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:16 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" msgstr "_Išlaikyti originalias proporcijas" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:18 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Formatas" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "pixel" msgstr "pikseliai" -#: ../extensions/resize_images/dlg-resize-images.c:140 +#: ../extensions/resize_images/dlg-resize-images.c:168 msgid "Resizing images" msgstr "Keičiamas paveikslėlių dydis" +#: ../extensions/resize_images/dlg-resize-images.c:412 +#| msgid "Keep original case" +msgid "Keep the original format" +msgstr "Palikti originalų formatą" + #: ../extensions/resize_images/resize_images.extension.in.in.h:1 msgid "Resize images" msgstr "Keisti paveikslėlių dydį" @@ -3418,20 +4446,21 @@ msgid "Resize series of images." msgstr "Keisti paveikslėlių sekų dydį." -#: ../extensions/search/actions.c:49 ../extensions/search/actions.c:116 -#: ../extensions/search/actions.c:122 +#: ../extensions/search/actions.c:49 +#: ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:123 msgid "Could not perform the search" msgstr "Nepavyko atlikti paieškos" -#: ../extensions/search/actions.c:53 +#: ../extensions/search/actions.c:54 msgid "Search Result" msgstr "Paieškos rezultatai" -#: ../extensions/search/actions.c:75 +#: ../extensions/search/actions.c:76 msgid "Find" msgstr "Ieškoti" -#: ../extensions/search/callbacks.c:58 +#: ../extensions/search/callbacks.c:59 msgid "Find files" msgstr "Ieškoti paveikslėlių" @@ -3441,36 +4470,80 @@ #. Translators: This is not a verb, it's a name as in "the search properties". #: ../extensions/search/callbacks.c:174 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "Ieškoti" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:196 +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "visos šiuos taisyklės" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:197 +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "bet kuri iš šių taisyklių" -#: ../extensions/search/gth-search-task.c:178 -msgid "Files found untill now: %" -msgstr "Iki šiol rasti failai: %" +#: ../extensions/search/gth-search-task.c:181 +#, c-format +#| msgid "Files found untill now: %" +msgid "Files found until now: %s" +msgstr "Iki šiol rasti failai: %s" -#: ../extensions/search/gth-search-task.c:251 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "Ieškoma..." -#: ../extensions/search/gth-search-task.c:257 +#: ../extensions/search/gth-search-task.c:277 msgid "Cancel the operation" msgstr "Atšaukti veiksmą" -#: ../extensions/search/search.extension.in.in.h:1 +#: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." msgstr "Failų paieškos įrankis." +#: ../extensions/selections/callbacks.c:62 +#| msgid "Selection" +msgid "Add to _Selection" +msgstr "Pridėti prie _pažymėjimo" + +#: ../extensions/selections/callbacks.c:65 +#| msgid "Selection" +msgid "Selection 1" +msgstr "Sritis 1" + +#: ../extensions/selections/callbacks.c:70 +#| msgid "Selection" +msgid "Selection 2" +msgstr "Sritis 2" + +#: ../extensions/selections/callbacks.c:75 +#| msgid "Selection" +msgid "Selection 3" +msgstr "Sritis 3" + +#: ../extensions/selections/callbacks.c:180 +#, c-format +msgid "Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "Naudokite Alt-%d failams pridėti prie pažymėjimo, Vald-%d žymėjimui rodyti." + +#: ../extensions/selections/gth-selections-manager.c:250 +#, c-format +#| msgid "Selection" +msgid "Selection %d" +msgstr "Sritis %d" + +#: ../extensions/selections/gth-selections-manager.c:253 +#: ../extensions/selections/selections.extension.in.in.h:1 +#| msgid "Selection" +msgid "Selections" +msgstr "Sritys" + +#: ../extensions/selections/selections.extension.in.in.h:2 +#| msgid "No valid file selected." +msgid "Advanced file selection." +msgstr "Sudėtingesnis failų žymėjimas." + #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" msgstr "_Skaidrių rodymas" @@ -3479,91 +4552,92 @@ msgid "View as a slideshow" msgstr "Rodyti kaip skaidres" -#: ../extensions/slideshow/callbacks.c:406 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "Skaidrių rodymas" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -msgid "Add files to the playlist" -msgstr "Įtraukti failus į grojaraštį" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "Grojaraštis" +msgid "_Personalize" +msgstr "_Suasmeninti" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "_Atsitiktinė tvarka" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "Pašalinti pasirinktus failus" +msgid "_Transition effect:" +msgstr "_Perėjimo efektas:" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "_Keisti automatiškai kas" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "_Baigus, paleisti iš naujo" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "_Suasmeninti" +msgid "R_andom order" +msgstr "_Atsitiktinė tvarka" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "_Baigus, paleisti iš naujo" +msgid "Playlist" +msgstr "Grojaraštis" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 -msgid "_Transition effect:" -msgstr "_Perėjimo efektas:" +msgid "Add files to the playlist" +msgstr "Įtraukti failus į grojaraštį" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 -msgid "seconds" -msgstr "sekundės" +msgid "Remove the selected files" +msgstr "Pašalinti pasirinktus failus" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow.c:229 +#| msgid "Slideshow" +msgid "Playing slideshow" +msgstr "Rodymos skaidrės" + +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 msgid "Choose the files to play" msgstr "Pasirinkite paleistinus failus" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 msgid "Audio files" msgstr "Garso failai" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 msgid "Random" msgstr "Atsitiktinė" -#: ../extensions/slideshow/main.c:284 +#: ../extensions/slideshow/main.c:283 msgid "Push from right" msgstr "Stumti iš dešinės" -#: ../extensions/slideshow/main.c:290 +#: ../extensions/slideshow/main.c:289 msgid "Push from bottom" msgstr "Stumti iš apačios" -#: ../extensions/slideshow/main.c:296 +#: ../extensions/slideshow/main.c:295 msgid "Slide from right" msgstr "Slinkti iš dešinės" -#: ../extensions/slideshow/main.c:302 +#: ../extensions/slideshow/main.c:301 msgid "Slide from bottom" msgstr "Slinkti iš apačios" -#: ../extensions/slideshow/main.c:308 +#: ../extensions/slideshow/main.c:307 msgid "Fade in" msgstr "Pamažu stiprinti ryškumą" -#: ../extensions/slideshow/main.c:314 +#: ../extensions/slideshow/main.c:313 msgid "Flip page" msgstr "Apversti puslapį" -#: ../extensions/slideshow/main.c:320 +#: ../extensions/slideshow/main.c:319 msgid "Cube from right" msgstr "Kubas iš dešinės" -#: ../extensions/slideshow/main.c:326 +#: ../extensions/slideshow/main.c:325 msgid "Cube from bottom" msgstr "Kubas iš apačios" @@ -3597,12 +4671,12 @@ msgstr "Rodyklė" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:115 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "Kitas" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "Ankstesnis" @@ -3627,257 +4701,212 @@ msgid "View the previous page" msgstr "Žiūrėti ankstesnį puslapį" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 -#, no-c-format -msgid "%I" -msgstr "%I" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -#, no-c-format -msgid "%i" -msgstr "%i" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Visus paveikslėlius viename paveikslėlyje" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -#, no-c-format -msgid "%p" -msgstr "%p" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 msgid "Adapts to the window width" msgstr "Pritaiko prie lango pločio" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 -msgid "All images on a single image" -msgstr "Visus paveikslėlius viename paveikslėlyje" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Žiniatinklio albumas" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "All images on a single page" -msgstr "Visus paveikslėlius viename puslapyje" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, no-c-format +msgid "%P" +msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 -msgid "Columns:" -msgstr "Stulpeliai:" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Kopijuoti originalus į naują vietą" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "Image Attributes" -msgstr "Paveikslėlio atributai" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Image Page" -msgstr "Paveikslėlio puslapis" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -msgid "Index Page" -msgstr "Rodyklės puslapis" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -msgid "Re_verse order" -msgstr "At_virkštinė tvarka" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 -msgid "S_ort:" -msgstr "_Rikiuoti:" +msgid "_Resize if larger than:" +msgstr "Keisti d_ydį, jei didesnis nei:" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -msgid "Show the description, if available" -msgstr "Rodyti aprašymą, jei toks yra" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "Show the following attributes:" -msgstr "Rodyti šiuos atributus:" +msgid "_Adapt to the window width " +msgstr "_Pritaikyti prie lango pločio" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The current date" -msgstr "Dabartinė data" +msgid "Index Page" +msgstr "Rodyklės puslapis" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "The current image number" -msgstr "Dabartinio paveikslėlio numeris" +msgid "Thumbnail Caption" +msgstr "Miniatiūros antraštė" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "The current page number" -msgstr "Dabartinio puslapio numeris" +msgid "The current image number" +msgstr "Dabartinio paveikslėlio numeris" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "The total number of images" msgstr "Iš viso paveikslėlių" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "The total number of pages" -msgstr "Iš viso puslapių" - #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "Theme" -msgstr "Tema" +#| msgid "The file path" +msgid "The file comment" +msgstr "Failo komentaras" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "Thumbnail Caption" -msgstr "Miniatiūros antraštė" +msgid "Image Page" +msgstr "Paveikslėlio puslapis" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "Use subfolders to organize files" -msgstr "Naudoti aplankus failams rūšiuoti" +msgid "Show the description, if available" +msgstr "Rodyti aprašymą, jei toks yra" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "Web Album" -msgstr "Žiniatinklio albumas" +msgid "Show the following attributes:" +msgstr "Rodyti šiuos atributus:" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -msgid "_Adapt to the window width " -msgstr "_Pritaikyti prie lango pločio" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:40 -msgid "_Copy originals to destination" -msgstr "_Kopijuoti originalus į naują vietą" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:42 -msgid "_Footer:" -msgstr "P_oraštė:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:43 -msgid "_Header:" -msgstr "A_ntraštė:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:44 -msgid "_Resize if larger than:" -msgstr "Keisti d_ydį, jei didesnis nei:" +msgid "Image Attributes" +msgstr "Paveikslėlio atributai" -#: ../extensions/webalbums/gth-web-exporter.c:1795 +#: ../extensions/webalbums/gth-web-exporter.c:1802 msgid "Could not show the destination" msgstr "Nepavyko parodyti tikslo" -#: ../extensions/webalbums/gth-web-exporter.c:1829 +#: ../extensions/webalbums/gth-web-exporter.c:1838 msgid "The album has been created successfully." msgstr "Albumas sėkmingai sukurtas." -#: ../extensions/webalbums/gth-web-exporter.c:2095 -#: ../extensions/webalbums/gth-web-exporter.c:2122 +#: ../extensions/webalbums/gth-web-exporter.c:2106 +#: ../extensions/webalbums/gth-web-exporter.c:2133 msgid "Saving thumbnails" msgstr "Įrašomos miniatiūros" -#: ../extensions/webalbums/gth-web-exporter.c:2150 +#: ../extensions/webalbums/gth-web-exporter.c:2161 msgid "Saving HTML pages: Images" msgstr "Įrašomi HTML puslapiai: paveikslėliai" -#: ../extensions/webalbums/gth-web-exporter.c:2208 +#: ../extensions/webalbums/gth-web-exporter.c:2219 msgid "Saving HTML pages: Indexes" msgstr "Įrašomi HTML puslapiai: rodyklės" -#: ../extensions/webalbums/gth-web-exporter.c:2328 -#: ../extensions/webalbums/gth-web-exporter.c:2385 -msgid "Saving images" -msgstr "Įrašomi paveikslėliai" - -#: ../extensions/webalbums/gth-web-exporter.c:2441 +#: ../extensions/webalbums/gth-web-exporter.c:2502 msgid "Copying original images" msgstr "Kopijuojami originalūs paveikslėliai" -#: ../extensions/webalbums/gth-web-exporter.c:2977 +#: ../extensions/webalbums/gth-web-exporter.c:2929 msgid "Could not find the style folder" msgstr "Nepavyko rasti stilių aplanko" -#: ../extensions/webalbums/gth-web-exporter.c:3010 +#: ../extensions/webalbums/gth-web-exporter.c:2967 msgid "Could not create a temporary folder" msgstr "Nepavyko sukurti laikino aplanko" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Žiniatinklio albumai" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Create static web albums." msgstr "Kurti statinius žiniatinklio albumus." -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 -msgid "Web Albums" -msgstr "Žiniatinklio albumai" +#: ../gthumb/dlg-location.c:200 +#: ../gthumb/gth-browser.c:1250 +#: ../gthumb/gth-browser.c:1809 +#: ../gthumb/gth-browser.c:5899 +#: ../gthumb/gth-browser.c:5918 +#: ../gthumb/gth-browser.c:5942 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Nepavyko įkelti pozicijos „%s“" + +#: ../gthumb/dlg-personalize-filters.c:237 +msgid "Filter" +msgstr "Filtras" + +#: ../gthumb/dlg-personalize-filters.c:315 +msgid "Could not save the filter" +msgstr "Nepavyko įrašyti filtro" + +#: ../gthumb/dlg-personalize-filters.c:358 +msgid "New Filter" +msgstr "Naujas filtras" -#: ../gthumb/dlg-extensions.c:65 ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-personalize-filters.c:387 +msgid "Edit Filter" +msgstr "Keisti filtrą" + +#: ../gthumb/dlg-preferences-extensions.c:67 +#: ../gthumb/gth-filterbar.c:270 msgid "All" msgstr "Visi" -#: ../gthumb/dlg-extensions.c:66 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" msgstr "Įjungta" -#: ../gthumb/dlg-extensions.c:67 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" msgstr "Išjungta" -#: ../gthumb/dlg-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" msgstr "Žiūryklės" -#: ../gthumb/dlg-extensions.c:71 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "Metaduomenys" -#: ../gthumb/dlg-extensions.c:72 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "Failų įrankiai" -#: ../gthumb/dlg-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "Sąrašo įrankiai" -#: ../gthumb/dlg-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "Importavimo priemonės" -#: ../gthumb/dlg-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" msgstr "Eksportavimo priemonės" -#: ../gthumb/dlg-extensions.c:151 +#: ../gthumb/dlg-preferences-extensions.c:216 +msgid "Could not activate the extension" +msgstr "Nepavyko įjungti papildinio" + +#: ../gthumb/dlg-preferences-extensions.c:226 +msgid "Could not deactivate the extension" +msgstr "Nepavyko išjungti papildinio" + +#. add the page to the preferences dialog +#: ../gthumb/dlg-preferences-extensions.c:772 +msgid "Extensions" +msgstr "Papildiniai" + +#: ../gthumb/dlg-preferences-extensions.c:819 msgid "Restart required" msgstr "Reikia paleisti iš naujo" -#: ../gthumb/dlg-extensions.c:152 +#: ../gthumb/dlg-preferences-extensions.c:820 msgid "You need to restart gthumb for these changes to take effect" msgstr "Reikės paleisti gThumb iš naujo, kad įsigaliotų šie pakeitimai" -#: ../gthumb/dlg-extensions.c:153 +#: ../gthumb/dlg-preferences-extensions.c:821 msgid "_Continue" msgstr "_Tęsti" -#: ../gthumb/dlg-extensions.c:154 +#: ../gthumb/dlg-preferences-extensions.c:822 msgid "_Restart" msgstr "Paleisti iš _naujo" -#: ../gthumb/dlg-extensions.c:255 -msgid "Could not activate the extension" -msgstr "Nepavyko įjungti papildinio" - -#: ../gthumb/dlg-extensions.c:261 -msgid "Could not deactivate the extension" -msgstr "Nepavyko išjungti papildinio" - -#: ../gthumb/dlg-extensions.c:283 -msgid "Use" -msgstr "Naudoti" - -#: ../gthumb/dlg-extensions.c:299 -msgid "Extension" -msgstr "Papildinys" - -#: ../gthumb/dlg-personalize-filters.c:236 -msgid "Filter" -msgstr "Filtras" - -#: ../gthumb/dlg-personalize-filters.c:314 -msgid "Could not save the filter" -msgstr "Nepavyko įrašyti filtro" - -#: ../gthumb/dlg-personalize-filters.c:356 -msgid "New Filter" -msgstr "Naujas filtras" - -#: ../gthumb/dlg-personalize-filters.c:385 -msgid "Edit Filter" -msgstr "Keisti filtrą" - #: ../gthumb/eggfileformatchooser.c:236 #, c-format msgid "File _Format: %s" msgstr "Failo _formatas: %s" -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:197 +#: ../gthumb/eggfileformatchooser.c:397 +#: ../gthumb/gth-main-default-tests.c:233 msgid "All Files" msgstr "Visi failai" @@ -3899,44 +4928,38 @@ #: ../gthumb/eggfileformatchooser.c:681 #, c-format -msgid "" -"The program was not able to find out the file format you want to use for `%" -"s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"Programai nepavyko nustatyti, kokį failo formatą jūs norite naudoti failui „%" -"s“. Naudokite tam failui žinomą plėtinį arba pasirinkite formatą žemiau " -"esančiame sąraše." +msgid "The program was not able to find out the file format you want to use for `%s'. Please make sure to use a known extension for that file or manually choose a file format from the list below." +msgstr "Programai nepavyko nustatyti, kokį failo formatą jūs norite naudoti failui „%s“. Naudokite tam failui žinomą plėtinį arba pasirinkite formatą žemiau esančiame sąraše." #: ../gthumb/eggfileformatchooser.c:688 msgid "File format not recognized" msgstr "Failo formatas neatpažintas" #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1362 +#: ../gthumb/gio-utils.c:1351 #, c-format msgid "%s of %s" msgstr "%s iš %s" -#: ../gthumb/gio-utils.c:1397 +#: ../gthumb/gio-utils.c:1386 #, c-format msgid "Moving \"%s\" to \"%s\"" msgstr "Perkeliama „%s“ į „%s“" -#: ../gthumb/gio-utils.c:1399 +#: ../gthumb/gio-utils.c:1388 #, c-format msgid "Copying \"%s\" to \"%s\"" msgstr "Kopijuojama „%s“ į „%s“" -#: ../gthumb/gio-utils.c:1735 +#: ../gthumb/gio-utils.c:1750 msgid "Moving files" msgstr "Perkeliami failai" -#: ../gthumb/gio-utils.c:1735 +#: ../gthumb/gio-utils.c:1750 msgid "Copying files" msgstr "Kopijuojami failai" -#: ../gthumb/gio-utils.c:1736 +#: ../gthumb/gio-utils.c:1751 msgid "Getting file information" msgstr "Gaunami failo duomenys..." @@ -3946,7 +4969,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2817 +#: ../gthumb/glib-utils.c:2848 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -3958,394 +4981,458 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2826 +#: ../gthumb/glib-utils.c:2857 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:370 -msgid "" -"gthumb is free software; you can redistribute it and/or modify it under the " -"terms of the GNU General Public License as published by the Free Software " -"Foundation; either version 2 of the License, or (at your option) any later " -"version." -msgstr "" -"gthumb yra laisva programinė įranga; jūs galite ją platinti ir/arba keisti " -"pagal GNU Bendros Viešosios Licencijos, kaip jas pateikia Free Software " -"Foundation, sąlygas; licencijos versija 2 arba (jūsų pasirinkta) bet kuri " -"vėlesnė versija." - -#: ../gthumb/gth-browser-actions-callbacks.c:374 -msgid "" -"gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU General Public License for more " -"details." -msgstr "" -"gthumb yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ GARANTIJŲ; " -"netgi be numanomų PREKYBINIŲ arba TINKAMUMO KONKREČIAM TIKSLUI garantijų. " -"Daugiau rasite perskaitę GNU Bendrą Viešąją Licenciją." +#: ../gthumb/gth-browser-actions-callbacks.c:400 +msgid "gthumb is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." +msgstr "gthumb yra laisva programinė įranga; jūs galite ją platinti ir/arba keisti pagal GNU Bendros Viešosios Licencijos, kaip jas pateikia Free Software Foundation, sąlygas; licencijos versija 2 arba (jūsų pasirinkta) bet kuri vėlesnė versija." -#: ../gthumb/gth-browser-actions-callbacks.c:378 -msgid "" -"You should have received a copy of the GNU General Public License along with " -"gthumb. If not, see http://www.gnu.org/licenses/." -msgstr "" -"Jūs turėjote gauti GNU Bendros Viešosios Licencijos kopiją kartu su gthumb. " -"Jei negavote, žiūrėkite http://www.gnu.org/licenses/." +#: ../gthumb/gth-browser-actions-callbacks.c:404 +msgid "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." +msgstr "gthumb yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ GARANTIJŲ; netgi be numanomų PREKYBINIŲ arba TINKAMUMO KONKREČIAM TIKSLUI garantijų. Daugiau rasite perskaitę GNU Bendrą Viešąją Licenciją." + +#: ../gthumb/gth-browser-actions-callbacks.c:408 +msgid "You should have received a copy of the GNU General Public License along with gthumb. If not, see http://www.gnu.org/licenses/." +msgstr "Jūs turėjote gauti GNU Bendros Viešosios Licencijos kopiją kartu su gthumb. Jei negavote, žiūrėkite http://www.gnu.org/licenses/." -#: ../gthumb/gth-browser-actions-callbacks.c:397 +#: ../gthumb/gth-browser-actions-callbacks.c:427 msgid "An image viewer and browser for GNOME." msgstr "Paveikslėlių peržiūros ir naršymo programa, skirta GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:430 msgid "translator_credits" msgstr "" -"Žygimantas Beručka \\n\n" +"Žygimantas Beručka \\n" +"\n" "Aurimas Černius " -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_Failas" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "_Taisa" -#: ../gthumb/gth-browser-actions-entries.h:32 -msgid "_View" -msgstr "_Rodymas" - -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "_Eiti" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "_Žinynas" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" msgstr "_Atverti su" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" msgstr "Importuoti _iš" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" msgstr "E_ksportuoti į" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" msgstr "Naujas _langas" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" msgstr "Atverti naują langą" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Atverti" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "Atverti naujame lange" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "Taisyti įvairius nustatymus" -#: ../gthumb/gth-browser-actions-entries.h:80 -msgid "Extensions" -msgstr "Papildiniai" - -#: ../gthumb/gth-browser-actions-entries.h:81 -msgid "Activate, deactivate and configure the gthumb extensions" -msgstr "Įjungti, išjungti ir keisti gThumb papildinių nustatymus" - -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." msgstr "_Rikiuoti pagal..." -#: ../gthumb/gth-browser-actions-entries.h:95 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." msgstr "_Filtruoti..." -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:108 msgid "Stop loading the current location" msgstr "Sustabdyti esamos vietos įkėlimą" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:114 msgid "Reload the current location" msgstr "Iš naujo įkelti esamą vietą" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" msgstr "Žiūrėti ankstesnį paveikslėlį" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "Žiūrėti kitą paveikslėlį" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "Rodyti visame ekrane" -#: ../gthumb/gth-browser-actions-entries.h:126 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" msgstr "Išjungti viso ekrano veikseną" -#: ../gthumb/gth-browser-actions-entries.h:131 ../gthumb/gth-browser.c:3344 +#: ../gthumb/gth-browser-actions-entries.h:144 +#: ../gthumb/gth-browser.c:3586 msgid "Go to the previous visited location" msgstr "Eiti į ankstesnę aplankytą vietą" -#: ../gthumb/gth-browser-actions-entries.h:136 ../gthumb/gth-browser.c:3365 +#: ../gthumb/gth-browser-actions-entries.h:150 +#: ../gthumb/gth-browser.c:3604 msgid "Go to the next visited location" msgstr "Eiti į kitą aplankytą vietą" -#: ../gthumb/gth-browser-actions-entries.h:141 ../gthumb/gth-browser.c:3386 +#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser.c:3622 msgid "Go up one level" msgstr "Eiti vienu lygiu aukštyn" -#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:653 +#: ../gthumb/gth-browser-actions-entries.h:161 +#| msgid "_Location" +msgid "_Location..." +msgstr "_Vieta..." + +#: ../gthumb/gth-browser-actions-entries.h:162 +#| msgid "Specify a location to visit" +msgid "Specify a location to open" +msgstr "Nurodykite norimą atverti vietą" + +#: ../gthumb/gth-browser-actions-entries.h:173 +#: ../gthumb/gth-browser.c:672 msgid "_Delete History" msgstr "_Ištrinti retrospektyvą" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "Delete the list of visited locations" msgstr "Ištrinti aplankytų vietų sąrašą" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "View the folders" msgstr "Žiūrėti aplankus" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Show information about gthumb" msgstr "Rodyti informaciją apie gThumb" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "Contents" msgstr "Turinys" -#: ../gthumb/gth-browser-actions-entries.h:166 +#: ../gthumb/gth-browser-actions-entries.h:192 msgid "Display the gthumb Manual" msgstr "Atverti gThumb žinyną" -#: ../gthumb/gth-browser-actions-entries.h:170 +#: ../gthumb/gth-browser-actions-entries.h:197 msgid "_Keyboard Shortcuts" msgstr "_Klavišų susiejimai" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:206 msgid "_Toolbar" msgstr "Į_rankių juosta" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:207 msgid "View or hide the toolbar of this window" msgstr "Rodyti ar slėpti šio lango įrankių juostą" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:211 msgid "_Statusbar" msgstr "_Būsenos juosta" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "View or hide the statusbar of this window" msgstr "Rodyti ar slėpti šio lango būsenos juostą" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:216 msgid "_Filterbar" msgstr "_Filtravimo juosta" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "View or hide the filterbar of this window" msgstr "Rodyti ar slėpti šio lango filtravimo juostą" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:221 msgid "_Sidebar" msgstr "_Šoninė juosta" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "View or hide the sidebar of this window" msgstr "Rodyti ar slėpti šio lango šoninę juostą" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:226 msgid "_Thumbnail Pane" msgstr "_Miniatiūrų polangis" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Rodyti ar slėpti miniatiūrų polangį rodymo veiksenoje" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:231 msgid "_Thumbnails" msgstr "_Miniatiūros" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "View thumbnails" msgstr "Rodyti miniatiūras" -#: ../gthumb/gth-browser-actions-entries.h:209 +#: ../gthumb/gth-browser-actions-entries.h:236 msgid "_Hidden Files" msgstr "_Paslėpti failai" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "Show hidden files and folders" msgstr "Rodyti paslėptus failus ir aplankus" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:242 +#: ../gthumb/gth-browser-actions-entries.h:247 msgid "View file properties" msgstr "Rodyti failo savybes" -#: ../gthumb/gth-browser-actions-entries.h:219 +#: ../gthumb/gth-browser-actions-entries.h:251 msgid "Edit" msgstr "Taisyti" -#: ../gthumb/gth-browser-actions-entries.h:220 +#: ../gthumb/gth-browser-actions-entries.h:252 msgid "Edit file" msgstr "Taisyti failą" -#: ../gthumb/gth-browser.c:355 +#: ../gthumb/gth-browser-actions-entries.h:256 +msgid "_Fit Window to Image" +msgstr "_Pritaikyti langą prie paveikslėlio" + +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Resize the window to the size of the image" +msgstr "Keisti lango dydį pagal paveikslėlio dydį" + +#: ../gthumb/gth-browser.c:369 #, c-format msgid "Open %s" msgstr "Atverti %s" -#: ../gthumb/gth-browser.c:494 +#: ../gthumb/gth-browser.c:509 msgid "[modified]" msgstr "[pakeistas]" -#: ../gthumb/gth-browser.c:498 ../gthumb/gth-main.c:259 -msgid "gthumb" -msgstr "gThumb" - -#: ../gthumb/gth-browser.c:1121 ../gthumb/gth-browser.c:1674 -#: ../gthumb/gth-browser.c:5436 ../gthumb/gth-browser.c:5455 -#: ../gthumb/gth-browser.c:5480 +#: ../gthumb/gth-browser.c:1006 #, c-format -msgid "Could not load the position \"%s\"" -msgstr "Nepavyko įkelti pozicijos „%s“" +#| msgid "%d selected (%s)" +msgid "%d file selected (%s)" +msgid_plural "%d files selected (%s)" +msgstr[0] "Pasirinktas %d failas (%s)" +msgstr[1] "Pasirinkti %d failai (%s)" +msgstr[2] "Pasirinkta %d failų (%s)" + +#: ../gthumb/gth-browser.c:1041 +#, c-format +#| msgid "Free space:" +msgid "%s of free space" +msgstr "Laisva vietos %s" -#: ../gthumb/gth-browser.c:1767 ../gthumb/gth-browser.c:1794 +#: ../gthumb/gth-browser.c:1905 +#: ../gthumb/gth-browser.c:1932 #, c-format msgid "No suitable module found for %s" msgstr "Nerastas tinkamas modulis %s" -#: ../gthumb/gth-browser.c:1912 +#: ../gthumb/gth-browser.c:2052 #, c-format msgid "Save changes to file '%s'?" msgstr "Įrašyti pakeitimus į failą „%s“?" -#: ../gthumb/gth-browser.c:1917 +#: ../gthumb/gth-browser.c:2057 msgid "If you don't save, changes to the file will be permanently lost." msgstr "Jei neįrašysite, pakeitimai bus negrįžtamai prarasti." -#: ../gthumb/gth-browser.c:1918 +#: ../gthumb/gth-browser.c:2058 msgid "Do _Not Save" msgstr "_Neįrašyti" -#: ../gthumb/gth-browser.c:2606 ../gthumb/gth-browser.c:2630 -#: ../gthumb/gth-source-tree.c:178 ../gthumb/gth-source-tree.c:200 +#: ../gthumb/gth-browser.c:2828 +#: ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Nepavyko pakeisti pavadinimo" -#: ../gthumb/gth-browser.c:3028 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3257 +#: ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Pakeistas" -#: ../gthumb/gth-browser.c:3345 ../gthumb/gth-browser.c:3366 +#: ../gthumb/gth-browser.c:3587 +#: ../gthumb/gth-browser.c:3605 msgid "View the list of visited locations" msgstr "Rodyti aplankytų vietų sąrašą" -#: ../gthumb/gth-browser.c:3387 +#: ../gthumb/gth-browser.c:3623 msgid "View the list of upper locations" msgstr "Rodyti aukštesnių vietų sąrašą" -#: ../gthumb/gth-browser.c:5437 +#: ../gthumb/gth-browser.c:5900 #, c-format msgid "File type not supported" msgstr "Failo tipas nepalaikomas" -#: ../gthumb/gth-browser.c:5481 +#: ../gthumb/gth-browser.c:5943 #, c-format msgid "No suitable module found" msgstr "Nerastas tinkamas modulis" -#: ../gthumb/gth-extensions.c:228 +#: ../gthumb/gth-extensions.c:203 #, c-format msgid "Could not open the module `%s`: %s" msgstr "Nepavyko atverti modulio „%s“: %s" -#: ../gthumb/gth-extensions.c:827 +#: ../gthumb/gth-extensions.c:744 #, c-format -msgid "The extension '%s' is required by the extension '%s'" -msgstr "Papildiniui „%2$s“ reikia plėtinio „%1$s“" +#| msgid "The extension '%s' is required by the extension '%s'" +msgid "The extension '%1$s' is required by the extension '%2$s'" +msgstr "Papildiniui „%2$s“ reikia papildinio „%1$s“" -#: ../gthumb/gth-file-source-vfs.c:80 +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Namų aplankas" -#: ../gthumb/gth-file-source-vfs.c:87 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" msgstr "Failų sistema" -#: ../gthumb/gth-filterbar.c:405 +#: ../gthumb/gth-file-source-vfs.c:739 +msgid "The files cannot be moved to the Trash. Do you want to delete them permanently?" +msgstr "Paveikslėlių negalima perkelti į šiukšlinę. Ar norite juos ištrinti negrįžtamai?" + +#: ../gthumb/gth-file-source-vfs.c:750 +msgid "Could not move the files to the Trash" +msgstr "Nepavyko perkelti failų į šiukšlinę" + +#: ../gthumb/gth-file-source-vfs.c:797 +#, c-format +msgid "Are you sure you want to move \"%s\" to trash?" +msgstr "Ar tikrai norite perkelti „%s“ į šiukšlinę?" + +#: ../gthumb/gth-file-source-vfs.c:801 +#, c-format +msgid "Are you sure you want to move to trash the %'d selected file?" +msgid_plural "Are you sure you want to move to trash the %'d selected files?" +msgstr[0] "Ar tikrai norite perkelti į šiukšlinę %'d pasirinktą failą?" +msgstr[1] "Ar tikrai norite perkelti į šiukšlinę %'d pasirinktus failus?" +msgstr[2] "Ar tikrai norite perkelti į šiukšlinę %'d pasirinktų failų?" + +#: ../gthumb/gth-file-source-vfs.c:844 +#, c-format +msgid "Are you sure you want to permanently delete the %'d selected file?" +msgid_plural "Are you sure you want to permanently delete the %'d selected files?" +msgstr[0] "Ar tikrai norite negrįžtamai ištrinti %'d pasirinktą failą?" +msgstr[1] "Ar tikrai norite negrįžtamai ištrinti %'d pasirinktus failus?" +msgstr[2] "Ar tikrai norite negrįžtamai ištrinti %'d pasirinktų failų?" + +#: ../gthumb/gth-filterbar.c:406 msgid "Hide the filterbar" msgstr "Slėpti filtravimo juostą" -#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter.c:43 +#: ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" -#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter.c:44 +#: ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "MB" -#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:211 +#: ../gthumb/gth-filter.c:45 +#: ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:279 ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter.c:291 +#: ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "failai" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" msgstr "didėjimo" -#: ../gthumb/gth-filter-editor-dialog.c:256 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" msgstr "mažėjimo" -#: ../gthumb/gth-filter-editor-dialog.c:546 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "Be apribojimų" -#: ../gthumb/gth-folder-tree.c:848 +#: ../gthumb/gth-folder-tree.c:857 msgid "Loading..." msgstr "Įkeliama..." -#: ../gthumb/gth-folder-tree.c:1119 +#: ../gthumb/gth-folder-tree.c:1100 msgid "(Open Parent)" msgstr "(Atverti aukštesnį)" -#: ../gthumb/gth-image-loader.c:222 ../gthumb/gth-image-loader.c:294 -msgid "No suitable loader available for this file type" -msgstr "Šio tipo failams nėra tinkamos įkėlimo priemonės" - -#: ../gthumb/gth-main.c:222 -#, c-format -msgid "Unable to show '%s'" -msgstr "Nepavyko parodyti „%s“" - -#: ../gthumb/gth-main.c:242 -#, c-format -msgid "Unable to open '%s'" -msgstr "Nepavyko atverti „%s“" +#: ../gthumb/gth-histogram-view.c:826 +msgid "Linear scale" +msgstr "Tiesinis didinimas" + +#: ../gthumb/gth-histogram-view.c:838 +msgid "Logarithmic scale" +msgstr "Logaritminis didinimas" + +#: ../gthumb/gth-histogram-view.c:858 +#| msgid "Channels" +msgid "Channel:" +msgstr "Kanalas:" + +#: ../gthumb/gth-histogram-view.c:890 +msgid "Value" +msgstr "Reikšmė" + +#: ../gthumb/gth-histogram-view.c:896 +#| msgid "Redo" +msgid "Red" +msgstr "Raudona" + +#: ../gthumb/gth-histogram-view.c:902 +msgid "Green" +msgstr "Žalia" + +#: ../gthumb/gth-histogram-view.c:908 +msgid "Blue" +msgstr "Mėlyna" + +#: ../gthumb/gth-histogram-view.c:914 +msgid "Alpha" +msgstr "Alfa" + +#: ../gthumb/gth-histogram-view.c:921 +#| msgid "GB" +msgid "RGB" +msgstr "RGB" + +#: ../gthumb/gth-load-file-data-task.c:108 +#| msgid "Getting file information" +msgid "Reading file information" +msgstr "Skaitomi failo duomenys" #: ../gthumb/gth-main-default-metadata.c:32 msgid "File" @@ -4356,7 +5443,7 @@ msgstr "Pavadinimas" #: ../gthumb/gth-main-default-metadata.c:40 -#: ../gthumb/gth-main-default-tests.c:248 +#: ../gthumb/gth-main-default-tests.c:284 msgid "Size" msgstr "Dydis" @@ -4368,26 +5455,10 @@ msgid "Full Name" msgstr "Visas pavadinimas" -#: ../gthumb/gth-main-default-metadata.c:46 -msgid "Title" -msgstr "Pavadinimas" - #: ../gthumb/gth-main-default-metadata.c:48 msgid "Duration" msgstr "Trukmė" -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Formatas" - -#: ../gthumb/gth-main-default-metadata.c:51 -msgid "Date" -msgstr "Data" - -#: ../gthumb/gth-main-default-metadata.c:54 -msgid "Rating" -msgstr "Įvertinimas" - #: ../gthumb/gth-main-default-sort-types.c:131 msgid "file name" msgstr "failo pavadinimas" @@ -4412,27 +5483,23 @@ msgid "dimensions" msgstr "matmenys" -#: ../gthumb/gth-main-default-tests.c:204 -msgid "Images" -msgstr "Paveikslėliai" - -#: ../gthumb/gth-main-default-tests.c:225 +#: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Laikmena" -#: ../gthumb/gth-main-default-tests.c:232 +#: ../gthumb/gth-main-default-tests.c:268 msgid "Text Files" msgstr "Tekstiniai failai" -#: ../gthumb/gth-main-default-tests.c:240 +#: ../gthumb/gth-main-default-tests.c:276 msgid "Filename" msgstr "Failo pavadinimas" -#: ../gthumb/gth-main-default-tests.c:272 +#: ../gthumb/gth-main-default-tests.c:308 msgid "Title (embedded)" msgstr "Pavadinimas (įtaisytas)" -#: ../gthumb/gth-main-default-tests.c:278 +#: ../gthumb/gth-main-default-tests.c:316 msgid "Description (embedded)" msgstr "Aprašymas (įtaisytas)" @@ -4444,89 +5511,103 @@ msgid "No options available for this file type" msgstr "Nėra parinkčių šiam failo tipui" -#: ../gthumb/gth-progress-dialog.c:136 +#: ../gthumb/gth-progress-dialog.c:144 msgid "Cancel operation" msgstr "Atšaukti veiksmą" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-save-file-data-task.c:102 +#| msgid "Getting file information" +msgid "Saving file information" +msgstr "Įrašomi failo duomenys" + +#: ../gthumb/gth-tags-entry.c:388 #, c-format msgid "Create tag «%s»" msgstr "Sukurti žymą „%s“" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:735 msgid "Show all the tags" msgstr "Rodyti visas žymas" -#: ../gthumb/gth-tags-file.c:234 +#: ../gthumb/gth-tags-file.c:236 msgid "Holidays" msgstr "Šventės" -#: ../gthumb/gth-tags-file.c:235 +#: ../gthumb/gth-tags-file.c:237 msgid "Temporary" msgstr "Laikina" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:238 msgid "Screenshots" msgstr "Ekrano nuotraukos" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:239 msgid "Science" msgstr "Mokslas" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:240 msgid "Favorite" msgstr "Mėgstamiausi" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:241 msgid "Important" msgstr "Svarbu" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:242 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:243 msgid "Games" msgstr "Žaidimai" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:244 msgid "Party" msgstr "Vakarėlis" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:245 msgid "Birthday" msgstr "Gimtadienis" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:246 msgid "Astronomy" msgstr "Astronomija" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:247 msgid "Family" msgstr "Šeima" -#: ../gthumb/gth-test-category.c:46 ../gthumb/gth-test-simple.c:49 +#: ../gthumb/gth-test-category.c:46 +#: ../gthumb/gth-test-simple.c:49 #: ../gthumb/gth-test-simple.c:64 msgid "is" msgstr "yra" -#: ../gthumb/gth-test-category.c:47 ../gthumb/gth-test-simple.c:50 +#: ../gthumb/gth-test-category.c:47 +#| msgid "Icons only" +msgid "is only" +msgstr "yra tik" + +#: ../gthumb/gth-test-category.c:48 +#: ../gthumb/gth-test-simple.c:50 #: ../gthumb/gth-test-simple.c:65 msgid "is not" msgstr "nėra" -#: ../gthumb/gth-test-category.c:361 ../gthumb/gth-test-simple.c:796 -#: ../gthumb/gth-test-simple.c:822 ../gthumb/gth-test-simple.c:843 -#: ../gthumb/gth-test-simple.c:869 +#: ../gthumb/gth-test-category.c:394 +#: ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 +#: ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "Bandomasis apibrėžimas yra nevisas" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:252 msgid "Add a new rule" msgstr "Pridėti naują taisyklę" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:263 msgid "Remove this rule" msgstr "Pašalinti šią taisyklę" @@ -4570,11 +5651,11 @@ msgid "is after" msgstr "po" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:477 msgid "Today" msgstr "Šiandien" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:485 msgid "Now" msgstr "Dabar" @@ -4582,36 +5663,59 @@ msgid "Close this window" msgstr "Užverti šį langą" -#: ../gthumb/gtk-utils.c:802 +#: ../gthumb/gth-window-actions-entries.h:36 +#| msgid "Close this window" +msgid "Close _All Windows" +msgstr "Užverti _visus langus" + +#: ../gthumb/gtk-utils.c:551 msgid "Could not display help" msgstr "Nepavyko parodyti žinyno" -#: ../gthumb/gtk-utils.c:1089 ../gthumb/gtk-utils.c:1097 +#: ../gthumb/gtk-utils.c:868 +#: ../gthumb/gtk-utils.c:875 msgid "Could not launch the application" msgstr "Nepavyko paleisti programos" -#: ../gthumb/main.c:67 +#: ../gthumb/gtk-utils.c:978 +msgid "_Copy Here" +msgstr "_Kopijuoti čia" + +#: ../gthumb/gtk-utils.c:983 +#| msgid "_Move" +msgid "_Move Here" +msgstr "_Perkelti čia" + +#: ../gthumb/gtk-utils.c:988 +msgid "_Link Here" +msgstr "_Saitas į čia" + +#: ../gthumb/gtk-utils.c:997 +#| msgid "Channels" +msgid "Cancel" +msgstr "Atsisakyti" + +#: ../gthumb/main.c:59 msgid "Open a new window" msgstr "Atverti naują langą" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:63 msgid "Start in fullscreen mode" msgstr "Paleisti viso ekrano veiksenoje" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:67 msgid "Automatically start a slideshow" msgstr "Automatiškai pradėti rodyti pateiktis" -#: ../gthumb/main.c:79 +#: ../gthumb/main.c:71 msgid "Automatically import digital camera photos" msgstr "Automatiškai importuoti skaitmeninio fotoaparato fotografijas" -#: ../gthumb/main.c:83 +#: ../gthumb/main.c:75 msgid "Show version" msgstr "Rodyti versiją" -#. command line options -#: ../gthumb/main.c:413 +#: ../gthumb/main.c:344 msgid "- Image browser and viewer" msgstr "– Paveikslėlių naršymo ir peržiūros programa" @@ -4620,1726 +5724,3 @@ msgid "Could not find a suitable module to save the image as \"%s\"" msgstr "Nepavyko rasti tinkamo modulio paveikslėliui įrašyti kaip „%s“" -#~ msgid "Do _not change folder" -#~ msgstr "Ne_keisti aplanko" - -#~ msgid "Files" -#~ msgstr "Failai" - -#~ msgid "_Overwrite existing files" -#~ msgstr "Pe_rrašyti esančius failus" - -#~ msgid "Close" -#~ msgstr "Užverti" - -#~ msgid "file modified date " -#~ msgstr "failo pakeitimo data" - -#~ msgid "Edit file metadata" -#~ msgstr "Keisti failo meta duomenis" - -#~ msgid "Paolo Bacchilega " -#~ msgstr "Paolo Bacchilega " - -#~ msgid "_Preserve original aspect ratio" -#~ msgstr "_išlaikyti originalias proporcijas" - -#~ msgid "4 x 3 (Book, DVD)" -#~ msgstr "4 x 3 (knyga, DVD)" - -#~ msgid "5 x 7" -#~ msgstr "5 x 7" - -#~ msgid "8 x 10" -#~ msgstr "8 x 10" - -#~ msgid "Bytes" -#~ msgstr "Baitai" - -#~ msgid "Exposure mode" -#~ msgstr "Ekspozicijos veiksena" - -#~ msgid "Flash" -#~ msgstr "Blykstė" - -#~ msgid "Shutter speed" -#~ msgstr "Išlaikymas" - -#~ msgid "Aperture value" -#~ msgstr "Diafragma" - -#~ msgid "Focal length" -#~ msgstr "Židinio nuotolis" - -#~ msgid "Camera model" -#~ msgstr "Fotoaparato modelis" - -#~ msgid " " -#~ msgstr " " - -#~ msgid "Categories:" -#~ msgstr "Kategorijos:" - -#~ msgid "Information on Channel:" -#~ msgstr "Kanalo informacija:" - -#~ msgid "Alpha" -#~ msgstr "Alfa" - -#~ msgid "Blue" -#~ msgstr "Mėlyna" - -#~ msgid "Choose a Catalog" -#~ msgstr "Pasirinkite katalogą" - -#~ msgid "Comm_ent" -#~ msgstr "Kom_entaras" - -#~ msgid "Green" -#~ msgstr "Žalia" - -#~ msgid "Open Images" -#~ msgstr "Atverti paveikslėlius" - -#~ msgid "Overwrite Image" -#~ msgstr "Perrašyti paveikslėlį" - -#~ msgid "R_ecent applications:" -#~ msgstr "P_askutiniosios programos:" - -#~ msgid "Value" -#~ msgstr "Reikšmė" - -#~ msgid "_Application:" -#~ msgstr "_Programa:" - -#~ msgid "_Histogram" -#~ msgstr "_Histograma" - -#~ msgid "_Next" -#~ msgstr "_Kitas" - -#~ msgid "_Previous" -#~ msgstr "_Ankstesnis" - -#~ msgid "..." -#~ msgstr "..." - -#~ msgid "Click \"Help\" for format code information." -#~ msgstr "" -#~ "Spauskite „Žinynas“, jei ieškote informacijos apie formato kodus." - -#~ msgid "Camera Model" -#~ msgstr "Fotoaparato modelis" - -#~ msgid "Custom subfolder:" -#~ msgstr "Nurodytas aplankas:" - -#~ msgid "Delete selected images from the camera" -#~ msgstr "Ištrinti pasirinktus paveikslėlius iš fotoaparato" - -#~ msgid "" -#~ "If this checkbox is enabled and the imported photo contains an Exif " -#~ "orientation tag, the image data will be physically transformed " -#~ "(losslessly) so that the viewed image looks the same as before but the " -#~ "orientation tag is reset to \"top left\". If this checkbox is not " -#~ "enabled, the image data and the orientation tag are both left unchanged. " -#~ "The image will be displayed identically by gthumb for both possibilities, " -#~ "but for maximum compatibility with other applications this checkbox " -#~ "should be enabled." -#~ msgstr "" -#~ "Jei šis langelis pažymėtas ir importuotoje fotografijoje yra Exif " -#~ "orientacijos žymė, paveikslėlio duomenys bus fiziškai transformuoti " -#~ "(nekenkiant kokybei) tam, kad žiūrimas paveikslėlis atrodytų toks pat " -#~ "kaip ir anksčiau, tačiau orientacijos žymė būtų atstatyta į „viršus-" -#~ "kairė“. Jei šis langelis nepažymėtas, paveikslėlio duomenys ir " -#~ "orientacijos žymė liks nepakeisti. gThumb paveikslėlį rodys identiškai " -#~ "abiem atvejais, tačiau dėl didesnio suderinamumo su kitomis programomis " -#~ "šis langelis turėtų būti pažymėtas." - -#~ msgid "Select a camera model" -#~ msgstr "Pasirinkite fotoaparato modelį" - -#~ msgid "Update previews" -#~ msgstr "Atnaujinti peržiūras" - -#~ msgid "A_vailable categories:" -#~ msgstr "_Prieinamos kategorijos:" - -#~ msgid "Categories" -#~ msgstr "Kategorijos" - -#~ msgid "Create a new category" -#~ msgstr "Sukurti naują kategoriją" - -#~ msgid "Date photo taken (from EXIF metadata)" -#~ msgstr "Nuotraukos data (Iš EXIF duomenų)" - -#~ msgid "Remove selected category" -#~ msgstr "Pašalinti pasirinktą kategoriją" - -#~ msgid "_Selected categories:" -#~ msgstr "_Pasirinktos kategorijos:" - -#~ msgid "Compression" -#~ msgstr "Suspaudimas" - -#~ msgid "Image type" -#~ msgstr "Paveikslėlio tipas" - -#~ msgid "JPEG Options" -#~ msgstr "JPEG nustatymai" - -#~ msgid "Overwrite mode:" -#~ msgstr "Perrašymo režimas:" - -#~ msgid "R_emove original" -#~ msgstr "Paša_linti originalą" - -#~ msgid "" -#~ "Skip\n" -#~ "Rename\n" -#~ "Ask\n" -#~ "Overwrite" -#~ msgstr "" -#~ "Praleisti\n" -#~ "Pervadinti\n" -#~ "Paklausti\n" -#~ "Perrašyti" - -#~ msgid "TGA Options" -#~ msgstr "TGA nustatymai" - -#~ msgid "TIFF Options" -#~ msgstr "TIFF nustatymai" - -#~ msgid "Actions" -#~ msgstr "Veiksmai" - -#~ msgid "Display" -#~ msgstr "Rodymas" - -#~ msgid "Selection" -#~ msgstr "Pasirinkimas" - -#~ msgid "" -#~ "Click and drag the mouse to \n" -#~ "select the cropping area, or\n" -#~ "use the dialogs below. Press \n" -#~ "the \"Crop\" button to perform\n" -#~ "the crop, and \"Done\" to finish." -#~ msgstr "" -#~ "Spragtelėkite ir tempkite \n" -#~ "apkirpimo sričiai pažymėti arba\n" -#~ "naudokite dialogus žemiau. \n" -#~ "Spauskite mygtuką „Apkirpti“\n" -#~ "veiksmui atlikti ir „Baigta“, kai\n" -#~ "daugiau nebereikia apkirpti." - -#~ msgid "Cr_op" -#~ msgstr "_Apkirpti" - -#~ msgid "Show / hide the cropping selection area" -#~ msgstr "Rodyti / slėpti pažymėtą apkirpimo sritį" - -#~ msgid "Zoom at 100% scale" -#~ msgstr "Rodyti 100% dydžiu" - -#~ msgid "Zoom in. The mousewheel can also be used to zoom in." -#~ msgstr "Didinti. Taip pat galite naudoti pelės ratuką." - -#~ msgid "Zoom out. The mousewheel can also be used to zoom out." -#~ msgstr "Mažinti. Taip pat galite naudoti pelės ratuką." - -#~ msgid "Zoom to fit" -#~ msgstr "Optimalus dydis" - -#~ msgid "_Done" -#~ msgstr "_Baigta" - -#~ msgid " " -#~ msgstr " " - -#~ msgid "Scale ratio" -#~ msgstr "Mastelio santykis" - -#~ msgid "Brightness - Contrast" -#~ msgstr "Ryškumas - Kontrastas" - -#~ msgid "Color Balance" -#~ msgstr "Spalvų balansas" - -#~ msgid "Hue - Saturation" -#~ msgstr "Atspalvis - Sotis" - -#~ msgid "Posterize" -#~ msgstr "Sumažinti spalvų kiekį" - -#~ msgid "Preserve l_uminosity" -#~ msgstr "Išsaugoti šviesos ryšk_umą" - -#~ msgid "Width:" -#~ msgstr "Plotis:" - -#~ msgid "_Hue:" -#~ msgstr "_Atspalvis:" - -#~ msgid "_Keep aspect ratio" -#~ msgstr "Išlai_kyti proporcijas" - -#~ msgid "_Levels:" -#~ msgstr "_Lygiai:" - -#~ msgid "_Lightness:" -#~ msgstr "Š_viesumas:" - -#~ msgid "_Scale" -#~ msgstr "Kei_sti mastelį" - -#~ msgid "112" -#~ msgstr "112" - -#~ msgid "128" -#~ msgstr "128" - -#~ msgid "164" -#~ msgstr "164" - -#~ msgid "200" -#~ msgstr "200" - -#~ msgid "256" -#~ msgstr "256" - -#~ msgid "48" -#~ msgstr "48" - -#~ msgid "64" -#~ msgstr "64" - -#~ msgid "85" -#~ msgstr "85" - -#~ msgid "95" -#~ msgstr "95" - -#~ msgid "Background style" -#~ msgstr "Fono stilius" - -#~ msgid "Caption" -#~ msgstr "Antraštė" - -#~ msgid "Footer" -#~ msgstr "Poraštė" - -#~ msgid "Header and footer" -#~ msgstr "Antraštė ir poraštė" - -#~ msgid "Header" -#~ msgstr "Antraštė" - -#~ msgid "Index images" -#~ msgstr "Rodykliniai paveikslėliai" - -#~ msgid "Page size" -#~ msgstr "Puslapio dydis" - -#~ msgid "Note: # (enumerator)." -#~ msgstr "Pastaba: # (skaičiuoklis)." - -#~ msgid "" -#~ "Note: %p (page number), %n (total number of pages)." -#~ msgstr "" -#~ "Pastaba: %p (puslapio numeris), %n (iš viso puslapių)." - -#~ msgid "Co_mment" -#~ msgstr "Ko_mentaras" - -#~ msgid "Colo_r:" -#~ msgstr "S_palva:" - -#~ msgid "Create Index Image" -#~ msgstr "Sukurti rodyklinį paveikslėlį" - -#~ msgid "Create _HTML image map" -#~ msgstr "Sukurti _HTML paveikslėlių žemėlapį" - -#~ msgid "F_ooter:" -#~ msgstr "P_oraštė:" - -#~ msgid "Frame co_lor:" -#~ msgstr "Rėmelio spa_lva:" - -#~ msgid "H_eader:" -#~ msgstr "A_ntraštė:" - -#~ msgid "Header/Footer" -#~ msgstr "Antraštė/Poraštė" - -#~ msgid "Hei_ght:" -#~ msgstr "Au_kštis:" - -#~ msgid "Image dim_ensions" -#~ msgstr "Paveikslėlio matm_enys" - -#~ msgid "Index Image Style" -#~ msgstr "Rodyklinio paveikslėlio stilius" - -#~ msgid "Pi_xels" -#~ msgstr "Pi_kseliai" - -#~ msgid "Rows a_nd columns" -#~ msgstr "Eilutės ir _stulpeliai" - -#~ msgid "Select a color" -#~ msgstr "Pasirinkite spalvą" - -#~ msgid "Shadow only" -#~ msgstr "Tik šešėlis" - -#~ msgid "Shadow out" -#~ msgstr "Šešėlis į išorę" - -#~ msgid "Simple with shadow" -#~ msgstr "Paprastas su šešėliu" - -#~ msgid "Sor_t:" -#~ msgstr "Rūšiuo_ti:" - -#~ msgid "St_yle" -#~ msgstr "St_ilius" - -#~ msgid "Wi_dth:" -#~ msgstr "Pl_otis:" - -#~ msgid "_All pages with the same size" -#~ msgstr "_Visi puslapiai vienodo dydžio" - -#~ msgid "_Draw frame" -#~ msgstr "_Piešti rėmelį" - -#~ msgid "_Gradient" -#~ msgstr "_Perėjimas" - -#~ msgid "_Image size:" -#~ msgstr "_Paveikslėlio dydis:" - -#~ msgid "_Rows:" -#~ msgstr "_Eilutės:" - -#~ msgid "_Solid color" -#~ msgstr "_Vientisa spalva" - -#~ msgid "by name" -#~ msgstr "pagal pavadinimą" - -#~ msgid "jpeg" -#~ msgstr "jpeg" - -#~ msgid "png" -#~ msgstr "png" - -#~ msgid "112 x 112" -#~ msgstr "112 x 112" - -#~ msgid "128 x 128" -#~ msgstr "128 x 128" - -#~ msgid "164 x 164" -#~ msgstr "164 x 164" - -#~ msgid "200 x 200" -#~ msgstr "200 x 200" - -#~ msgid "256 x 256" -#~ msgstr "256 x 256" - -#~ msgid "48 x 48" -#~ msgstr "48 x 48" - -#~ msgid "64 x 64" -#~ msgstr "64 x 64" - -#~ msgid "85 x 85" -#~ msgstr "85 x 85" - -#~ msgid "95 x 95" -#~ msgstr "95 x 95" - -#~ msgid "Direction" -#~ msgstr "Kryptis" - -#~ msgid "Hide/Show" -#~ msgstr "Slėpti/Rodyti" - -#~ msgid "Interface" -#~ msgstr "Sąsaja" - -#~ msgid "Other" -#~ msgstr "Kita" - -#~ msgid "Slideshow" -#~ msgstr "Skaidrių rodymas" - -#~ msgid "Viewer" -#~ msgstr "Žiūryklė" - -#~ msgid "" -#~ "By default, gThumb lists all files that are likely to be found on a " -#~ "digital camera - photos, videos, and audio files. You can omit the audio " -#~ "and video files by deselecting this checkbox." -#~ msgstr "" -#~ "Pagal nutylėjimą gThumb rodo visus failus, kuriuos galima tikėtis rasti " -#~ "skaitmeniniame fotoaparate – nuotraukas, video ir audio klipus. Galite " -#~ "paslėpti video ir audio įrašus nužymėdami šį pasirinkimą." - -#~ msgid "C_lick policy:" -#~ msgstr "Spra_gtelėjimų elgsena:" - -#~ msgid "D_elay before changing image:" -#~ msgstr "_Laikas tarp paveikslėlių keitimų:" - -#~ msgid "For_ward" -#~ msgstr "Pir_myn" - -#~ msgid "Go to last _visited folder or catalog" -#~ msgstr "Eiti į pa_skutinį aplankytą aplanką ar katalogą" - -#~ msgid "Include audio clips and movies in browser view" -#~ msgstr "Rodyti audio klipus ir filmus naršyklės rodinyje" - -#~ msgid "Layout:" -#~ msgstr "Išdėstymas:" - -#~ msgid "Re_verse" -#~ msgstr "A_tgal" - -#~ msgid "Use a _fading effect when changing image" -#~ msgstr "Keičiant paveikslėlį naudoti _išnykimo efektą" - -#~ msgid "1" -#~ msgstr "1" - -#~ msgid "150" -#~ msgstr "150" - -#~ msgid "16" -#~ msgstr "16" - -#~ msgid "2" -#~ msgstr "2" - -#~ msgid "300" -#~ msgstr "300" - -#~ msgid "4" -#~ msgstr "4" - -#~ msgid "600" -#~ msgstr "600" - -#~ msgid "72" -#~ msgstr "72" - -#~ msgid "8" -#~ msgstr "8" - -#~ msgid "Image Sizing" -#~ msgstr "Paveikslėlio dydis" - -#~ msgid "Margins" -#~ msgstr "Paraštės" - -#~ msgid "Orientation" -#~ msgstr "Orientacija" - -#~ msgid "Size" -#~ msgstr "Dydis" - -#~ msgid "" -#~ "Note: Drag the image to move it in the page.\n" -#~ "Click on an image to rotate it." -#~ msgstr "" -#~ "Pastaba: Paveikslėlį perkelti galite tampydami jį " -#~ "puslapyje.\n" -#~ "Pasukti - paprasčiausiai spragtelėję jį." - -#~ msgid "" -#~ "Note: High-resolution images will be\n" -#~ "down-sampled to this resolution. Increase\n" -#~ "the resolution to get better image quality.\n" -#~ "Decrease it to get shorter print times." -#~ msgstr "" -#~ "Pastaba: didelės skiriamosios\n" -#~ "gebos paveikslėliai bus sumažinti iki šios gebos.\n" -#~ "Padidinkite gebą, jei norite gauti geresnę kokybę.\n" -#~ "Sumažinkite, jei siekiate greitesnio spausdinimo." - -#~ msgid "A4" -#~ msgstr "A4" - -#~ msgid "Automatic sizing" -#~ msgstr "Automatinis dydžio nustatymas" - -#~ msgid "Center _on Page" -#~ msgstr "Centru_oti puslapyje" - -#~ msgid "Comment _font:" -#~ msgstr "Komentaro šri_ftas:" - -#~ msgid "Executive" -#~ msgstr "Vykdomasis" - -#~ msgid "I_nclude comment" -#~ msgstr "Įtra_ukti komentarą" - -#~ msgid "Lan_dscape" -#~ msgstr "_Gulsčias" - -#~ msgid "Legal" -#~ msgstr "Teisinis" - -#~ msgid "Letter" -#~ msgstr "Laiškas" - -#~ msgid "P_ortrait" -#~ msgstr "_Stačias" - -#~ msgid "Paper Details" -#~ msgstr "Popieriaus detalės" - -#~ msgid "Postcard" -#~ msgstr "Atvirutė" - -#~ msgid "Scale to this size" -#~ msgstr "Nustatyti paveikslėlį į šį dydį" - -#~ msgid "Tabloid" -#~ msgstr "Tabloidas" - -#~ msgid "_Bottom:" -#~ msgstr "_Apačia:" - -#~ msgid "Other Actions" -#~ msgstr "Kiti veiksmai" - -#~ msgid "Zoom" -#~ msgstr "Didinimas" - -#~ msgid "" -#~ "Move the cursor over the\n" -#~ "red eye and click on it. You\n" -#~ "can use the mousewheel to\n" -#~ "zoom in and out, or use the\n" -#~ "zoom buttons below." -#~ msgstr "" -#~ "Nuveskite pelės rodyklę\n" -#~ "virš raudonos akies ir spragtelėkite.\n" -#~ "Vaizdui padidinti ar sumažinti\n" -#~ "galite naudoti pelės ratuką\n" -#~ "arba mygtukus apačioje." - -#~ msgid "Search criteria" -#~ msgstr "Paieškos kriterijai" - -#~ msgid "Search scope" -#~ msgstr "Paieškos apimtis" - -#~ msgid "After" -#~ msgstr "Po" - -#~ msgid "Any" -#~ msgstr "Bet kokia" - -#~ msgid "Before" -#~ msgstr "Prieš" - -#~ msgid "Choose categories from the saved list" -#~ msgstr "Pasirinkite kategorijas iš įrašyto sąrašo" - -#~ msgid "Equal to" -#~ msgstr "Lygi" - -#~ msgid "Match a_ll selected categories" -#~ msgstr "Atitikti _visas pasirinktas kategorijas" - -#~ msgid "Match a_ny selected category" -#~ msgstr "Atitikti _bet kurią pasirinktą kategoriją" - -#~ msgid "New _Search..." -#~ msgstr "Nauja _paieška..." - -#~ msgid "Search Progress" -#~ msgstr "Paieškos progresas" - -#~ msgid "_Edit Search" -#~ msgstr "K_eisti paiešką" - -#~ msgid "Change to:" -#~ msgstr "Pakeisti į:" - -#~ msgid "Write to CD" -#~ msgstr "Rašyti į CD" - -#~ msgid "" -#~ "Note: JPEG transformations are normally lossless.\n" -#~ "When viewing images, you can use the [ and ] shortcut\n" -#~ "keys to rotate and save losslessly, bypassing this dialog." -#~ msgstr "" -#~ "Pastaba: paprastai JPEG transformacijos yra " -#~ "nekenksmingos.\n" -#~ "Žiūrėdami paveikslėlius norėdami pasukti paveikslėlį neatveriant šio " -#~ "lango\n" -#~ "galite naudoti sparčiuosius klavišus [ ir ]." - -#~ msgid "" -#~ "Special characters: # (new enumerator digit),\n" -#~ "%f (original filename), %e (original extension),\n" -#~ "%d (image date), %s (image size), \n" -#~ "%n (original enumerator)." -#~ msgstr "" -#~ "Specialūs simboliai: # (skaičiuoklis),\n" -#~ "%f (originalus failo pavadinimas), %e (originalus plėtinys),\n" -#~ "%d (paveikslėlio data), %s (paveikslėlio dydis),\n" -#~ "%n (originalus enumeratorius)." - -#~ msgid "A_djust timezone:" -#~ msgstr "P_akeisti laiko juostą:" - -#~ msgid "Add New Script" -#~ msgstr "Pridėti naują scenarijų" - -#~ msgid "Apply physical _transform" -#~ msgstr "Pritaikyti fizinę _transformaciją" - -#~ msgid "Apply to all _images" -#~ msgstr "Pritaikyti visiems _paveikslėliams" - -#~ msgid "C_urrent date" -#~ msgstr "Da_bartinė data" - -#~ msgid "Check _All" -#~ msgstr "Patikrinti _visus" - -#~ msgid "Check _None" -#~ msgstr "Netikrinti _nieko" - -#~ msgid "Checking image:" -#~ msgstr "Tikrinamas paveikslėlis:" - -#~ msgid "" -#~ "Click OK to reset the Exif orientation tag for the selected images to Top-" -#~ "Left." -#~ msgstr "" -#~ "Norėdami atstatyti pasirinktų paveikslėlių Exif orientacijos žymę į " -#~ "Viršus-Kairė, spragtelėkite „Gerai“" - -#~ msgid "" -#~ "Click inside the name or script fields to edit them.\n" -#~ "\n" -#~ "Special characters:\n" -#~ "%F = all selected filenames on one line, space delimited\n" -#~ "%f = a single filename, including path\n" -#~ "%b = a single filename, excluding path\n" -#~ "%n = a single filename, including path, with no extension\n" -#~ "%m = a single filename, excluding path, with no extension\n" -#~ "%e = a single extension (starting with a period)\n" -#~ "%p = the parent folder of the single file\n" -#~ "[text] = a user prompt, refreshed for each iteration\n" -#~ "[TEXT] = a user prompt, used for all iterations\n" -#~ "{..code..} = a strftime date format code\n" -#~ "{TEXT} = a user prompt used for all iterations matching previous date\n" -#~ "Scripts with the %F code will be executed just once, regardless of the " -#~ "number of files selected. All other scripts will be executed once per " -#~ "selected file.\n" -#~ "The default scripts are explained in the Help file." -#~ msgstr "" -#~ "Norėdami pakeisti pavadinimą ar kitus laukus, spustelėkite juos.\n" -#~ "\n" -#~ "Specialieji simboliai:\n" -#~ "%F = visi pažymėtų failų pavadinimai, atskirti tarpais\n" -#~ "%f = vienas failo pavadinimas, su keliu\n" -#~ "%b = vienas failo pavadinimas, be kelio\n" -#~ "%n = vienas failo pavadinimas, su keliu, be plėtinio\n" -#~ "%m = vienas failo pavadinimas, be kelio, be plėtinio\n" -#~ "%e = plėtinys (prasidedantis tašku)\n" -#~ "%p = failo tėvinis aplankas\n" -#~ "[tekstas] = užklausimas naudotojui, kiekvienai iteracijai atskirai\n" -#~ "[TEKSTAS] = užklausimas naudotojui, visoms iteracijoms kartu\n" -#~ "{..kodas..} = strftime datos formato kodas\n" -#~ "{TEKSTAS} = naudotojo užklausa visoms iteracijoms, atitinkančioms " -#~ "ankstesnes datas\n" -#~ "Scenarijai su %F codu bus įvykdyti vieną kartą, nesvarbu, kiek failų " -#~ "pažymėta. Visi kiti scenarijai bus vykdomi po vieną kartą kiekvienam " -#~ "pažymėtam failui.\n" -#~ "Numatytieji scenarijai paaiškinti Žinyne." - -#~ msgid "Date p_hoto taken (from EXIF metadata)" -#~ msgstr "Nuotraukos _data (Iš EXIF duomenų)" - -#~ msgid "Define External Scripts" -#~ msgstr "Apibrėžti išorinius scenarijus" - -#~ msgid "" -#~ "Do not change\n" -#~ "Convert to lower-case\n" -#~ "Convert to upper-case" -#~ msgstr "" -#~ "Nekeisti\n" -#~ "Keisti į mažąsias raides\n" -#~ "Keisti į didžiąsias raides" - -#~ msgid "Equal images:" -#~ msgstr "Vienodi paveikslėliai:" - -#~ msgid "Exif DateTime tag" -#~ msgstr "Exif DateTime žymė" - -#~ msgid "Exif DateTimeDigitized tag" -#~ msgstr "Exif DateTimeDigitized žymė" - -#~ msgid "Found duplicates:" -#~ msgstr "Rasti dublikatai:" - -#~ msgid "Mirror image horizontally (left-right)" -#~ msgstr "Atspindėti paveikslėlį horizontaliai (kairė-dešinė)" - -#~ msgid "Mirror image vertically (top-bottom)" -#~ msgstr "Atspindėti paveikslėlį vertikaliai (viršus-apačia)" - -#~ msgid "New names _preview:" -#~ msgstr "Naujų pavadinimų _peržiūra:" - -#~ msgid "Remove Script" -#~ msgstr "Pašalinti scenarijų" - -#~ msgid "Reset Exif Orientation Tags" -#~ msgstr "Atstatyti Exif orientacijos žymes" - -#~ msgid "Rotate Images" -#~ msgstr "Pasukti paveikslėlius" - -#~ msgid "Rotate image 90 degrees clockwise" -#~ msgstr "Pasukti paveikslėlį 90 laipsnių pagal laikrodžio rodyklę" - -#~ msgid "Rotate image 90 degrees counter-clockwise" -#~ msgstr "Pasukti paveikslėlį 90 laipsnių prieš laikrodžio rodyklę" - -#~ msgid "Search for Duplicates" -#~ msgstr "Ieškoti dublikatų" - -#~ msgid "Search terminated, no duplicates found." -#~ msgstr "Paieška nutraukta, dublikatų nerasta." - -#~ msgid "" -#~ "The number keys on the numeric keypad can be associated with scripts 0-" -#~ "9.\n" -#~ "All scripts can be launched from the Scripts menu." -#~ msgstr "" -#~ "Skaičių klavišai skaičių dalyje gali būti susieti su scenarijais 0-9.\n" -#~ "Visi scenarijai gali būti paleisti iš Scenarijų meniu." - -#~ msgid "" -#~ "This checkbox governs the rotation method used for JPEG images that " -#~ "contain Exif orientation tags. If this checkbox is enabled, the rotation " -#~ "will be performed using a physical transform, and the Exif orientation " -#~ "tag will be reset to the default \"top left\" value. If it is not " -#~ "enabled, the rotation will be performed by changing the Exif orientation " -#~ "tag only. For maximum compatibility with other applications, this " -#~ "checkbox should be enabled." -#~ msgstr "" -#~ "Šiu žymimuoju langeliu valdomas JPEG paveikslėlių, kuriuose yra Exif " -#~ "orientacijos žymės, pasukimo metodas. Jei šis langelis užžymėtas, bus " -#~ "pasukta naudojant fizinę transformaciją, ir Exif orientacijos žymė bus " -#~ "atstatyta į numatytąją reikšmę „viršus kairė“. Jeigu jis neužžymėtas, bus " -#~ "pasukta tik pakeičiant Exif orientacijos žymę. Dėl suderinamumo su " -#~ "kitomis programomis šis langelis turėtų būti užžymėtas." - -#~ msgid "User-Defined Script Parameter" -#~ msgstr "Naudotojo nurodytas scenarijaus parametras" - -#~ msgid "Your script requires this user-defined parameter:" -#~ msgstr "Scenarijui reikia šio naudotojo nurodomo parametro:" - -#~ msgid "prompt" -#~ msgstr "klaustiApkirpti" - -#~ msgid "title|Scale Images" -#~ msgstr "Paveikslėlio dydžio keitimas" - -#~ msgid "1024 x 1024" -#~ msgstr "1024 x 1024" - -#~ msgid "1024 x 768" -#~ msgstr "1024 x 768" - -#~ msgid "1280 x 1280" -#~ msgstr "1280 x 1280" - -#~ msgid "1280 x 960" -#~ msgstr "1280 x 960" - -#~ msgid "320 x 200" -#~ msgstr "320 x 200" - -#~ msgid "320 x 320" -#~ msgstr "320 x 320" - -#~ msgid "640 x 640" -#~ msgstr "640 x 640" - -#~ msgid "800 x 600" -#~ msgstr "800 x 600" - -#~ msgid "800 x 800" -#~ msgstr "800 x 800" - -#~ msgid "Album Style" -#~ msgstr "Albumo stilius" - -#~ msgid "Basic Information" -#~ msgstr "Pagrindinė informacija" - -#~ msgid "Camera Data" -#~ msgstr "Fotoaparato duomenys" - -#~ msgid "Comments" -#~ msgstr "Komentarai" - -#~ msgid "Index Page Layout" -#~ msgstr "Rodyklės puslapio išdėstymas" - -#~ msgid "Theme" -#~ msgstr "Tema" - -#~ msgid "Note: %d (current date)." -#~ msgstr "Pastaba: %d (dabartinė data)." - -#~ msgid "" -#~ "Note: Some themes may auto-adjust the\n" -#~ "number of rows and columns, but keep the total \n" -#~ "number of images per page constant." -#~ msgstr "" -#~ "Pastaba: Kai kurios temos gali\n" -#~ "automatiškai parinkti eilučių ir stulpelių skaičių,\n" -#~ "tačiau gali palikti paveikslėlių skaičių puslapyje\n" -#~ "nekintantį." - -#~ msgid "Came_ra Model" -#~ msgstr "Fotoapa_rato modelis" - -#~ msgid "Da_te and Time" -#~ msgstr "Da_ta ir laikas" - -#~ msgid "Exposure _time" -#~ msgstr "_Išlaikymas" - -#~ msgid "Focal _length" -#~ msgstr "Židinio nuoto_lis" - -#~ msgid "I_mage Caption..." -#~ msgstr "P_aveikslėlio antraštė..." - -#~ msgid "Web Album Theme" -#~ msgstr "Web albumo tema" - -#~ msgid "_Aperture value" -#~ msgstr "_Diafragmos vertė" - -#~ msgid "_Date and Time" -#~ msgstr "_Data ir laikas" - -#~ msgid "_Flash" -#~ msgstr "_Blykstė" - -#~ msgid "_Go to Theme Folder" -#~ msgstr "_Eiti į temos aplanką" - -#~ msgid "_Install Theme..." -#~ msgstr "Įd_iegti temą..." - -#~ msgid "_Place" -#~ msgstr "_Vieta" - -#~ msgid "_Shutter speed" -#~ msgstr "_Išlaikymas" - -#~ msgid "_Size :" -#~ msgstr "_Dydis:" - -#~ msgid "columns, by" -#~ msgstr "stulpeliai, pagal" - -#~ msgid "or _use a single index page" -#~ msgstr "arba na_udoti vieną rodyklės puslapį" - -#~ msgid "rows per page," -#~ msgstr "eilučių puslapyje," - -#~ msgid "" -#~ "Possible values are 0 (portrait), 1 (landscape), 2 (reverse portrait), 3 " -#~ "(reverse landscape)" -#~ msgstr "" -#~ "Galimos vertės yra 0 (statmenas), 1 (gulsčias), 2 (atvirkščias " -#~ "statmenas), 3 (atvirkščias gulsčias)" - -#~ msgid "Possible values are: 1, 2, 3, 4." -#~ msgstr "Galimos vertės yra: 1, 2, 3, 4." - -#~ msgid "Possible values are: 72, 150, 300, 600." -#~ msgstr "Galimos vertės yra: 72, 150, 300, 600." - -#~ msgid "Possible values are: ascending, descending." -#~ msgstr "Galimos vertės yra: ascending, descending." - -#~ msgid "Possible values are: forward, backward, random." -#~ msgstr "Galimos vertės yra: forward, backward, random." - -#~ msgid "Possible values are: image, data, comment." -#~ msgstr "Galimos vertės yra: image, data, comment." - -#~ msgid "Possible values are: jpeg, png, tga, tiff." -#~ msgstr "Galimos vertės yra: jpeg, png, tga, tiff." - -#~ msgid "Possible values are: manual, auto." -#~ msgstr "Galimos vertės yra: manual, auto." - -#~ msgid "Possible values are: nautilus, single, double." -#~ msgstr "Galimos vertės yra: nautilus, single, double." - -#~ msgid "Possible values are: none, day, month, now, custom" -#~ msgstr "Galimos vertės yra: none, day, month, now, custom" - -#~ msgid "" -#~ "Possible values are: none, name, path, size, time, exifdate, comment." -#~ msgstr "" -#~ "Galimos vertės yra: none, name, path, size, time, exifdate, comment." - -#~ msgid "" -#~ "Possible values are: none, simple, simple_with_shadow, shadow, slide, " -#~ "shadow_in, shadow_out." -#~ msgstr "" -#~ "Galimos vertės yra: none, simple, simple_with_shadow, shadow, slide," -#~ "shadow_in, shadow_out." - -#~ msgid "" -#~ "Possible values are: none, square, image, display, 4x3, 4x6, 5x7, 8x10, " -#~ "custom." -#~ msgstr "" -#~ "Galimos vertės yra: none, square, image, display, 4x3, 4x6, 5x7, 8x10, " -#~ "custom." - -#~ msgid "Possible values are: png, jpeg." -#~ msgstr "Galimos vertės yra: png, jpeg." - -#~ msgid "Possible values are: skip, rename, ask, overwrite." -#~ msgstr "Galimos vertės yra: skip, rename, ask, overwrite." - -#~ msgid "Cannot open catalog \"%s\": %s" -#~ msgstr "Negalima atverti katalogo „%s“: %s" - -#~ msgid "Cannot save catalog \"%s\": %s" -#~ msgstr "Negalima įrašyti katalogo „%s“: %s" - -#~ msgid "%d %B %Y, %H:%M" -#~ msgstr "%Y-%B-%d, %H:%M" - -#~ msgid "Image type:" -#~ msgstr "Paveikslėlio tipas:" - -#~ msgid "Home" -#~ msgstr "Namai" - -#~ msgid "Library not empty" -#~ msgstr "Biblioteka netuščia" - -#~ msgid "Cannot remove library \"%s\": %s" -#~ msgstr "Nepavyko pašalinti bibliotekos „%s“: %s" - -#~ msgid "Cannot remove catalog \"%s\": %s" -#~ msgstr "Nepavyko pašalinti katalogo „%s“: %s" - -#~ msgid "No image" -#~ msgstr "Nėra paveikslėlio" - -#~ msgid "Ro_tate Images" -#~ msgstr "Pasuk_ti paveikslėlius" - -#~ msgid "Loading image: %s" -#~ msgstr "Įkeliamas paveikslėlis: %s" - -#~ msgid "(Invalid Name)" -#~ msgstr "(Netinkamas pavadinimas)" - -#~ msgid "%d x %d pixels" -#~ msgstr "%d x %d pikselių" - -#~ msgid "Creating image: %s.%s" -#~ msgstr "Kuriamas paveikslėlis: %s.%s" - -#~ msgid "Move Catalog to..." -#~ msgstr "Perkelti katalogą į..." - -#~ msgid "Enter the new category name" -#~ msgstr "Įveskite naujos kategorijos pavadinimą" - -#~ msgid "" -#~ "The name \"%s\" is not valid because it contains the character \",\". " -#~ "Please use a different name." -#~ msgstr "" -#~ "Vardas „%s“ yra netinkamas, nes jame yra simbolis „,“. Prašom naudoti " -#~ "kitą vardą." - -#~ msgid "The category \"%s\" is already present. Please use a different name." -#~ msgstr "Kategorija „%s“ jau sukurta. Pasirinkite kitą pavadinimą." - -#~ msgid "" -#~ "An image named \"%s\" is already present. Please specify a different name." -#~ msgstr "Paveikslėlis pavadinimu „%s“ jau yra. Nurodykite kitą pavadinimą." - -#~ msgid "" -#~ "An image named \"%s\" is already present. Do you want to overwrite it?" -#~ msgstr "Paveikslėlis pavadinimu „%s“ jau yra. Ar norite jį perrašyti?" - -#~ msgid "Duplicates" -#~ msgstr "Dublikatai" - -#~ msgid "Duplicates Size" -#~ msgstr "Dublikatų dydis" - -#~ msgid "Checked images will be moved to the Trash, are you sure?" -#~ msgstr "Pažymėti paveikslėliai bus perkelti į šiukšlinę? Tęsti?" - -#~ msgid "The destination folder does not exist. Do you want to create it?" -#~ msgstr "Paskirties aplankas neegzistuoja. Ar norite jį sukurti?" - -#~ msgid "Could not create folder \"%s\": %s." -#~ msgstr "Nepavyko sukurti aplanko „%s“: %s." - -#~ msgid "" -#~ "You don't have the right permissions to create images in the folder \"%s\"" -#~ msgstr "Neturite reikiamo leidimo kurti paveikslėliams aplanke „%s“" - -#~ msgid "_Do not display this message again" -#~ msgstr "_Daugiau nerodyti šios žinutės" - -#~ msgid "_Move" -#~ msgstr "_Perkelti" - -#~ msgid "%d %b %Y, %H:%M" -#~ msgstr "%Y %b %d, %H:%M" - -#~ msgid "You didn't enter the new name" -#~ msgstr "Neįvedėte naujo vardo" - -#~ msgid "" -#~ "The name \"%s\" is already used in this folder. Please use a different " -#~ "name." -#~ msgstr "" -#~ "Vardas „%s“ jau yra panaudotas šiame aplanke. Prašom pasirinkti kitą " -#~ "vardą." - -#~ msgid "Could not rename the following images:" -#~ msgstr "Nepavyko pervadinti šių paveikslėlių:" - -#~ msgid "_Abort" -#~ msgstr "_Nutraukti" - -#~ msgid "Collecting images info" -#~ msgstr "Renkama paveikslėlio informacija" - -#~ msgid "Copying file %ld of %ld" -#~ msgstr "Kopijuojamas failas %ld iš %ld" - -#~ msgid "" -#~ "Could not move temporary file to remote location. Check remote " -#~ "permissions." -#~ msgstr "" -#~ "Nepavyko perkelti laikino failo į nutolusią vietą. Patikrinkite " -#~ "nutolusios vietos teises." - -#~ msgid "Import errors detected" -#~ msgstr "Nustatyta importavimo klaidų" - -#~ msgid "The files on the camera will not be deleted" -#~ msgstr "Failai iš fotoaparato ištrinti nebus" - -#~ msgid "Transferring '%s' to its destination folder." -#~ msgstr "Perkeliamas „%s“ į paskirties aplanką." - -#~ msgid "Adjusting orientation of '%s'." -#~ msgstr "Keičiama „%s“ orientacija." - -#~ msgid "Not enough free space left on disk" -#~ msgstr "Diske neliko laisvos vietos" - -#~ msgid "Put name or format code here" -#~ msgstr "Įrašykite vardą ar formato kodą čia" - -#~ msgid "No grouping" -#~ msgstr "Be grupavimo" - -#~ msgid "By month photo taken" -#~ msgstr "Pagal fotografavimo mėnesį" - -#~ msgid "Header" -#~ msgstr "Antraštė" - -#~ msgid "by path" -#~ msgstr "pagal kelią" - -#~ msgid "by size" -#~ msgstr "pagal dydį" - -#~ msgid "by Exif DateTime tag" -#~ msgstr "pagal Exif DateTime žymę" - -#~ msgid "by comment" -#~ msgstr "pagal komentarą" - -#~ msgid "" -#~ "The name \"%s\" is not valid because it contains the character \"/\". " -#~ "Please use a different name." -#~ msgstr "" -#~ "Pavadinimas „%s“ yra netinkamas, nes jame yra simbolis „/“. Naudokite " -#~ "kitą pavadinimą." - -#~ msgid "Edit with GIMP" -#~ msgstr "Keisti su GIMP" - -#~ msgid "Add copyright" -#~ msgstr "Pridėti autorines teises" - -#~ msgid "Copy to \"approved\" folder" -#~ msgstr "Perkelti į „patvirtinta“ aplanką" - -#~ msgid "Send by email" -#~ msgstr "Siųsti el. paštu" - -#~ msgid "Make a zip file" -#~ msgstr "Sukurti zip failą" - -#~ msgid "Make a zip file and email it" -#~ msgstr "Sukurti zip failą ir išsiųsti el. paštu" - -#~ msgid "Script Progress" -#~ msgstr "Scenarijaus progresas" - -#~ msgid "Scripts using the %%F code can not be cancelled. Sorry!" -#~ msgstr "" -#~ "Scenarijai, naudojantys %%F kodą, negali būti nutraukti. Atsiprašome!" - -#~ msgid "Script %d" -#~ msgstr "%d scenarijus" - -#~ msgid "" -#~ "The \"Postr\" software package must be installed to use this function." -#~ msgstr "" -#~ "Kad būtų galima naudoti šią funkciją, turi būti įdiegtas „Postr“ paketas." - -#~ msgid "Number" -#~ msgstr "Skaičius" - -#~ msgid "Short Name" -#~ msgstr "Trumpas pavadinimas" - -#~ msgid "Select Album Theme" -#~ msgstr "Pasirinkite albumo temą" - -#~ msgid "The image will be moved to the Trash, are you sure?" -#~ msgstr "Paveikslėlis bus perkeltas į šiukšlinę. Tęsti?" - -#~ msgid "The selected images will be moved to the Trash, are you sure?" -#~ msgstr "Pasirinkti paveikslėliai bus perkelti į šiukšlinę. Tęsti?" - -#~ msgid "Enter the new name: " -#~ msgstr "Įveskite naują pavadinimą: " - -#~ msgid "The name \"%s\" is already used. Please use a different name." -#~ msgstr "Pavadinimas „%s“ jau naudojamas. Pasirinkite kitą pavadinimą." - -#~ msgid "Could not rename the library \"%s\": %s" -#~ msgstr "Nepavyko pervadinti bibliotekos „%s“: %s" - -#~ msgid "The selected library will be removed, are you sure?" -#~ msgstr "Pasirinkta biblioteka bus pašalinta. Tęsti?" - -#~ msgid "The selected catalog will be removed, are you sure?" -#~ msgstr "Pasirinktas katalogas bus pašalintas. Tęsti?" - -#~ msgid "New Library" -#~ msgstr "Nauja biblioteka" - -#~ msgid "Could not rename the folder \"%s\": %s" -#~ msgstr "Nepavyko pervadinti aplanko „%s“: %s" - -#~ msgid "source and destination are the same" -#~ msgstr "šaltinio ir paskirties vietos yra tos pačios" - -#~ msgid "" -#~ "\"%s\" cannot be moved to the Trash. Do you want to delete it permanently?" -#~ msgstr "" -#~ "„%s“ negali būti perkelta į šiukšlinę. Ar noritę ją ištrinti visam laikui?" - -#~ msgid "The selected folder will be moved to the Trash, are you sure?" -#~ msgstr "Pažymėtas aplankas bus perkeltas į šiukšlinę. Tęsti?" - -#~ msgid "source contains destination" -#~ msgstr "šaltinyje yra paskirties vieta" - -#~ msgid "a folder with that name is already present." -#~ msgstr "jau yra aplankas tokiu pavadinimu." - -#~ msgid "Open Location" -#~ msgstr "Atverti vietą" - -#~ msgid "_Folder" -#~ msgstr "Apla_nkas" - -#~ msgid "Show/_Hide" -#~ msgstr "Rod_yti/Slėpti" - -#~ msgid "S_ort Images" -#~ msgstr "Rūšiu_oti paveikslėlius" - -#~ msgid "_Zoom" -#~ msgstr "_Mastelis" - -#~ msgid "_Image" -#~ msgstr "_Paveikslėlis" - -#~ msgid "Set Image as _Wallpaper" -#~ msgstr "Padaryti paveikslėlį dar_balaukio fonu" - -#~ msgid "Scri_pts" -#~ msgstr "_Scenarijai" - -#~ msgid "Create a new window" -#~ msgstr "Sukurti naują langą" - -#~ msgid "Open the selected image in a new window" -#~ msgstr "Atverti pasirinktą paveikslėlį naujame lange" - -#~ msgid "_Import Photos..." -#~ msgstr "_Importuoti fotografijas..." - -#~ msgid "_Write To CD..." -#~ msgstr "_Rašyti į CD..." - -#~ msgid "Write selection to CD" -#~ msgstr "Rašyti pažymėtus į CD" - -#~ msgid "_Rename..." -#~ msgstr "Per_vadinti..." - -#~ msgid "Move this image to the Trash" -#~ msgstr "Perkelti šį paveikslėlį į šiukšlinę" - -#~ msgid "Copy this image to another location" -#~ msgstr "Kopijuoti šį paveikslėlį į kitą vietą" - -#~ msgid "_Move..." -#~ msgstr "Perke_lti..." - -#~ msgid "Move this image to another location" -#~ msgstr "Perkelti šį paveikslėlį į kitą vietą" - -#~ msgid "Copy selected images to another location" -#~ msgstr "Kopijuoti pasirinktus paveikslėlius į kitą vietą" - -#~ msgid "Move selected images to another location" -#~ msgstr "Perkelti pasirinktus paveikslėlius į kitą vietą" - -#~ msgid "Select all images" -#~ msgstr "Pasirinkti visus paveikslėlius" - -#~ msgid "Open the selected catalog" -#~ msgstr "Atverti pasirinktą katalogą" - -#~ msgid "Open the selected catalog in a new window" -#~ msgstr "Atverti pasirinktą katalogą naujame lange" - -#~ msgid "Rename selected catalog" -#~ msgstr "Pervadinti esamą katalogą" - -#~ msgid "Rem_ove" -#~ msgstr "Pašali_nti" - -#~ msgid "Remove selected catalog" -#~ msgstr "Pašalinti pasirinktą katalogą" - -#~ msgid "Move selected catalog to another location" -#~ msgstr "Perkelti pasirinktą katalogą į kitą vietą" - -#~ msgid "_Edit Search..." -#~ msgstr "K_eisti paiešką..." - -#~ msgid "Modify search criteria" -#~ msgstr "Keisti paieškos kriterijus" - -#~ msgid "Redo _Search" -#~ msgstr "Pakartoti _paiešką" - -#~ msgid "_New Catalog..." -#~ msgstr "_Naujas katalogas..." - -#~ msgid "New _Library..." -#~ msgstr "Nauja _biblioteka..." - -#~ msgid "Create a new catalog library" -#~ msgstr "Sukurti naują katalogų biblioteką" - -#~ msgid "Rename current catalog" -#~ msgstr "Pašalinti esamą katalogą" - -#~ msgid "Remove current catalog" -#~ msgstr "Pašalinti esamą katalogą" - -#~ msgid "Move current catalog to another location" -#~ msgstr "Perkelti esamą katalogą į kitą vietą" - -#~ msgid "Open the selected folder in a new window" -#~ msgstr "Atverti pasirinktą aplanką naujame lange" - -#~ msgid "Open the selected folder with the Nautilus file manager" -#~ msgstr "Atverti pasirinktą aplanką su Nautilus failų tvarkykle" - -#~ msgid "Rename selected folder" -#~ msgstr "Pervadinti pasirinktą aplanką" - -#~ msgid "Move the selected folder to the Trash" -#~ msgstr "Perkelti pasirinktą aplanką į šiukšlinę" - -#~ msgid "Copy selected folder" -#~ msgstr "Kopijuoti pasirinktą aplanką" - -#~ msgid "Move selected folder" -#~ msgstr "Perkelti pažymėtą aplanką" - -#~ msgid "Ca_tegories..." -#~ msgstr "Kate_gorijos..." - -#~ msgid "Open current folder with the Nautilus file manager" -#~ msgstr "Atverti esamą aplanką su Nautilus failų tvarkykle" - -#~ msgid "Rename current folder" -#~ msgstr "Pervadinti esamą aplanką" - -#~ msgid "Move the current folder to the Trash" -#~ msgstr "Perkelti esamą aplanką į šiukšlinę" - -#~ msgid "Copy current folder" -#~ msgstr "Kopijuoti esamą aplanką" - -#~ msgid "Assign categories to the current folder" -#~ msgstr "Priskirti kategorijas esamam aplankui" - -#~ msgid "_New Folder..." -#~ msgstr "_Naujas aplankas..." - -#~ msgid "_Reload" -#~ msgstr "Pe_rkrauti" - -#~ msgid "Go to the home folder" -#~ msgstr "Eiti į namų aplanką" - -#~ msgid "_Go to the Image Folder" -#~ msgstr "_Eiti į paveikslėlio aplanką" - -#~ msgid "Specify a location to visit" -#~ msgstr "Nurodykite norimą aplankyti vietą" - -#~ msgid "Create _Index Image..." -#~ msgstr "Sukurti rod_yklinį paveikslėlį..." - -#~ msgid "Search for _Duplicates..." -#~ msgstr "Ieškoti _dublikatų..." - -#~ msgid "Scale Images..." -#~ msgstr "Keisti paveikslėlių dydį..." - -#~ msgid "Scale Images" -#~ msgstr "Keisti paveikslėlių dydį" - -#~ msgid "Edit external scripts" -#~ msgstr "Keisti išorinius scenarijus" - -#~ msgid "_Image Preview" -#~ msgstr "_Paveikslėlio peržiūra" - -#~ msgid "_Reversed Order" -#~ msgstr "_atvirkštine tvarka" - -#~ msgid "Reverse images order" -#~ msgstr "Atvirkštinė paveikslėlių tvarka" - -#~ msgid "by _Name" -#~ msgstr "pagal _pavadinimą" - -#~ msgid "Sort images by name" -#~ msgstr "Rikiuoti paveikslėlius pagal pavadinimą" - -#~ msgid "by _Path" -#~ msgstr "pagal _kelią" - -#~ msgid "Sort images by path" -#~ msgstr "Rikiuoti paveikslėlius pagal kelią" - -#~ msgid "by _Size" -#~ msgstr "pagal _dydį" - -#~ msgid "Sort images by file modification time" -#~ msgstr "Rikiuoti paveikslėlius pagal pakeitimo laiką" - -#~ msgid "by _Exif Time" -#~ msgstr "pagal _Exif laiką" - -#~ msgid "Sort images by Exif DateTime tag" -#~ msgstr "Rikiuoti paveikslėlius pagal Exif DateTime žymę" - -#~ msgid "by _Comment" -#~ msgstr "pagal _komentarą" - -#~ msgid "Sort images by comment" -#~ msgstr "Rikiuoti paveikslėlius pagal komentarą" - -#~ msgid "_Manual Order" -#~ msgstr "_Kita tvarka" - -#~ msgid "Sort images manually" -#~ msgstr "Rikiuoti paveikslėlius rankiniu būdu" - -#~ msgid "View As Sli_des" -#~ msgstr "Žiūrėti kaip s_kaidres" - -#~ msgid "View As Slides" -#~ msgstr "Žiūrėti kaip skaidres" - -#~ msgid "View As _List" -#~ msgstr "Žiūrėti kaip są_rašą" - -#~ msgid "View As List" -#~ msgstr "Žiūrėti kaip sąrašą" - -#~ msgid "_Folders" -#~ msgstr "_Aplankai" - -#~ msgid "_Catalogs" -#~ msgstr "_Katalogai" - -#~ msgid "View the catalogs" -#~ msgstr "Žiūrėti katalogus" - -#~ msgid "[Press 'c' to add a comment]" -#~ msgstr "[Norėdami pridėti komentarą, spauskite „c“]" - -#~ msgid "1 image (%s)" -#~ msgstr "1 paveikslėlis (%s)" - -#~ msgid "%d selected (%s)" -#~ msgstr "%d pasirinkta (%s)" - -#~ msgid "The current image has been modified, do you want to save it?" -#~ msgstr "Šis paveikslėlis buvo pakeistas. Ar norite jį įrašyti?" - -#~ msgid "Dragged Images" -#~ msgstr "Nutempti paveikslėliai" - -#~ msgid "Cannot load folder \"%s\": %s\n" -#~ msgstr "Nepavyko įkelti aplanko „%s“: %s\n" - -#~ msgid "The specified catalog does not exist." -#~ msgstr "Nurodytas katalogas neegzistuoja." - -#~ msgid "Wait please..." -#~ msgstr "Palaukite..." - -#~ msgid "Filesystem" -#~ msgstr "Failų sistema" - -#~ msgid "XMP Sidecar" -#~ msgstr "XMP Sidecar" - -#~ msgid "Path" -#~ msgstr "Kelias" - -#~ msgid "KB" -#~ msgstr "KB" - -#~ msgid "Category" -#~ msgstr "Kategorija" - -#~ msgid "Text contains" -#~ msgstr "Tekste yra" - -#~ msgid "_Folder" -#~ msgstr "_Aplankas" - -#~ msgid "_Browse..." -#~ msgstr "_Naršyti..." - -#~ msgid "_Go to the destination folder" -#~ msgstr "_Eiti į paskirties aplanką" - -#~ msgid "_Recent folders:" -#~ msgstr "_Paskutinieji aplankai:" - -#~ msgid "_Single Window" -#~ msgstr "_Vienas langas" - -#~ msgid "_None" -#~ msgstr "_Nėra" - -#~ msgid "Open selected images with an application" -#~ msgstr "Atverti pasirinktus paveikslėlius su programa" - -#~ msgid "_Transform" -#~ msgstr "_Transformuoti" - -#~ msgid "_Open With..." -#~ msgstr "_Atverti su..." - -#~ msgid "Revert to saved image" -#~ msgstr "Atkurti įrašytą paveikslėlį" - -#~ msgid "Print..." -#~ msgstr "Spausdinti..." - -#~ msgid "Print the current image" -#~ msgstr "Spausdinti esamą paveikslėlį" - -#~ msgid "Open this image with an application" -#~ msgstr "Atverti šį paveikslėlį su programa" - -#~ msgid "Comm_ent..." -#~ msgstr "Kom_entaras..." - -#~ msgid "Add a comment to selected images" -#~ msgstr "Pasirinktiems paveikslėliams pridėti komentarą" - -#~ msgid "Rem_ove Comment" -#~ msgstr "Pašali_nti komentarą" - -#~ msgid "Remove comments of selected images" -#~ msgstr "Pašalinti pasirinktų paveikslėlių komentarus" - -#~ msgid "Assign categories to selected images" -#~ msgstr "Pasirinktiems paveikslėliams priskirti kategorijas" - -#~ msgid "Ca_tegories" -#~ msgstr "Kate_gorijos" - -#~ msgid "View the image rotated clockwise" -#~ msgstr "Žiūrėti paveikslėlį pasuktą pagal laikrodžio rodyklę" - -#~ msgid "View the image rotated counter-clockwise" -#~ msgstr "Žiūrėti paveikslėlį pasuktą prieš laikrodžio rodyklę" - -#~ msgid "View the image flipped" -#~ msgstr "Žiūrėti apverstą paveikslėlį" - -#~ msgid "View the image mirrored" -#~ msgstr "Žiūrėti atspindėtą paveikslėlį" - -#~ msgid "View the image in black and white" -#~ msgstr "Žiūrėti paveikslėlį juodai baltą" - -#~ msgid "View the image with negative colors" -#~ msgstr "Rodyti paveikslėlį su negatyvo spalvomis" - -#~ msgid "_Enhance" -#~ msgstr "Pag_erinti" - -#~ msgid "Automatically adjust the color levels" -#~ msgstr "Automatiškai suderinti spalvų lygius" - -#~ msgid "Reduce the number of colors" -#~ msgstr "Sumažinti spalvų skaičių" - -#~ msgid "_Brightness-Contrast..." -#~ msgstr "_Ryškumas - kontrastas..." - -#~ msgid "Adjust brightness and contrast" -#~ msgstr "Derinti ryškumą ir kontrastą" - -#~ msgid "_Hue-Saturation..." -#~ msgstr "_Atspalvis - sodrumas..." - -#~ msgid "Adjust hue and saturation" -#~ msgstr "Derinti atspalvį ir sotį" - -#~ msgid "Redeye Removal Tool" -#~ msgstr "Raudonų akių šalinimo įrankis" - -#~ msgid "_Color Balance..." -#~ msgstr "_Spalvų balansas..." - -#~ msgid "Adjust color balance" -#~ msgstr "Derinti spalvų balansą" - -#~ msgid "Crop image" -#~ msgstr "Apkirpti paveikslėlį" - -#~ msgid "Black and White" -#~ msgstr "Juoda ir balta" - -#~ msgid "Web Palette" -#~ msgstr "Web paletė" - -#~ msgid "Step A_nimation" -#~ msgstr "Žengti a_nimacijoje" - -#~ msgid "View next animation frame" -#~ msgstr "Žiūrėti kitą animacijos kadrą" - -#~ msgid "Set the image as desktop background (centered)" -#~ msgstr "Padaryti paveikslėlį darbalaukio fonu (centruotas)" - -#~ msgid "_Scaled" -#~ msgstr "_Mastelis" - -#~ msgid "Set the image as desktop background (scaled keeping aspect ratio)" -#~ msgstr "" -#~ "Padaryti paveikslėlį darbalaukio fonu (ištemptas išlaikant proporcijas)" - -#~ msgid "Str_etched" -#~ msgstr "Išt_emptas" - -#~ msgid "Set the image as desktop background (stretched)" -#~ msgstr "Padaryti paveikslėlį darbalaukio fonu (ištemptas)" - -#~ msgid "Restore the original desktop wallpaper" -#~ msgstr "Atstatyti originalų darbalaukio fono paveikslėlį" - -#~ msgid "Reset Exif orientation to top-left" -#~ msgstr "Atstatyti Exif orientaciją į viršus-kairė" - -#~ msgid "Play _Animation" -#~ msgstr "Rodyti _animaciją" - -#~ msgid "Start or stop current animation" -#~ msgstr "Paleisti arba stabdyti esamą animaciją" - -#~ msgid "Use the viewer mode to view single images" -#~ msgstr "Naudoti rodymo veikseną pavieniams paveikslėliams" - -#~ msgid "Could not create a local temporary copy of the remote file." -#~ msgstr "Nepavyko sukurti laikinos vietinės nutolusio failo kopijos." - -#~ msgid "" -#~ "Could not move temporary file to local destination. Check folder " -#~ "permissions." -#~ msgstr "" -#~ "Nepavyko perkelti laikino failo į vietinę paskirties sritį. Patikrinkite " -#~ "aplanko teises." - -#~ msgid "Deleting all thumbnails, wait please..." -#~ msgstr "Trinamos visos miniatiūros, prašome palaukti..." - -#~ msgid "Deleting old thumbnails, wait please..." -#~ msgstr "Trinamos senos miniatiūros, prašome palaukti..." diff -Nru gthumb-2.14.3/po/nb.po gthumb-3.0.0/po/nb.po --- gthumb-2.14.3/po/nb.po 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/po/nb.po 2012-04-12 09:14:04.000000000 +0000 @@ -1,14 +1,14 @@ # Norwegian bokmål translation of gthumb. # Copyright (C) 2002-2004 Free Software Foundation, Inc. -# Kjartan Maraas , 2002-2011. +# Kjartan Maraas , 2002-2012. # # msgid "" msgstr "" "Project-Id-Version: gthumb 2.13.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-19 09:27+0200\n" -"PO-Revision-Date: 2011-09-19 09:53+0200\n" +"POT-Creation-Date: 2012-04-12 10:08+0200\n" +"PO-Revision-Date: 2012-04-12 10:24+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian/Bokmaal \n" "Language: \n" @@ -17,101 +17,109 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Filen er ikke en gyldig .desktop-fil" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "Starter %s" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "" -#: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "Bildeviser" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "Vis og organiser dine bilder" - #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:3 ../data/gthumb-import.desktop.in.in.h:3 -#: ../gthumb/gth-browser.c:523 ../gthumb/gth-main.c:229 -#: ../gthumb/gth-progress-dialog.c:443 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:530 +#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Bildeviser" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "gThumb bildeviser" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Vis og organiser dine bilder" + #: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "Importer bilder fra ditt kamera" +msgid "Import with gThumb" +msgstr "" #: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "Verktøy for import av bilder" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "" -#: ../data/gthumb.schemas.in.h:1 +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Importer bilder fra ditt kamera" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "" "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " "to generate thumbnails for all images." @@ -119,81 +127,69 @@ "Bilder med størrelse over denne verdien (i bytes) vil det ikke vises " "miniatyrer for. Bruk 0 hvis du vil generere miniatyrer for alle bilder." -#: ../data/gthumb.schemas.in.h:2 -msgid "" -"Possible values are: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." -msgstr "" -"Mulige verdier er: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." - -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "Mulige verdier er: high, low." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "Mulige verdier er: light, midtone, dark." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "Mulige verdier er: list, thumbnails." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "Mulige verdier er: small, medium, large." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +#, fuzzy +msgid "Whether to resize the window to fit the size of the image" +msgstr "Bruk dette vinduet om igjen for å vise andre bilder" -#: ../data/gthumb.schemas.in.h:7 -msgid "" -"Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "" -"Mulige verdier er: system, text_below, text_beside, text_only, icons_only." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Åpne filer i aktivt vindu" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "Mulige verdier er: white, black, checked, none." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +#, fuzzy +msgid "Whether to reset the scrollbars position after changing image" +msgstr "Bruk dette vinduet om igjen for å vise andre bilder" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to always use a black background." msgstr "Alltid bruk sort bakgrunn." -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Mulige verdier er: jpeg, jpg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Mulige verdier er: tiff, tif." + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" msgstr "" #: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "Utvid_elser:" + +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "Flere utvidelser …" -#: ../data/ui/extensions-preferences.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:3 msgid "Some extensions are configurable." msgstr "Noen utvidelser kan konfigureres." -#: ../data/ui/extensions-preferences.ui.h:3 -msgid "_Extensions:" -msgstr "Utvid_elser:" - #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "Filter_navn:" -#. limit label -#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 -msgid "_Limit to" -msgstr "_Begrens til" - -#: ../data/ui/filter-editor.ui.h:3 +#: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "_Treff" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:270 +#: ../gthumb/gth-filter.c:342 +msgid "_Limit to" +msgstr "_Begrens til" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "valgt av" @@ -202,69 +198,74 @@ msgid "Mean:" msgstr "Middelverdi:" -#: ../data/ui/histogram-info.ui.h:2 +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Standardavvik:" + +#: ../data/ui/histogram-info.ui.h:4 msgid "Median:" msgstr "Median:" +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Piksler:" + #. After the colon there is a percentile. -#: ../data/ui/histogram-info.ui.h:4 +#: ../data/ui/histogram-info.ui.h:8 msgctxt "Pixels" msgid "Max:" msgstr "Maks:" #. After the colon there is the percentile of selected pixels. -#: ../data/ui/histogram-info.ui.h:6 +#: ../data/ui/histogram-info.ui.h:10 msgctxt "Pixels" msgid "Selected:" msgstr "Valgt:" -#. After the colon there is the total number of pixels -#: ../data/ui/histogram-info.ui.h:8 -msgid "Pixels:" -msgstr "Piksler:" - -#. Short for "Standard deviation". Try to keep it short in the translation. -#: ../data/ui/histogram-info.ui.h:10 -msgid "Std dev:" -msgstr "Standardavvik:" +#: ../data/ui/location.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +msgid "_Location:" +msgstr "_Lokasjon:" #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "Ikke overskriv _den gamle filen" +msgid "Overwrite the old file with the new one?" +msgstr "Overskriv gammel fil med ny?" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Gammel fil:" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "Filnavn:" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Størrelse:" + +#: ../data/ui/overwrite-dialog.ui.h:5 msgid "Modified:" msgstr "Endret:" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "Ny fil:" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "Gammel fil:" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "O_verskriv den gamle filen" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "Overskriv _alle filer" - #: ../data/ui/overwrite-dialog.ui.h:8 -msgid "Overwrite the old file with the new one?" -msgstr "Overskriv gammel fil med ny?" +msgid "Do not overwrite _the old file" +msgstr "Ikke overskriv _den gamle filen" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "Size:" -msgstr "Størrelse:" +msgid "Overwrite _all files" +msgstr "Overskriv _alle filer" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -287,185 +288,181 @@ msgstr "_Andre filter:" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Aktiver oppføringer med dobbeltklikk" +msgid "below the folder list" +msgstr "under mappelisten" #: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Aktiver oppføringer med enkeltklikk" +msgid "on the right" +msgstr "til høyre" #: ../data/ui/preferences.ui.h:3 -msgid "Appearance" -msgstr "Utseende" +msgid "gThumb Preferences" +msgstr "gthumb brukervalg" #: ../data/ui/preferences.ui.h:4 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "Spør om be_kreftelse før sletting av bilder eller kataloger" +msgid "_Toolbar style:" +msgstr "Verk_tøylinjestil:" #: ../data/ui/preferences.ui.h:5 -msgid "Ask whether to save _modified files" -msgstr "Spør om å lagre _endrede bilder" +msgid "T_humbnails in viewer:" +msgstr "Miniatyrer i _visning:" -#: ../data/ui/preferences.ui.h:6 ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Sort" +#: ../data/ui/preferences.ui.h:6 +msgid "System settings" +msgstr "Systeminnstillinger" -#: ../data/ui/preferences.ui.h:7 ../gthumb/dlg-preferences-extensions.c:72 -#: ../gthumb/gth-browser-actions-entries.h:150 -msgid "Browser" -msgstr "Leser" +#: ../data/ui/preferences.ui.h:7 +msgid "Text below icons" +msgstr "Tekst under ikoner" #: ../data/ui/preferences.ui.h:8 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 -msgid "Caption" -msgstr "Bildetekst" +msgid "Text beside icons" +msgstr "Tekst ved siden av ikoner" -#: ../data/ui/preferences.ui.h:9 ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "Avkrysset" +#: ../data/ui/preferences.ui.h:9 +msgid "Icons only" +msgstr "Kun ikoner" #: ../data/ui/preferences.ui.h:10 -msgid "Choose startup folder" -msgstr "Velg oppstartsmappe" +msgid "Text only" +msgstr "Kun tekst" #: ../data/ui/preferences.ui.h:11 -msgid "D_etermine image type from content (slower)" -msgstr "B_estem bildetype fra innholdet (saktere)" +msgid "on the bottom" +msgstr "" -#: ../data/ui/preferences.ui.h:12 ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Tilpass til bredde hvis større" +#: ../data/ui/preferences.ui.h:12 +msgid "on the side" +msgstr "" -#: ../data/ui/preferences.ui.h:13 ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Tilpass til vinduet" +#: ../data/ui/preferences.ui.h:13 +msgid "File _properties in browser:" +msgstr "" -#: ../data/ui/preferences.ui.h:14 ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Tilpass til vinduet hvis større" +#: ../data/ui/preferences.ui.h:14 +msgid "Appearance" +msgstr "Utseende" #: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "Følg Nautilus' oppførsel" +msgid "Go to last _visited location" +msgstr "Gå til sist _besøkte lokasjon" #: ../data/ui/preferences.ui.h:16 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:393 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "Generelt" +msgid "Go to this _folder:" +msgstr "Gå til denne _mappen:" #: ../data/ui/preferences.ui.h:17 -msgid "Go to last _visited location" -msgstr "Gå til sist _besøkte lokasjon" +msgid "Choose startup folder" +msgstr "Velg oppstartsmappe" #: ../data/ui/preferences.ui.h:18 -msgid "Go to this _folder:" -msgstr "Gå til denne _mappen:" +msgid "Set to C_urrent" +msgstr "Sett til _aktiv" -#: ../data/ui/preferences.ui.h:19 ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Kun ikoner" +#: ../data/ui/preferences.ui.h:19 +msgid "_Reuse the active window to open files" +msgstr "Bruk aktivt vindu om igjen til å åpne filer" -#: ../data/ui/preferences.ui.h:20 ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Behold forrige zoom" +#: ../data/ui/preferences.ui.h:20 +msgid "On startup:" +msgstr "Ved oppstart:" #: ../data/ui/preferences.ui.h:21 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-crop.c:448 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 -#: ../extensions/file_tools/gth-file-tool-rotate.c:414 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "Ingen" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "Spør om be_kreftelse før sletting av bilder eller kataloger" #: ../data/ui/preferences.ui.h:22 -msgid "On startup:" -msgstr "Ved oppstart:" +msgid "Ask whether to save _modified files" +msgstr "Spør om å lagre _endrede bilder" #: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:192 +msgid "_Store metadata inside files if possible" +msgstr "" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 msgid "Other" msgstr "Andre" -#: ../data/ui/preferences.ui.h:24 -msgid "Set image to actual size" -msgstr "Sett bilde til faktisk størrelse" - #: ../data/ui/preferences.ui.h:25 -msgid "Set to C_urrent" -msgstr "Sett til _aktiv" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Generelt" -#. Set widgets data. -#: ../data/ui/preferences.ui.h:26 ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Systeminnstillinger" +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Bildetekst" #: ../data/ui/preferences.ui.h:27 -msgid "T_humbnails in viewer:" -msgstr "Miniatyrer i _visning:" - -#: ../data/ui/preferences.ui.h:28 ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Tekst under ikoner" - -#: ../data/ui/preferences.ui.h:29 ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Tekst ved siden av ikoner" +msgid "Thumbnail _size:" +msgstr "_Størrelse på miniatyrer:" -#: ../data/ui/preferences.ui.h:30 ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Kun tekst" +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" #: ../data/ui/preferences.ui.h:31 -msgid "Thumbnail _size:" -msgstr "_Størrelse på miniatyrer:" +msgid "95" +msgstr "95" -#: ../data/ui/preferences.ui.h:32 ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Hvit" +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" #: ../data/ui/preferences.ui.h:33 -msgid "_Store metadata inside files if possible" -msgstr "" +msgid "128" +msgstr "128" #: ../data/ui/preferences.ui.h:34 -msgid "_Toolbar style:" -msgstr "Verk_tøylinjestil:" +msgid "164" +msgstr "164" #: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "gthumb brukervalg" +msgid "200" +msgstr "200" #: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "" +msgid "256" +msgstr "256" #: ../data/ui/preferences.ui.h:37 -msgid "on the side" -msgstr "" +msgid "D_etermine image type from content (slower)" +msgstr "B_estem bildetype fra innholdet (saktere)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Leser" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "Sorter etter" #: ../data/ui/sort-order.ui.h:2 -msgid "_Inverse order" -msgstr "Om_vendt rekkefølge" - -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" msgstr "_Sorter etter:" +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "Om_vendt rekkefølge" + #: ../extensions/23hq/23hq.extension.in.in.h:1 msgid "23" msgstr "23" @@ -474,27 +471,23 @@ msgid "Upload images to 23hq.com" msgstr "Last opp bilder til 23hq.com" -#: ../extensions/23hq/callbacks.c:59 ../extensions/23hq/callbacks.c:63 +#: ../extensions/23hq/callbacks.c:68 msgid "_23..." msgstr "_23 …" -#: ../extensions/23hq/callbacks.c:60 -msgid "Download photos from 23" -msgstr "Last ned bilder fra 23" - -#: ../extensions/23hq/callbacks.c:64 +#: ../extensions/23hq/callbacks.c:69 msgid "Upload photos to 23" msgstr "Last opp bilder til 23" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -msgid "Add bookmarks support." -msgstr "Legg til støtte for bokmerker." - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "Bokmerker" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Legg til støtte for bokmerker." + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 @@ -520,6 +513,7 @@ #: ../extensions/rename_series/rename_series.extension.in.in.h:3 #: ../extensions/resize_images/resize_images.extension.in.in.h:3 #: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" @@ -554,13 +548,13 @@ msgstr "_Bokmerker:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "_Lokasjon" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "_Navn" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Lokasjon" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "Kunne ikke fjerne bokmerket" @@ -594,16 +588,16 @@ msgstr "" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "Kilde" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "_Valgte bilder" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Kilde" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Skriv til plate" @@ -620,9 +614,9 @@ #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 -#: ../extensions/file_manager/actions.c:65 -#: ../extensions/list_tools/gth-script-editor-dialog.c:319 -#: ../gthumb/gth-filter-editor-dialog.c:491 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format msgid "No name specified" msgstr "Ingen navn oppgitt" @@ -630,7 +624,7 @@ #: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 #: ../extensions/catalogs/dlg-add-to-catalog.c:281 #: ../extensions/catalogs/dlg-add-to-catalog.c:401 -#: ../extensions/file_manager/actions.c:72 +#: ../extensions/file_manager/actions.c:75 #, c-format msgid "Invalid name. The following characters are not allowed: %s" msgstr "Ugyldig navn. Følgende tegn er ikke tillatt: %s" @@ -638,7 +632,8 @@ #: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 #: ../extensions/catalogs/dlg-add-to-catalog.c:338 #: ../extensions/catalogs/dlg-add-to-catalog.c:448 -#: ../extensions/file_manager/actions.c:103 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 msgid "Name already used" msgstr "Navn allerede brukt" @@ -655,7 +650,7 @@ #: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 #: ../extensions/catalogs/dlg-add-to-catalog.c:474 -#: ../extensions/file_manager/actions.c:133 +#: ../extensions/file_manager/actions.c:136 msgid "C_reate" msgstr "Opp_rett" @@ -673,7 +668,7 @@ msgid "Could not remove the catalog" msgstr "Kunne ikke fjerne katalogen" -#: ../extensions/catalogs/actions.c:361 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" msgstr "Er du sikker på at du vil fjerne «%s»?" @@ -683,16 +678,17 @@ msgstr "_Legg til i katalog" #: ../extensions/catalogs/callbacks.c:105 +#: ../extensions/selections/callbacks.c:80 msgid "Open _Folder" msgstr "Åpne _mappe" #: ../extensions/catalogs/callbacks.c:106 +#: ../extensions/selections/callbacks.c:81 msgid "Go to the folder that contains the selected file" msgstr "Gå til mappen som inneholder valgt fil" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/edit_metadata/callbacks.c:116 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:86 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Andre …" @@ -735,29 +731,29 @@ #: ../extensions/catalogs/callbacks.c:497 #: ../extensions/catalogs/callbacks.c:502 -#: ../extensions/photo_importer/dlg-photo-importer.c:359 -#: ../extensions/photo_importer/dlg-photo-importer.c:399 -#: ../gthumb/gth-file-list.c:45 ../gthumb/gth-folder-tree.c:874 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(Tom)" -#: ../extensions/catalogs/callbacks.c:695 +#: ../extensions/catalogs/callbacks.c:697 msgid "Catalog Properties" msgstr "Egenskaper for katalog" -#: ../extensions/catalogs/callbacks.c:709 +#: ../extensions/catalogs/callbacks.c:711 msgid "Organize" msgstr "Organiser" -#: ../extensions/catalogs/callbacks.c:710 +#: ../extensions/catalogs/callbacks.c:712 msgid "Automatically organize files by date" msgstr "Organiser filer automatisk etter dato" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1024 +#: ../extensions/catalogs/gth-catalog.c:1025 msgid "Catalogs" msgstr "Kataloger" @@ -774,114 +770,114 @@ msgstr "K_ataloger:" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "Nytt _bibliotek" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "_Ny katalog" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "Nytt _bibliotek" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:922 -#: ../extensions/webalbums/gth-web-exporter.c:1852 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1842 msgid "_View the destination" msgstr "_Vis målmappe" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "Katalog" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:201 +#: ../gthumb/gth-file-properties.c:209 msgid "Properties" msgstr "Egenskaper" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Navn:" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "_Dato:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:36 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "_Navn:" +msgid "Catalog" +msgstr "Katalog" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -msgid "Catalog _Preview:" -msgstr "_Forhåndsvisning av katalog:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 -msgid "Organization:" -msgstr "Organisering:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "Organiser filer" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" msgstr "Organiserer filer" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Organisering:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Select All" msgstr "Velg alle" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "Velg ingen" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "_Forhåndsvisning av katalog:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:470 -#: ../gthumb/gth-main-default-tests.c:264 +#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Dato bildet ble tatt" #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -#: ../gthumb/gth-main-default-tests.c:256 +#: ../gthumb/gth-main-default-tests.c:292 msgid "File modified date" msgstr "Dato for filendring" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "Overse kataloger med en enkelt fil" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "Legg enkeltfiler i katalogen:" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "Enkeltfiler" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:261 +#: ../extensions/comments/main.c:159 msgid "Tag" msgstr "Merke" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 -#: ../gthumb/gth-main-default-tests.c:284 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "merk" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "Merke (innebygget)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "_Grupper filer etter:" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "_Ta med undermapper" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Overse kataloger med en enkelt fil" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Legg enkeltfiler i katalogen:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "merk" +msgid "Singles" +msgstr "Enkeltfiler" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -889,7 +885,7 @@ msgstr "Kunne ikke legge til bildene i katalogen" #: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/search/gth-search-task.c:352 +#: ../extensions/search/gth-search-task.c:356 msgid "Could not create the catalog" msgstr "Kunne ikke opprette katalogen" @@ -897,60 +893,62 @@ msgid "Could not save the catalog" msgstr "Kunne ikke lagre katalogen" -#: ../extensions/catalogs/dlg-catalog-properties.c:166 +#: ../extensions/catalogs/dlg-catalog-properties.c:159 msgid "Could not load the catalog" msgstr "Kunne ikke laste katalogen" #: ../extensions/catalogs/dlg-organize-files.c:120 msgid "Files will be organized in catalogs. No file will be moved on disk." -msgstr "Filer vil bli organisert i kataloger. Ingen filer blir flyttet på disk." +msgstr "" +"Filer vil bli organisert i kataloger. Ingen filer blir flyttet på disk." -#: ../extensions/catalogs/gth-catalog.c:1145 ../extensions/comments/main.c:43 +#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Merker" -#: ../extensions/catalogs/gth-file-source-catalogs.c:848 +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 #, c-format msgid "The catalog '%s' already exists, do you want to overwrite it?" msgstr "Katalog «%s» eksisterer allerede. Vil du overskrive den?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:850 +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 #, c-format msgid "The library '%s' already exists, do you want to overwrite it?" msgstr "Bibliotek «%s» eksisterer allerede. Vil du overskrive det?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:858 +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 msgid "Over_write" msgstr "Overskri_v" -#: ../extensions/catalogs/gth-file-source-catalogs.c:976 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 msgid "Cannot move the files" msgstr "Kan ikke flytte filene" -#: ../extensions/catalogs/gth-file-source-catalogs.c:978 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 msgid "Cannot copy the files" msgstr "Kan ikke kopiere filene" -#: ../extensions/catalogs/gth-file-source-catalogs.c:983 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 msgid "Invalid destination." msgstr "Ugyldig mål." -#: ../extensions/catalogs/gth-file-source-catalogs.c:1030 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format msgid "Copying files to '%s'" msgstr "Kopierer filer til «%s»" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1283 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1322 msgid "Could not remove the files from the catalog" msgstr "Kunne ikke fjerne filene fra katalogen" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1341 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:683 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:711 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1214 -#: ../extensions/search/gth-search.c:295 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1380 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Ugyldig filformat" @@ -975,86 +973,89 @@ msgid "Change the files date" msgstr "Endre dato for filen" -#: ../extensions/change_date/data/gthumb_change_date.schemas.in.h:1 -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "Mulige verdier: pixels, percentage" - #: ../extensions/change_date/data/ui/change-date.ui.h:1 -msgid "+" -msgstr "+" +msgid "Change Date" +msgstr "Endre dato" #: ../extensions/change_date/data/ui/change-date.ui.h:2 -msgid "-" -msgstr "-" +msgid "Change the following values:" +msgstr "Endre følgende verdier:" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -msgid "A_djust by" -msgstr "_Juster med" +msgid "_Last modified date" +msgstr "Dato for siste _endring" #: ../extensions/change_date/data/ui/change-date.ui.h:4 -msgid "Change Date" -msgstr "Endre dato" +msgid "Co_mment date" +msgstr "Ko_mmentardato" #: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Change the following values:" -msgstr "Endre følgende verdier:" +msgid "Exif DateTimeOriginal tag" +msgstr "Exif DateTimeOriginal tagg" #: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Change to:" msgstr "Endre til:" #: ../extensions/change_date/data/ui/change-date.ui.h:7 -msgid "Co_mment date" -msgstr "Ko_mmentardato" +msgid "The _following date:" +msgstr "_Følgende dato:" #: ../extensions/change_date/data/ui/change-date.ui.h:8 -msgid "Date p_hoto was taken" -msgstr "Dato _bildet ble tatt" - -#: ../extensions/change_date/data/ui/change-date.ui.h:9 -msgid "Exif DateTimeOriginal tag" -msgstr "Exif DateTimeOriginal tagg" - -#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "Filens e_ndringsdato" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File c_reation date" msgstr "Filens opp_rettelsesdato" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 -msgid "The _following date:" -msgstr "_Følgende dato:" +#: ../extensions/change_date/data/ui/change-date.ui.h:10 +msgid "Date p_hoto was taken" +msgstr "Dato _bildet ble tatt" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 -msgid "_Last modified date" -msgstr "Dato for siste _endring" +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "A_djust by" +msgstr "_Juster med" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "hours" msgstr "timer" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "minutes" msgstr "minutter" -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "sekunder" -#: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "Legg til kommentarer og merker på alle filtyper." +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +msgid "+" +msgstr "+" -#: ../extensions/comments/comments.extension.in.in.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:16 +msgid "-" +msgstr "-" + +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "" + +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "" + +#: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "Kommentarer og tagger" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Legg til kommentarer og merker på alle filtyper." + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Brukervalg" @@ -1062,37 +1063,37 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Synkroniser med innebygget metadata" -#: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:111 +#: ../extensions/comments/main.c:34 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Kommentar" -#: ../extensions/comments/main.c:39 ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Tittel" -#: ../extensions/comments/main.c:40 ../extensions/comments/main.c:245 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Beskrivelse" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:253 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:151 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Sted" -#: ../extensions/comments/main.c:42 ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:43 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Dato" -#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Poengsum" @@ -1117,7 +1118,7 @@ msgstr "Lag en bildevegg" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" msgstr "Kontaktark" @@ -1126,293 +1127,278 @@ msgstr "Rediger kommentar eller annen informasjon for valgte filer" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid " " -msgstr " " +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-crop.c:454 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Ingen" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -msgid "Background" -msgstr "Bakgrunn" +msgid "Simple" +msgstr "Enkel" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -msgid "C_olor:" -msgstr "F_arge:" +msgid "Simple with shadow" +msgstr "Enkel med skygge" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Caption:" -msgstr "Bildetekst:" +msgid "Shadow only" +msgstr "Kun skygge" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 -msgid "Frame" -msgstr "Ramme" +msgid "Slide" +msgstr "Lysbilde" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 msgid "Inward Shadow" msgstr "" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 msgid "Outward Shadow" msgstr "" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -msgid "Select a color" -msgstr "Velg en farge" +msgid "Background" +msgstr "Bakgrunn" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -msgid "Select a font" -msgstr "Velg en skrift" +msgid "_Solid color" +msgstr "_Helfylt farge" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -msgid "Shadow only" -msgstr "Kun skygge" +msgid "_Gradient" +msgstr "_Gradient" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -msgid "Simple" -msgstr "Enkel" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +msgid "_Horizontal:" +msgstr "_Horisontal:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -msgid "Simple with shadow" -msgstr "Enkel med skygge" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 +msgid "_Vertical:" +msgstr "_Vertikal:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -msgid "Slide" -msgstr "Lysbilde" +msgid "Select a color" +msgstr "Velg en farge" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#: ../extensions/rename_series/dlg-rename-series.c:63 -msgid "Text" -msgstr "Tekst" +msgid "Frame" +msgstr "Ramme" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:37 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:47 -msgid "_Footer:" -msgstr "_Bunntekst:" +msgid "_Style:" +msgstr "_Stil:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -msgid "_Gradient" -msgstr "_Gradient" +msgid "C_olor:" +msgstr "F_arge:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:38 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:48 +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Tekst" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 msgid "_Header:" msgstr "_Topptekst:" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Horizontal:" -msgstr "_Horisontal:" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 +msgid "Select a font" +msgstr "Velg en skrift" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 -msgid "_Solid color" -msgstr "_Helfylt farge" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "_Bunntekst:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -msgid "_Style:" -msgstr "_Stil:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Bildetekst:" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:23 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "_Vertical:" -msgstr "_Vertikal:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "Aktivt sidenummer" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -msgid "#" -msgstr "#" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Totalt antall sider" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -msgid "###" -msgstr "###" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Spesialkode" #. translate only the text in the curly brackets -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 #, no-c-format msgid "%D{ format }" msgstr "%D{ format }" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#, no-c-format -msgid "%n" -msgstr "%n" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -#, no-c-format -msgid "%p" -msgstr "%p" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -msgid "All images on a single page" -msgstr "Alle bilder på en enkelt side" +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "Dagens dato" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "_Mål:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 msgid "Choose destination folder" msgstr "Velg målmappe" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +msgid "File_name:" +msgstr "Fil_navn:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Columns:" -msgstr "Kolonner:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 msgid "Create _HTML image map" msgstr "" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/pixbuf_savers/preferences.c:134 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Lagrer" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 msgid "Create a new theme" msgstr "Lag et nytt tema" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -msgid "Delete the selected theme" -msgstr "Slett valgt tema" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 msgid "Edit the selected theme" msgstr "Rediger valgt tema" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -msgid "File_name:" -msgstr "Fil_navn:" +msgid "Delete the selected theme" +msgstr "Slett valgt tema" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "Images per page:" -msgstr "Bilder per side:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Tema" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Layout" -msgstr "Plassering" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Kolonner:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 -msgid "New enumerator digit" -msgstr "" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Bilder per side:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "Re_verse order" -msgstr "Om_vendt rekkefølge" +msgid "All images on a single page" +msgstr "Alle bilder på en enkelt side" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 +msgid "_All pages with the same size" +msgstr "_Alle sider med samme størrelse" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Plassering" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 msgid "S_ort:" msgstr "S_orter:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "Saving" -msgstr "Lagrer" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "Om_vendt rekkefølge" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 -msgid "Special code" -msgstr "Spesialkode" +msgid "_Size:" +msgstr "_Størrelse:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 #, fuzzy msgid "Sq_uared" msgstr "Firkantet" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "The current date" -msgstr "Dagens dato" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "The current page number" -msgstr "Aktivt sidenummer" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:40 -msgid "The total number of pages" -msgstr "Totalt antall sider" - #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:41 -msgid "Theme" -msgstr "Tema" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:34 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 msgid "Thumbnails" msgstr "Miniatyrer" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:35 -msgid "_All pages with the same size" -msgstr "_Alle sider med samme størrelse" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:36 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:17 -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:46 -msgid "_Destination:" -msgstr "_Mål:" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:39 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:18 -msgid "_Size:" -msgstr "_Størrelse:" - -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" msgstr "Bildevegg" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:483 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:495 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:509 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 msgid "Could not save the theme" msgstr "Kunne ikke lagre tema" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:654 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 msgid "Could not delete the theme" msgstr "Kunne ikke slette tema" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 msgid "Creating images" msgstr "Lager bilder" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 msgid "Generating thumbnails" msgstr "Lager miniatyrer" @@ -1424,15 +1410,15 @@ msgid "Footer" msgstr "" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:197 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 msgid "Theme Properties" msgstr "Egenskaper for tema" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:212 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 msgid "Copy _From" msgstr "Kopier _fra" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:348 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 msgid "New theme" msgstr "Nytt tema" @@ -1452,34 +1438,34 @@ msgid "Save images in a different format" msgstr "Lagre bilder i et annet format" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 msgid "Convert Format" msgstr "Konverter format" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Nytt format" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "Mål" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "Nytt format" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Use the original image folder" msgstr "Br_uk original bildemappe" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/dlg-convert-format.c:93 msgid "Converting images" msgstr "Konvertererer bilder" -#: ../extensions/desktop_background/actions.c:203 +#: ../extensions/desktop_background/actions.c:162 msgid "Could not show the desktop background properties" msgstr "Kunne ikke vise egenskaper for skrivebordsbakgrunn" -#: ../extensions/desktop_background/actions.c:269 -#: ../extensions/desktop_background/actions.c:287 +#: ../extensions/desktop_background/actions.c:228 +#: ../extensions/desktop_background/actions.c:246 msgid "Could not set the desktop background" msgstr "Kunne ikke sette skrivebordsbakgrunn" @@ -1496,51 +1482,51 @@ msgid "Desktop background" msgstr "Skrivebordsbakgrunn" -#: ../extensions/edit_metadata/actions.c:129 +#: ../extensions/edit_metadata/actions.c:66 msgid "" "Are you sure you want to permanently delete the metadata of the selected " "files?" -msgstr "" +msgstr "Er du sikker på at du vil slette metadata for valgte filer permanent?" -#: ../extensions/edit_metadata/actions.c:136 +#: ../extensions/edit_metadata/actions.c:73 msgid "If you delete the metadata, it will be permanently lost." -msgstr "" +msgstr "Hvis du sletter metadata vil disse bli borte permanent." -#: ../extensions/edit_metadata/callbacks.c:108 +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" -msgstr "_Etiketter" +msgstr "Merkel_apper" -#: ../extensions/edit_metadata/callbacks.c:112 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" msgstr "Rediger kommentar og annen informasjon for valgte filer" -#: ../extensions/edit_metadata/callbacks.c:117 -msgid "Choose another tag" -msgstr "Velg en annen etikett" +#: ../extensions/edit_metadata/callbacks.c:107 +msgid "Set the tags of the selected files" +msgstr "Sett merkelapper på valgte filer" -#: ../extensions/edit_metadata/callbacks.c:121 +#: ../extensions/edit_metadata/callbacks.c:112 msgid "Delete Metadata" msgstr "Slett metadata" -#: ../extensions/edit_metadata/callbacks.c:122 +#: ../extensions/edit_metadata/callbacks.c:113 msgid "Delete the comment and the embedded metadata of the selected files" msgstr "Slett kommentar og innebygget metadata for valgte filer" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "B_eskrivelse:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Sted:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "E_tiketter:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "_Sted:" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "Poeng_sum:" @@ -1549,79 +1535,86 @@ msgid "_Title:" msgstr "_Tittel:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:63 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "Kunne ikke lagre metadata for fil" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:150 -#: ../gthumb/gth-overwrite-dialog.c:166 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "Kan ikke lese filinformasjon" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Rediger metadata" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Allow to edit files metadata." msgstr "Tillat redigering av metadata for filer." -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 -msgid "Edit metadata" -msgstr "Rediger metadata" +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "%s metadata" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d fil" +msgstr[1] "%d filer" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +msgid "Sa_ve and Close" +msgstr "La_gre og lukk" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:467 +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Lagre ku_n endrede felter" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:547 msgid "No date" msgstr "Ingen dato" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:468 +#: ../extensions/edit_metadata/gth-edit-general-page.c:548 msgid "The following date" msgstr "Følgende dato" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:469 -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Dagens dato" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:471 +#: ../extensions/edit_metadata/gth-edit-general-page.c:551 msgid "Last modified date" msgstr "Dato for siste endring" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:472 +#: ../extensions/edit_metadata/gth-edit-general-page.c:552 msgid "File creation date" msgstr "Filopprettingsdato" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:553 msgid "Do not modify" msgstr "Ikke endre" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:105 -msgid "Save only cha_nged fields" -msgstr "Lagre ku_n endrede felter" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:161 -#, c-format -msgid "%s Metadata" -msgstr "%s metadata" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:165 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:332 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d fil" -msgstr[1] "%d filer" +msgid "%s Tags" +msgstr "%s merkelapper" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Ny etikett" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 msgid "Assign Tags" -msgstr "Tildel etiketter" +msgstr "Tildel merkelapper" #: ../extensions/edit_metadata/gth-tag-task.c:115 #: ../extensions/edit_metadata/gth-tag-task.c:132 -#, fuzzy msgid "Assigning tags to the selected files" -msgstr "Endre navn på valgte filer" +msgstr "Tildeler merkelapper på valgte filer" #: ../extensions/edit_metadata/gth-tag-task.c:115 msgid "Writing files" @@ -1637,65 +1630,65 @@ #: ../extensions/example/src/example.extension.in.in.h:2 msgid "Extension example." -msgstr "" +msgstr "Eksempel på filtype." #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "_Opphavsrett:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "Lan_d:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Kode:" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" -msgstr "" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "State/Provence:" -msgstr "Stat/provins:" +msgstr "Kr_editt:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -#, fuzzy -msgid "_Byline:" -msgstr "_Lysstyrke:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Kilde:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_City:" -msgstr "_By:" +msgid "_Urgency:" +msgstr "_Viktighet:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -msgid "_Code:" -msgstr "_Kode:" +msgid "_Object Name:" +msgstr "Navn på _objekt:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Language:" -msgstr "_Språk:" +#, fuzzy +msgid "_Byline:" +msgstr "_Lysstyrke:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -msgid "_Object Name:" -msgstr "Navn på _objekt:" +msgid "_City:" +msgstr "_By:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -msgid "_Source:" -msgstr "_Kilde:" +msgid "_Language:" +msgstr "_Språk:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 -msgid "_Urgency:" -msgstr "_Viktighet:" +msgid "State/Province:" +msgstr "Stat/provins:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" -msgstr "" +msgstr "Støtte for EXIF, IPTC, XMP" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:2 msgid "Read and write exif, iptc and xmp metadata." -msgstr "" +msgstr "Les og skriv exif-, iptc- og xmp-metadata." #: ../extensions/exiv2_tools/main.c:33 msgid "Exif General" @@ -1741,11 +1734,11 @@ msgid "XMP Attached" msgstr "" -#: ../extensions/exiv2_tools/main.c:255 +#: ../extensions/exiv2_tools/main.c:256 msgid "date photo was taken" msgstr "dato bildet ble tatt" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" msgstr "Del" @@ -1758,77 +1751,77 @@ msgstr "Last opp bilder til Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -msgid "1024 x 1024" -msgstr "" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +msgid "Export to Flickr" +msgstr "Eksporter til Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -msgid "1280 x 1280" -msgstr "" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "Last _opp" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -msgid "1600 x 1600" -msgstr "" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +msgid "_Account:" +msgstr "_Konto:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -msgid "2048 x 2048" -msgstr "" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Rediger kontoer" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -msgid "720 x 720" -msgstr "" - -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "A_lbum:" msgstr "A_lbum:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "Add a new album" msgstr "Legg til et nytt album" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +#, fuzzy +msgid "Resize the images if larger than this size" +msgstr "Endre størrelse på bilder" + #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "Rediger kontoer" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +msgid "_Resize to:" +msgstr "End_re størrelse til:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "Eksporter til Flickr" +msgid "720 x 720" +msgstr "720 x 720" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 -#, fuzzy -msgid "Resize the images if larger then this size" -msgstr "Endre størrelse på bilder" +msgid "1024 x 1024" +msgstr "1024 x 1024" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -msgid "_Account:" -msgstr "_Konto:" +msgid "1280 x 1280" +msgstr "1280 x 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "End_re størrelse til:" +msgid "1600 x 1600" +msgstr "1600 x 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "Last _opp" +msgid "2048 x 2048" +msgstr "2048 x 2048" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 msgid "A_ccount:" msgstr "_Konto:" @@ -1840,27 +1833,23 @@ msgid "A_ccounts:" msgstr "_Kontoer:" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "Private" -msgstr "Privat" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 -msgid "Private photos, visible to friends" -msgstr "Private bilder - synlig for venner" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Offentlige bilder" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 -msgid "_Location:" -msgstr "_Lokasjon:" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +msgid "Private photos, visible to friends" +msgstr "Private bilder - synlig for venner" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Privat" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 msgid "_Visibility:" msgstr "_Synlighet:" @@ -1871,18 +1860,18 @@ msgstr "_Autoriser …" #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 +msgid "Once you're done, click the 'Continue' button below." +msgstr "" + +#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 #: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 msgid "C_ontinue" msgstr "F_ortsett" -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker_utils/flickr-authentication.c:438 -#: ../extensions/oauth/oauth-authentication.c:450 -msgid "Once you're done, click the 'Continue' button below." -msgstr "" - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1894,34 +1883,34 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1851 +#: ../extensions/webalbums/gth-web-exporter.c:1841 msgid "_Open in the Browser" msgstr "_Åpne i bildevisning" -#: ../extensions/facebook/dlg-export-to-facebook.c:128 -#: ../extensions/facebook/dlg-export-to-facebook.c:333 -#: ../extensions/facebook/facebook-authentication.c:219 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:234 -#: ../extensions/flicker_utils/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 #: ../extensions/photobucket/dlg-export-to-photobucket.c:376 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:377 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "Kunne ikke koble til tjener" -#: ../extensions/facebook/dlg-export-to-facebook.c:180 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 msgid "Could not upload the files" msgstr "Kunne ikke laste opp filene" -#: ../extensions/facebook/dlg-export-to-facebook.c:410 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 #: ../extensions/photobucket/dlg-export-to-photobucket.c:462 @@ -1929,78 +1918,78 @@ msgid "Could not create the album" msgstr "Kunne ikke lage album" -#: ../extensions/facebook/dlg-export-to-facebook.c:479 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 #: ../extensions/photobucket/dlg-export-to-photobucket.c:534 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 msgid "New Album" msgstr "Nytt album" -#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1816 +#: ../extensions/image_print/gth-image-print-job.c:1789 #: ../extensions/photobucket/dlg-export-to-photobucket.c:614 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 msgid "No valid file selected." msgstr "Ingen gyldig fil valgt." -#: ../extensions/facebook/dlg-export-to-facebook.c:559 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 #: ../extensions/photobucket/dlg-export-to-photobucket.c:615 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 msgid "Could not export the files" msgstr "Kunne ikke eksportere filene" -#: ../extensions/facebook/dlg-export-to-facebook.c:567 -#: ../extensions/find_duplicates/gth-find-duplicates.c:284 -#: ../extensions/find_duplicates/gth-find-duplicates.c:376 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:255 +#: ../extensions/find_duplicates/gth-find-duplicates.c:347 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 #: ../extensions/photobucket/dlg-export-to-photobucket.c:623 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:800 -#: ../gthumb/gth-browser.c:990 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:1006 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d fil (%s)" msgstr[1] "%d filer (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:589 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:590 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:643 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 #, c-format msgid "Export to %s" msgstr "Eksporter til %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:229 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:229 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:229 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "Ny autentisering …" -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker_utils/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." msgstr "Velg _konto …" -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker_utils/flickr-authentication.c:437 -#: ../extensions/oauth/oauth-authentication.c:449 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 #, c-format msgid "" "Return to this window when you have finished the authorization process on %s" msgstr "" -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker_utils/flickr-authentication.c:517 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" msgstr "" -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker_utils/flickr-authentication.c:518 -#: ../extensions/oauth/oauth-authentication.c:530 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 #, c-format msgid "" "Click 'Authorize' to open your web browser and authorize gthumb to upload " @@ -2008,31 +1997,31 @@ "authorization." msgstr "" -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker_utils/flickr-authentication.c:618 -#: ../extensions/oauth/oauth-authentication.c:632 +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:681 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Velg konto" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker_utils/flickr-authentication.c:727 -#: ../extensions/oauth/oauth-authentication.c:741 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:742 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Rediger kontoer" -#: ../extensions/facebook/facebook-connection.c:304 -#: ../extensions/facebook/facebook-connection.c:464 -#: ../extensions/facebook/facebook-service.c:191 -#: ../extensions/facebook/facebook-service.c:294 -#: ../extensions/facebook/facebook-service.c:497 -#: ../extensions/flicker_utils/flickr-connection.c:300 -#: ../extensions/flicker_utils/flickr-connection.c:451 -#: ../extensions/flicker_utils/flickr-service.c:224 -#: ../extensions/flicker_utils/flickr-service.c:427 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:195 +#: ../extensions/flicker_utils/flickr-service.c:398 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2040,17 +2029,17 @@ msgid "Unknown error" msgstr "" -#: ../extensions/facebook/facebook-connection.c:339 -#: ../extensions/facebook/facebook-connection.c:490 -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-connection.c:326 -#: ../extensions/flicker_utils/flickr-connection.c:477 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 -#: ../extensions/picasaweb/google-connection.c:373 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" msgstr "Kobler til tjener" @@ -2062,135 +2051,131 @@ msgid "Upload images to Facebook" msgstr "" -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "Henter kontoinformasjon" -#: ../extensions/facebook/facebook-service.c:425 -#: ../extensions/flicker_utils/flickr-service.c:352 -#: ../extensions/photobucket/photobucket-service.c:236 -#: ../extensions/picasaweb/picasa-web-service.c:238 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:209 msgid "Getting the album list" msgstr "Henter albumliste" -#: ../extensions/facebook/facebook-service.c:554 -#: ../extensions/flicker_utils/flickr-service.c:455 -#: ../extensions/flicker_utils/flickr-service.c:575 -#: ../extensions/flicker_utils/flickr-service.c:613 -#: ../extensions/photobucket/photobucket-service.c:345 -#: ../extensions/picasaweb/picasa-web-service.c:329 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:426 +#: ../extensions/flicker_utils/flickr-service.c:546 +#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:300 msgid "Creating the new album" msgstr "Lager nytt album" -#: ../extensions/facebook/facebook-service.c:613 -#: ../extensions/flicker_utils/flickr-service.c:663 -#: ../extensions/photobucket/photobucket-service.c:402 -#: ../extensions/picasaweb/picasa-web-service.c:386 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:357 #, c-format msgid "Could not upload '%s': %s" msgstr "Kunne ikke laste opp «%s»: %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:699 -#: ../extensions/flicker_utils/flickr-service.c:774 -#: ../extensions/photobucket/photobucket-service.c:459 -#: ../extensions/picasaweb/picasa-web-service.c:441 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:412 #, c-format msgid "Uploading '%s'" msgstr "Laster opp «%s»" -#: ../extensions/facebook/facebook-service.c:915 -#: ../extensions/flicker_utils/flickr-service.c:943 -#: ../extensions/photobucket/photobucket-service.c:628 -#: ../extensions/picasaweb/picasa-web-service.c:634 +#: ../extensions/facebook/facebook-service.c:886 +#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:605 msgid "Uploading the files to the server" msgstr "" -#: ../extensions/facebook/facebook-service.c:1032 -#: ../extensions/flicker_utils/flickr-service.c:1106 -#: ../extensions/picasaweb/picasa-web-service.c:747 +#: ../extensions/facebook/facebook-service.c:1003 +#: ../extensions/flicker_utils/flickr-service.c:1077 +#: ../extensions/picasaweb/picasa-web-service.c:718 msgid "Getting the photo list" msgstr "Henter bildelisten" -#: ../extensions/file_manager/actions.c:130 +#: ../extensions/file_manager/actions.c:133 msgid "New folder" msgstr "Ny mappe" -#: ../extensions/file_manager/actions.c:131 +#: ../extensions/file_manager/actions.c:134 msgid "Enter the folder name:" msgstr "Oppgi navn på mappen:" -#: ../extensions/file_manager/actions.c:397 +#: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:847 +#: ../extensions/file_manager/callbacks.c:842 msgid "Could not move the files" msgstr "Kunne ikke flytte filene" -#: ../extensions/file_manager/actions.c:398 +#: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:848 +#: ../extensions/file_manager/callbacks.c:843 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." msgstr "" -#: ../extensions/file_manager/actions.c:555 +#: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "Kunne ikke åpne lokasjonen" -#: ../extensions/file_manager/actions.c:688 -#, fuzzy +#: ../extensions/file_manager/actions.c:696 msgid "" "The folder is not empty, do you want to delete the folder and its content " "permanently?" -msgstr "" -"Bildene kan ikke flyttes til søppelkurven. Vil du slette dem permanent?" +msgstr "Mappen er ikke tom. Vil du slette mappen og innholdet permanent?" -#: ../extensions/file_manager/actions.c:704 +#: ../extensions/file_manager/actions.c:712 msgid "Could not delete the folder" msgstr "Kunne ikke slette mappen" -#: ../extensions/file_manager/actions.c:765 -#, fuzzy +#: ../extensions/file_manager/actions.c:773 msgid "" "The folder cannot be moved to the Trash. Do you want to delete it " "permanently?" -msgstr "" -"Bildene kan ikke flyttes til søppelkurven. Vil du slette dem permanent?" +msgstr "Mappen kan ikke flyttes til søppelkurven. Vil du slette den permanent?" -#: ../extensions/file_manager/actions.c:772 +#: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" msgstr "Kan ikke flytte mappen til papirkurven" -#: ../extensions/file_manager/actions.c:808 -#: ../gthumb/gth-file-source-vfs.c:826 +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" msgstr "Er du sikker på at du vil slette «%s» for godt?" -#: ../extensions/file_manager/actions.c:818 -#: ../gthumb/gth-file-source-vfs.c:839 +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "Hvis du sletter en fil vil den bli borte for godt." -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Move To" msgstr "Flytt til" -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Copy To" msgstr "Kopier til" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Move" msgstr "Flytt" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Copy" msgstr "Kopier" @@ -2214,7 +2199,7 @@ #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 -#: ../gthumb/gth-file-source-vfs.c:800 +#: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" msgstr "Flytt til papirkur_ven" @@ -2234,7 +2219,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "End_re navn" @@ -2276,9 +2261,9 @@ msgid "Move the selected files to another folder" msgstr "Flytt valgte filer til en annen mappe" -#: ../extensions/file_manager/callbacks.c:1009 -#: ../extensions/find_duplicates/gth-find-duplicates.c:610 -#: ../gthumb/gth-browser.c:4945 ../gthumb/gth-browser.c:4979 +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:581 +#: ../gthumb/gth-browser.c:5013 ../gthumb/gth-browser.c:5047 msgid "Could not perform the operation" msgstr "Kunne ikke utføre operasjonen" @@ -2295,450 +2280,450 @@ msgstr "Sletter filer" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "Lyssty_rke:" +msgid "_Preview" +msgstr "_Forhåndsvis" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "Fargenivåer" +msgid "B_rightness:" +msgstr "Lyssty_rke:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "Kon_trast:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "Cyan-_rød:" +msgid "_Saturation:" +msgstr "_Metning:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "G_amma:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "_Magenta-grønn:" +msgid "Cyan-_Red:" +msgstr "Cyan-_rød:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Preview" -msgstr "_Forhåndsvis" +msgid "_Magenta-Green:" +msgstr "_Magenta-grønn:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 -msgid "_Reset" -msgstr "_Nullstill" +msgid "_Yellow-Blue:" +msgstr "_Gul-blå:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -msgid "_Saturation:" -msgstr "_Metning:" +msgid "Color Levels" +msgstr "Fargenivåer" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 -msgid "_Yellow-Blue:" -msgstr "_Gul-blå:" - -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "_Nullstill" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "Høyde-/breddeforhold" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +msgid "_Position:" +msgstr "_Posisjon:" +#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "C_rop" -msgstr "Beskjæ_r" +msgid "×" +msgstr "" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "Center" -msgstr "Midtstill" +msgid "_Grid:" +msgstr "Rute_nett:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:6 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "I_nverter aspektraten" - -#. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -msgid "M_ultiple of:" -msgstr "" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 msgid "Maximize" msgstr "Maksimer" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +msgid "Center" +msgstr "Midtstill" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "Selection" msgstr "Utvalg" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 -msgid "_Grid:" -msgstr "Rute_nett:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "I_nvert aspect ratio" +msgstr "I_nverter aspektraten" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 -msgid "_Position:" -msgstr "_Posisjon:" +#. after the colon there is a control to select the size in pixels +#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +msgid "M_ultiple of:" +msgstr "" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 msgid "px" msgstr "" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "Aspect ratio" +msgstr "Høyde-/breddeforhold" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "C_rop" +msgstr "Beskjæ_r" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Bredde:" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +msgid "Heigh_t:" +msgstr "H_øyde:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Set the image size to this value" +msgstr "Sett bildestørrelse til denne verdien" #: ../extensions/file_tools/data/ui/resize-options.ui.h:4 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Dimensjoner" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "H_øyde:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 msgid "High _quality" msgstr "Høy _kvalitet" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "New dimensions:" -msgstr "Nye dimensjoner:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 #: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "Options" msgstr "Alternativer" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" msgstr "Opprinnelige dimensjoner:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "Skaleringsfaktor:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -msgid "Set the image size to this value" -msgstr "Sett bildestørrelse til denne verdien" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 -msgid "_Width:" -msgstr "_Bredde:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Nye dimensjoner:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "piksler" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 msgid "Align" msgstr "Juster" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -msgid "Alignment" -msgstr "Justering" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 msgid "Angle" msgstr "Vinkel" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Point 1:" +msgstr "Punkt 1:" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -msgid "Bounding box" -msgstr "" +msgid "Point 2:" +msgstr "Punkt 2:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -msgid "Crop borders" -msgstr "Beskjær kanter" +msgid "Keep aspect ratio" +msgstr "Behold høyde-/breddeforhold" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "" -"Draw a line on the image \n" -"to set the alignment." -msgstr "" +msgid "Image size" +msgstr "Bildestørrelse" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 msgid "Grid:" msgstr "Rutenett:" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Pick a background color" +msgstr "Velg en bakgrunnsfarge" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -msgid "Image size" -msgstr "Bildestørrelse" +msgid "_Transparent" +msgstr "_Gjennomsiktig" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "Keep aspect ratio" -msgstr "Behold høyde-/breddeforhold" +msgid "_Background:" +msgstr "_Bakgrunn:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -msgid "Original size" -msgstr "Opprinnelig størrelse" +msgid "Reset" +msgstr "Nullstill" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 -msgid "Parallel" -msgstr "Paralell" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 -msgid "Perpendicular" +msgid "" +"Draw a line on the image \n" +"to set the alignment." msgstr "" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 -msgid "Pick a background color" -msgstr "Velg en bakgrunnsfarge" +msgid "Parallel" +msgstr "Paralell" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 -msgid "Point 1:" -msgstr "Punkt 1:" +msgid "Perpendicular" +msgstr "" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 -msgid "Point 2:" -msgstr "Punkt 2:" +msgid "Alignment" +msgstr "Justering" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -msgid "Reset" -msgstr "Nullstill" +msgid "Original size" +msgstr "Opprinnelig størrelse" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 -msgid "_Background:" -msgstr "_Bakgrunn:" +msgid "Bounding box" +msgstr "" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 -msgid "_Transparent" -msgstr "_Gjennomsiktig" +msgid "Crop borders" +msgstr "Beskjær kanter" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -msgid "Amount:" -msgstr "Beløp:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Forhåndsvis:" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 -msgid "Radius:" -msgstr "Radius:" - -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 msgid "Threshold:" msgstr "Terskel:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Radius:" + #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 -msgid "_Preview:" -msgstr "_Forhåndsvis:" +msgid "Amount:" +msgstr "Beløp:" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 -msgid "Basic tools to modify images." -msgstr "" - -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Image tools" msgstr "Bildeverktøy" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +msgid "Basic tools to modify images." +msgstr "Grunnleggende verktøy for endring av bilder." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors..." msgstr "Juster farger …" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors" msgstr "Juster farger" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:528 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "" -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 msgid "Square" msgstr "Firkantet" -#: ../extensions/file_tools/gth-file-tool-crop.c:423 -#: ../extensions/file_tools/gth-file-tool-resize.c:494 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:499 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (bilde)" -#: ../extensions/file_tools/gth-file-tool-crop.c:426 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:503 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (Skjerm)" -#: ../extensions/file_tools/gth-file-tool-crop.c:430 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:508 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:431 -#: ../extensions/file_tools/gth-file-tool-resize.c:504 +#: ../extensions/file_tools/gth-file-tool-crop.c:433 +#: ../extensions/file_tools/gth-file-tool-resize.c:509 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, bok)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:505 +#: ../extensions/file_tools/gth-file-tool-crop.c:434 +#: ../extensions/file_tools/gth-file-tool-resize.c:510 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:506 +#: ../extensions/file_tools/gth-file-tool-crop.c:435 +#: ../extensions/file_tools/gth-file-tool-resize.c:511 msgid "3:2 (Postcard)" msgstr "3:2 (Postkort)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:507 +#: ../extensions/file_tools/gth-file-tool-crop.c:436 +#: ../extensions/file_tools/gth-file-tool-resize.c:512 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:437 +#: ../extensions/file_tools/gth-file-tool-resize.c:513 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:438 +#: ../extensions/file_tools/gth-file-tool-resize.c:514 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:439 +#: ../extensions/file_tools/gth-file-tool-resize.c:515 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/rename_series/gth-template-selector.c:260 +#: ../extensions/file_tools/gth-file-tool-crop.c:440 +#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Tilpasset" -#: ../extensions/file_tools/gth-file-tool-crop.c:449 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:455 +#: ../extensions/file_tools/gth-file-tool-rotate.c:416 msgid "Rule of Thirds" msgstr "" -#: ../extensions/file_tools/gth-file-tool-crop.c:450 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:456 +#: ../extensions/file_tools/gth-file-tool-rotate.c:417 msgid "Golden Sections" -msgstr "" +msgstr "Gylne utsnitt" -#: ../extensions/file_tools/gth-file-tool-crop.c:451 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:457 +#: ../extensions/file_tools/gth-file-tool-rotate.c:418 #, fuzzy msgid "Center Lines" msgstr "Sentrert" -#: ../extensions/file_tools/gth-file-tool-crop.c:452 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:458 +#: ../extensions/file_tools/gth-file-tool-rotate.c:419 msgid "Uniform" msgstr "Enhetlig" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop..." msgstr "Beskjær …" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop" msgstr "Beskjær" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:65 -#: ../extensions/file_tools/gth-file-tool-negative.c:65 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 msgid "Applying changes" msgstr "Påfører endringer" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:189 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 msgid "Desaturate" msgstr "Senk metning" -#: ../extensions/file_tools/gth-file-tool-enhance.c:116 +#: ../extensions/file_tools/gth-file-tool-enhance.c:119 msgid "White balance correction" msgstr "Korrigering av hvitbalanse" -#: ../extensions/file_tools/gth-file-tool-enhance.c:339 +#: ../extensions/file_tools/gth-file-tool-enhance.c:342 msgid "Enhance Colors" msgstr "Forbedre farger" -#: ../extensions/file_tools/gth-file-tool-enhance.c:340 +#: ../extensions/file_tools/gth-file-tool-enhance.c:343 msgid "Automatic white balance correction" -msgstr "" +msgstr "Automatisk korrigering av hvitbalanse" -#: ../extensions/file_tools/gth-file-tool-equalize.c:83 +#: ../extensions/file_tools/gth-file-tool-equalize.c:86 msgid "Equalizing image histogram" msgstr "Jevner ut bildehistogrammet" -#: ../extensions/file_tools/gth-file-tool-equalize.c:261 +#: ../extensions/file_tools/gth-file-tool-equalize.c:275 msgid "Equalize" msgstr "Jevn ut" -#: ../extensions/file_tools/gth-file-tool-equalize.c:262 +#: ../extensions/file_tools/gth-file-tool-equalize.c:276 msgid "Equalize image histogram" msgstr "Jevn ut bildehistogrammet" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Vend" -#: ../extensions/file_tools/gth-file-tool-flip.c:74 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 msgid "Flip the image vertically" msgstr "Roter bildet vertikalt" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Speil" -#: ../extensions/file_tools/gth-file-tool-mirror.c:74 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 msgid "Mirror the image horizontally" -msgstr "" +msgstr "Vend bildet horisontalt" -#: ../extensions/file_tools/gth-file-tool-negative.c:183 +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Negativ" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Gjør på nytt" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize..." msgstr "Endre størrelse …" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize" msgstr "Endre størrelse" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate..." msgstr "Roter …" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate" msgstr "Roter" -#: ../extensions/file_tools/gth-file-tool-rotate.c:597 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Freely rotate the image" msgstr "Roter bildet fritt" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Roter til venstre" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 msgid "Rotate the image by 90 degrees counterclockwise" msgstr "" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Roter til høyre" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 msgid "Rotate the image by 90 degrees clockwise" msgstr "" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Lagre som" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Lagre" @@ -2746,15 +2731,15 @@ msgid "Sharpening image" msgstr "Gjør bildet skarpere" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus..." msgstr "Forbedre fokus …" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus" msgstr "Forbedre fokus" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Angre" @@ -2771,38 +2756,38 @@ msgstr "_Mapper:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Søk etter duplikater" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 msgid "Duplicates:" msgstr "Duplikater:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 msgid "Files:" msgstr "Filer:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -msgid "No duplicates found." -msgstr "Ingen duplikater funnet." - #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -msgid "Search for Duplicates" -msgstr "Søk etter duplikater" - -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 -#: ../gthumb/gth-browser-actions-entries.h:32 +#: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "_Vis" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Ingen duplikater funnet." + #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 msgid "Find Duplicates" msgstr "Finn Duplikater" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "Start _ved:" -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" msgstr "_Filter:" @@ -2830,23 +2815,23 @@ msgid "no file" msgstr "ingen fil" -#: ../extensions/find_duplicates/gth-find-duplicates.c:426 -#: ../extensions/find_duplicates/gth-find-duplicates.c:521 +#: ../extensions/find_duplicates/gth-find-duplicates.c:397 +#: ../extensions/find_duplicates/gth-find-duplicates.c:492 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d duplikat" msgstr[1] "%d duplikater" -#: ../extensions/find_duplicates/gth-find-duplicates.c:565 +#: ../extensions/find_duplicates/gth-find-duplicates.c:536 msgid "Search completed" msgstr "Søk fullført" -#: ../extensions/find_duplicates/gth-find-duplicates.c:577 +#: ../extensions/find_duplicates/gth-find-duplicates.c:548 msgid "Searching for duplicates" msgstr "Søker etter duplikater" -#: ../extensions/find_duplicates/gth-find-duplicates.c:580 +#: ../extensions/find_duplicates/gth-find-duplicates.c:551 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2855,19 +2840,19 @@ msgstr[0] "%d fil gjenstår" msgstr[1] "%d filer gjenstår" -#: ../extensions/find_duplicates/gth-find-duplicates.c:663 +#: ../extensions/find_duplicates/gth-find-duplicates.c:634 msgid "Getting the file list" msgstr "Henter filliste" -#: ../extensions/find_duplicates/gth-find-duplicates.c:769 +#: ../extensions/find_duplicates/gth-find-duplicates.c:740 msgid "Duplicates" msgstr "Duplikater" -#: ../extensions/find_duplicates/gth-find-duplicates.c:1023 +#: ../extensions/find_duplicates/gth-find-duplicates.c:997 msgid "Select" msgstr "Velg" -#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:63 +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr …" @@ -2875,7 +2860,7 @@ msgid "Download photos from Flickr" msgstr "Last ned bilder fra Flickr" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "Last opp bilder til Flickr" @@ -2887,135 +2872,128 @@ msgid "Upload images to Flickr" msgstr "Last opp bilder til Flickr" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Ledig plass:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "" - -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -msgid "Moderate content" -msgstr "" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "Private bilder" +msgid "_Privacy:" +msgstr "" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" +msgid "Hi_de from public searches" msgstr "" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 -msgid "Private photos, visible to family and friends" +msgid "_Safety:" msgstr "" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 -msgid "Restricted content" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 +msgid "Private photos, visible to family and friends" msgstr "" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 +msgid "Private photos, visible to family" +msgstr "" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos" +msgstr "Private bilder" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "Safe content" msgstr "Trygt innhold" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 -msgid "_Privacy:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 +msgid "Moderate content" msgstr "" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 -msgid "_Safety:" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Restricted content" msgstr "" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "_Import" msgstr "_importer" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:357 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:827 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "Kunne ikke hente bildelisten" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:394 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:559 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:861 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1024 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 msgid "No album selected" msgstr "Ingen album valgt" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:577 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 #, c-format msgid "Import from %s" msgstr "Importer fra %s" -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1118 -#: ../gthumb/gth-browser.c:2008 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 +#: ../gthumb/gth-browser.c:2016 msgid "Could not save the file" msgstr "Kunne ikke lagre filen" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "Kunne ikke ta et skjermdump" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1266 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 msgid "Save Image" msgstr "Lagre bilde" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Skjermdump" -#. this is an empty time +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Saktere" + #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "--:--" -msgstr "--.--" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +msgid "Play" +msgstr "Spill" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 -msgid "Change volume level" -msgstr "" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Faster" msgstr "Raskere" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:656 -msgid "Play" -msgstr "Spill" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Slower" -msgstr "Saktere" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Time:" msgstr "Tid:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--.--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Toggle volume" msgstr "Slå av/på volum" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 -msgctxt "time" -msgid "/" -msgstr "/" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 -#: ../extensions/photo_importer/dlg-photo-importer.c:614 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Velg en mappe" @@ -3027,29 +3005,29 @@ msgid "Play audio and video files." msgstr "Spill av lyd- og videofiler." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:93 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Skjermdump" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:94 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Ta et skjermdump" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:633 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 msgid "Playing video" msgstr "Spiller av video" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:646 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Pause" msgstr "Pause" #: ../extensions/gstreamer_tools/main.c:31 -#: ../gthumb/gth-main-default-tests.c:211 +#: ../gthumb/gth-main-default-tests.c:247 msgid "Video" msgstr "Video" #: ../extensions/gstreamer_tools/main.c:32 -#: ../gthumb/gth-main-default-tests.c:218 +#: ../gthumb/gth-main-default-tests.c:254 msgid "Audio" msgstr "Lyd" @@ -3058,7 +3036,7 @@ msgstr "Artist" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "Album" @@ -3080,13 +3058,13 @@ msgstr "Rammehastighet" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 -#: ../extensions/image_viewer/gth-image-viewer-page.c:222 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Bredde" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "Høyde" @@ -3109,10 +3087,10 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1318 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 #: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:429 -#: ../extensions/webalbums/gth-web-exporter.c:2456 +#: ../extensions/webalbums/dlg-web-exporter.c:442 +#: ../extensions/webalbums/gth-web-exporter.c:2446 #, c-format msgid "%d × %d" msgstr "" @@ -3125,94 +3103,94 @@ msgid "Print the selected images" msgstr "Skriv ut valgte bilder" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 msgid "Centered" msgstr "Sentrert" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 -msgid "Image" -msgstr "Bilde" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Left" -msgstr "Venstre" - #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Position:" -msgstr "Posisjon:" +msgid "The total number of files" +msgstr "Totalt antall filer" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 -msgid "Preview" -msgstr "Forhåndsvis" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -msgid "Rotation:" -msgstr "Rotering:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 msgid "The event description" msgstr "Beskrivelse av hendelsen" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "_Rader:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Bilde" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Posisjon:" + #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "The total number of files" -msgstr "Totalt antall filer" +msgid "Left" +msgstr "Venstre" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "Topp" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Rotering:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "Enhet:" #: ../extensions/image_print/data/ui/print-layout.ui.h:28 -msgid "_Rows:" -msgstr "_Rader:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 -msgid "inches" -msgstr "tommer" +msgid "Preview" +msgstr "Forhåndsvis" #: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "millimetre" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 -msgid "Fonts" -msgstr "Skrifter" +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "tommer" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 msgid "Select Caption Font" msgstr "Velg en skrift for bildetekst" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -msgid "Select Footer Font" -msgstr "Velg skrift for bunntekst" - #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" msgstr "Velg skrift for topptekst" -#: ../extensions/image_print/gth-image-print-job.c:997 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Velg skrift for bunntekst" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Skrifter" + +#: ../extensions/image_print/gth-image-print-job.c:971 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Side %d av %d" -#: ../extensions/image_print/gth-image-print-job.c:1761 -#: ../extensions/image_print/gth-image-print-job.c:1888 -#: ../extensions/image_print/gth-image-print-job.c:1925 +#: ../extensions/image_print/gth-image-print-job.c:1734 +#: ../extensions/image_print/gth-image-print-job.c:1861 +#: ../extensions/image_print/gth-image-print-job.c:1898 msgid "Could not print" msgstr "Kunne ikke skrive ut" -#: ../extensions/image_print/gth-image-print-job.c:1823 -#: ../gthumb/gth-main-default-tests.c:204 +#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Bilder" -#: ../extensions/image_print/gth-image-print-job.c:1890 -#: ../gthumb/gth-image-loader.c:233 ../gthumb/gth-image-loader.c:306 +#: ../extensions/image_print/gth-image-print-job.c:1863 +#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 msgid "No suitable loader available for this file type" msgstr "" @@ -3223,19 +3201,19 @@ msgstr "Laster «%s»" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2695 +#: ../extensions/webalbums/gth-web-exporter.c:2685 msgid "Loading images" msgstr "Laster bilder" #: ../extensions/image_print/image_print.extension.in.in.h:1 -msgid "Allow to print images choosing the page layout." -msgstr "" - -#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Image print" msgstr "Bildeutskrift" -#: ../extensions/image_print/preferences.c:76 +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "" + +#: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "" @@ -3243,32 +3221,31 @@ msgid "Rotate the selected images 90° to the right" msgstr "Roter valgte bilder 90° til høyre" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" msgstr "Roter valgte bilder 90° til venstre" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Roter fysisk" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 #, fuzzy msgid "Rotate the selected images according to the embedded orientation" msgstr "Roter valgte bilder 90° til høyre" -#: ../extensions/image_rotation/callbacks.c:64 -#, fuzzy +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" -msgstr "Kunne ikke åpne lokasjonen" +msgstr "Nullstill EXIF-orientering" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" msgstr "" #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2349 -#: ../extensions/webalbums/gth-web-exporter.c:2433 +#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Lagrer bilder" @@ -3280,12 +3257,12 @@ msgid "Rotate images without data loss." msgstr "Roter bilder uten tap av kvalitet." -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "Problem under transformering av bilde: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" "This transformation may introduce small image distortions along one or more " "edges, because the image dimensions are not multiples of 8.\n" @@ -3299,216 +3276,213 @@ "transformation is not strictly lossless anymore." msgstr "" -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" msgstr "_Juster" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -#, fuzzy -msgid "" -"Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, " -"fit-width, fit-width-if-larger." -msgstr "" -"Mulige verdier er: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -#, fuzzy -msgid "Whether to resize the window to fit the size of the image" -msgstr "Bruk dette vinduet om igjen for å vise andre bilder" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "Etter lasting av et bilde:" +msgid "Set to actual size" +msgstr "Sett til faktisk størrelse" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Høy" +msgid "Keep previous zoom" +msgstr "Behold forrige zoom" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Lav" +msgid "Fit to window" +msgstr "Tilpass til vinduet" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "Tilpass til vinduet hvis større" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 -msgid "Reset scrollbar positions" -msgstr "" +msgid "Fit to width" +msgstr "Tilpass til bredde" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 -msgid "Transparency _type:" -msgstr "_Type gjennomsiktighet:" +msgid "Fit to width if larger" +msgstr "Tilpass til bredde hvis større" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "Etter lasting av et bilde:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "Kvalitet på _zoom" -#: ../extensions/image_viewer/gth-image-histogram.c:74 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "_Type gjennomsiktighet:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Høy" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Lav" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Hvit" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Sort" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Avkrysset" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "Histogram" -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 msgid "Copy Image" msgstr "Kopier bilde" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 msgid "Copy the image to the clipboard" msgstr "Kopier bildet til utklippstavlen" -#: ../extensions/image_viewer/gth-image-viewer-page.c:197 +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 msgid "Paste Image" msgstr "Lim inn bilde" -#: ../extensions/image_viewer/gth-image-viewer-page.c:198 +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 msgid "Paste the image from the clipboard" msgstr "Lim inn bilde fra utklippstavlen" -#: ../extensions/image_viewer/gth-image-viewer-page.c:202 +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "Inn" -#: ../extensions/image_viewer/gth-image-viewer-page.c:203 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Zoom inn" -#: ../extensions/image_viewer/gth-image-viewer-page.c:207 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Ut" -#: ../extensions/image_viewer/gth-image-viewer-page.c:208 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Zoom ut" -#: ../extensions/image_viewer/gth-image-viewer-page.c:212 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:213 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Faktisk størrelse" -#: ../extensions/image_viewer/gth-image-viewer-page.c:217 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Tilpass" -#: ../extensions/image_viewer/gth-image-viewer-page.c:218 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Zoom tilpasset vindu" -#: ../extensions/image_viewer/gth-image-viewer-page.c:223 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Zoom tilpasset vindu" -#: ../extensions/image_viewer/gth-image-viewer-page.c:230 -msgid "_Fit Window to Image" -msgstr "Til_pass vinduet til bildet" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:231 -#, fuzzy -msgid "Resize the window to the size of the image" -msgstr "Bruk dette vinduet om igjen for å vise andre bilder" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -msgid "Basic image viewing." -msgstr "Grunnleggende bildevisning." - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Bildeviser" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Sett til faktisk størrelse" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Tilpass til bredde" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Grunnleggende bildevisning." -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Visning" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "Mulige verdier er: none, file_date, current_date" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "Mulige verdier er: yyyymmdd, yyyymm, yyyy" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:3 -msgid "The day of the month" -msgstr "Dag i måneden" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "_Mål" -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "Timen" +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "_Automatisk undermapper" -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "Minutter" +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +msgid "as _single subfolder" +msgstr "som en enkelt _undermappe" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "Måneden" +msgid "The year" +msgstr "Året" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "Sekundene" +msgid "The month" +msgstr "Måneden" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "Året" +msgid "The day of the month" +msgstr "Dag i måneden" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -msgid "_Automatic subfolder" -msgstr "_Automatisk undermapper" +msgid "The hour" +msgstr "Timen" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "_Mål" +msgid "The minutes" +msgstr "Minutter" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -msgid "as _single subfolder" -msgstr "som en enkelt _undermappe" +msgid "The seconds" +msgstr "Sekundene" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "Ugyldig mål" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "eksempel: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:326 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Fildato" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:336 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "år-måned-dag" -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "år-måned" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "år" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "egendefinert format" #: ../extensions/importer/gth-import-task.c:442 #: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:643 +#: ../extensions/importer/gth-import-task.c:648 msgid "Importing files" msgstr "Importerer filer" @@ -3518,45 +3492,42 @@ #: ../extensions/importer/gth-import-task.c:599 msgid "The selected files are already present in the destination." -msgstr "" +msgstr "Valgte filer finnes allerede i målmappen." -#: ../extensions/importer/gth-import-task.c:619 -#: ../gthumb/gth-file-source-vfs.c:685 +#: ../extensions/importer/gth-import-task.c:622 +#: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Kunne ikke slette filene" -#: ../extensions/importer/gth-import-task.c:620 -#, fuzzy +#: ../extensions/importer/gth-import-task.c:623 msgid "Delete operation not supported." -msgstr "Bildetypen er ikke støttet: %s" +msgstr "Sletteoperasjonen er ikke støttet." -#: ../extensions/importer/gth-import-task.c:704 +#: ../extensions/importer/gth-import-task.c:709 msgid "Last imported" msgstr "Sist importert" -#: ../extensions/importer/gth-import-task.c:839 +#: ../extensions/importer/gth-import-task.c:815 msgid "No file specified." msgstr "Ingen fil oppgitt." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:876 +#: ../extensions/importer/gth-import-task.c:852 #, c-format msgid "" "Not enough free space in '%s'.\n" "%s of space is required but only %s is available." msgstr "" -#: ../extensions/list_tools/callbacks.c:65 ../gthumb/gth-filterbar.c:303 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 msgid "Personalize..." msgstr "Personliggjør …" -#: ../extensions/list_tools/callbacks.c:238 -#: ../extensions/list_tools/callbacks.c:249 +#: ../extensions/list_tools/callbacks.c:320 msgid "Tools" msgstr "Verktøy" -#: ../extensions/list_tools/callbacks.c:240 -#: ../extensions/list_tools/callbacks.c:251 +#: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" msgstr "" @@ -3565,123 +3536,98 @@ msgstr "_Hopp over" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "Ko_mmandoer:" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "Kommandoer" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "Ko_mmandoer:" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, no-c-format -msgid "%B" -msgstr "%B" +msgid "_Wait for the command to finish" +msgstr "" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format -msgid "%E" -msgstr "%E" +msgid "_Terminal command (shell script)" +msgstr "" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "Sn_arvei:" #: ../extensions/list_tools/data/ui/script-editor.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 -#, no-c-format -msgid "%F" -msgstr "%F" +msgid "The file uri" +msgstr "URI for fil" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 -#, no-c-format -msgid "%N" -msgstr "%N" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:7 +msgid "The file path" +msgstr "Sti til fil" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -#, no-c-format -msgid "%P" -msgstr "%P" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "Basisnavn for fil" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:12 -#, no-c-format -msgid "%U" -msgstr "%U" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "Sti til opphavsmappe" #. Translate only 'message' and 'default_value'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:14 #, no-c-format msgid "%ask{ message }{ default value }" msgstr "" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +msgid "Ask an input value" +msgstr "" + #. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 #, no-c-format msgid "%attr{ attribute name }" msgstr "" -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -#, no-c-format -msgid "%quote{ text }" -msgstr "" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 msgid "A file attribute" msgstr "" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -msgid "Ask an input value" -msgstr "" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -msgid "E_xecute command once for every file" -msgstr "" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "Quote the text " -msgstr "" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "Sh_ortcut:" -msgstr "Sn_arvei:" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "The file basename" -msgstr "" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 -msgid "The file basename without extension" -msgstr "" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:31 -#, fuzzy -msgid "The file extension" -msgstr "Bestem etter filtype" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:32 -#, fuzzy -msgid "The file path" -msgstr "Sti _til fil" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 +#, no-c-format +msgid "%N" +msgstr "%N" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:33 -msgid "The file uri" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 +msgid "The file basename without extension" msgstr "" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:34 -#, fuzzy -msgid "The parent folder path" -msgstr "Flytt aktiv mappe" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 +#, no-c-format +msgid "%E" +msgstr "%E" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:35 -msgid "_Command:" -msgstr "_Kommando:" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 +msgid "The file extension" +msgstr "Filtype" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:37 -msgid "_Terminal command (shell script)" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" msgstr "" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:38 -msgid "_Wait for the command to finish" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 +msgid "Quote the text " msgstr "" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 +msgid "_Command:" +msgstr "_Kommando:" + #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" msgstr "Skript" @@ -3691,7 +3637,7 @@ msgstr "Snarvei" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "Vis:" @@ -3711,32 +3657,32 @@ msgid "Are you sure you want to delete the selected command?" msgstr "Er du sikker på at du vil slette valgt kommando?" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" msgstr "Oppgi en verdi:" -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:570 -#: ../extensions/webalbums/gth-web-exporter.c:582 -#: ../extensions/webalbums/gth-web-exporter.c:590 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:560 +#: ../extensions/webalbums/gth-web-exporter.c:572 +#: ../extensions/webalbums/gth-web-exporter.c:580 msgid "Malformed command" msgstr "Feilutformet kommando" -#: ../extensions/list_tools/gth-script-editor-dialog.c:176 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "ingen" -#: ../extensions/list_tools/gth-script-editor-dialog.c:182 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "" -#: ../extensions/list_tools/gth-script-editor-dialog.c:325 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "Ingen kommando oppgitt" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "" @@ -3749,33 +3695,33 @@ msgid "Scripting and batch manipulation of files." msgstr "" -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "S" msgstr "S" -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "N" msgstr "N" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "W" msgstr "V" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "E" msgstr "Ø" -#: ../extensions/map_view/gth-map-view.c:196 +#: ../extensions/map_view/gth-map-view.c:205 #: ../extensions/map_view/map_view.extension.in.in.h:1 msgid "Map" msgstr "Kart" #. No GPS label -#: ../extensions/map_view/gth-map-view.c:265 +#: ../extensions/map_view/gth-map-view.c:276 msgid "The geographical position information is not available for this image." msgstr "" @@ -3792,41 +3738,40 @@ msgstr "" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -#, fuzzy -msgid "1 megabyte file size" -msgstr "filstørrelse" +msgid "Tiny ( 100 x 75 )" +msgstr "" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" +msgid "Small ( 160 x 120 )" msgstr "" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" +msgid "Medium ( 320 x 240 )" msgstr "" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 msgid "Large ( 640 x 480 )" msgstr "" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +msgid "15ʺ screen ( 800 x 600 )" msgstr "" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 -msgid "Small ( 160 x 120 )" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +msgid "17ʺ screen ( 1024 x 768 )" msgstr "" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +msgid "1 megabyte file size" +msgstr "1 megabyte filstørrelse" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 #, fuzzy msgid "_Scramble filenames" msgstr "Behold originalt filnavn" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 #, fuzzy msgid "_Container:" msgstr "_Fortsett" @@ -3885,66 +3830,64 @@ msgstr "M_appe …" #: ../extensions/photo_importer/callbacks.c:57 -#, fuzzy msgid "Import photos and other files from a folder" -msgstr "Importer bilder fra ditt kamera" +msgstr "Importer bilder og andre filer fra en mappe" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "Etter import fra en enhet:" +msgid "_Rotate the images physically" +msgstr "_Roter bildene fysisk" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 -#, fuzzy -msgid "_Rotate the images physically" -msgstr "_Roter bilder fysisk" +msgid "After importing from a device:" +msgstr "Etter import fra en enhet:" #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../gthumb/gth-filterbar.c:413 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:414 msgid "S_how:" msgstr "V_is:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -msgid "_Delete the imported files from the source" -msgstr "_Slett importerte bilder fra kilden" - #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "_Tagger:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "H_endelse:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Tags:" -msgstr "_Tagger:" +msgid "_Delete the imported files from the source" +msgstr "_Slett importerte bilder fra kilden" -#: ../extensions/photo_importer/dlg-photo-importer.c:222 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:173 +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 msgid "Could not import the files" msgstr "Kunne ikke importere filene" #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:294 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "Filer som skal importeres: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:334 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" msgstr "Kunne ikke laste mappen" -#: ../extensions/photo_importer/dlg-photo-importer.c:364 -#: ../gthumb/gth-browser.c:1921 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:1929 msgid "Getting folder listing..." msgstr "Henter mappeliste …" -#: ../extensions/photo_importer/dlg-photo-importer.c:410 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "Tom" -#: ../extensions/photo_importer/dlg-photo-importer.c:580 +#: ../extensions/photo_importer/dlg-photo-importer.c:586 msgid "Import from Removable Device" msgstr "Importer fra ekstern enhet" -#: ../extensions/photo_importer/dlg-photo-importer.c:612 +#: ../extensions/photo_importer/dlg-photo-importer.c:618 msgid "Import from Folder" msgstr "Importer fra mappe" @@ -3957,117 +3900,100 @@ msgstr "Importer bilder fra eksterne enheter." #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 -#, fuzzy +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." -msgstr "Opprett _web-album …" +msgstr "_Picasa nettalbum …" #: ../extensions/picasaweb/callbacks.c:60 msgid "Download photos from Picasa Web Album" msgstr "" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" msgstr "" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "_Album:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 msgid "Import from Picasa Web Album" msgstr "" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 msgid "_Album:" msgstr "_Album:" #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 +msgid "_E-Mail:" +msgstr "_E-post:" + +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 msgid "" "Type the characters you see in the picture below. Letters are not case-" "sensitive." msgstr "" -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "_E-Mail:" -msgstr "_E-post:" - #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 msgid "_Password:" msgstr "_Passord:" -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Offentlig" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:307 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "Kunne ikke hente albumlisten" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:391 -#, fuzzy +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" -msgstr "Web-album" +msgstr "Picasa nettalbum" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:478 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "Konto" -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:133 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 msgid "Could not load the file" msgstr "Kunne ikke laste filen" #: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 -#, fuzzy msgid "Picasa Web Albums" -msgstr "Web-album" +msgstr "Picasa nettalbum" #: ../extensions/picasaweb/picasaweb.extension.in.in.h:2 msgid "Upload images to Picasa Web Albums" -msgstr "" - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -#, fuzzy -msgid "Possible values are: jpeg, jpg." -msgstr "Mulige verdier er: high, low." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:2 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Mulige verdier er: none, deflate, jpeg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:3 -#, fuzzy -msgid "Possible values are: tiff, tif." -msgstr "Mulige verdier er: high, low." +msgstr "Last opp bilder til Picasa nettalbum" #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "Opti_mer" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 msgid "_Default extension:" msgstr "_Forvalgt filtype:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "_Progressiv" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 msgid "_Quality:" msgstr "_Kvalitet:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 msgid "_Smoothing:" msgstr "_Utjevning:" +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_mer" + +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Progressiv" + #: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 msgid "Compression _level:" msgstr "Kompresjons_nivå:" @@ -4080,48 +4006,48 @@ msgid "_RLE compression" msgstr "_RLE-kompresjon" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "Kompresjon" - #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "No_rmal (deflate)" +msgid "_No compression" +msgstr "I_ngen kompresjon" #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "Oppløsning" +msgid "No_rmal (Deflate)" +msgstr "No_rmal (deflate)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 msgid "_Loss compression (JPEG)" msgstr "_Kompresjon med tap (JPEG)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_No compression" -msgstr "I_ngen kompresjon" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +msgid "Compression" +msgstr "Kompresjon" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 msgid "dpi" msgstr "dpi" -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:527 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +msgid "Resolution" +msgstr "Oppløsning" + +#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 msgid "JPEG" msgstr "JPEG" -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 +#: ../extensions/pixbuf_savers/gth-png-saver.c:140 msgid "PNG" msgstr "PNG" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 #: ../gthumb/gth-buffer-data.c:84 msgid "Insufficient memory" msgstr "Ikke nok minne" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 msgid "TGA" msgstr "TGA" -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:542 +#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 msgid "TIFF" msgstr "TIFF" @@ -4134,30 +4060,30 @@ msgstr "" #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." +msgid "Raw format support" msgstr "" #: ../extensions/raw_files/raw_files.extension.in.in.h:2 -msgid "Raw format support" +msgid "Allow to load raw format images." msgstr "" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_Y:" msgstr "_Y:" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." msgstr "Fjerning av røde øyne …" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "Fjerning av røde øyne" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:470 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" msgstr "" @@ -4169,152 +4095,138 @@ msgid "Tool to remove the red-eye effect from a photo." msgstr "" -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "" -"Possible values include: general::unsorted, file::name, file::size, file::" -"mtime, exif::photo::datetimeoriginal" -msgstr "" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -#, fuzzy -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "Mulige verdier er: none, deflate, jpeg." - #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -msgid "add" -msgstr "legg til" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "digits" msgstr "" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "format:" msgstr "format:" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 msgid "remove" msgstr "fjern" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, no-c-format -msgid "%A{ identifier }" -msgstr "%A{ identifikator }" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "legg til" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, no-c-format -msgid "%M{ format }" -msgstr "%M{ format }" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Endre navn" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" msgstr "_Store/små bokstaver:" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 msgid "Edit template" msgstr "Rediger mal" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Re_verse Order" -msgstr "Om_vendt rekkefølge" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -msgid "Rename" -msgstr "Endre navn" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 -msgid "The digitalization date" -msgstr "" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Behold originalt filnavn" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 -msgid "The modification date" -msgstr "Endringstidspunkt" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "Opprinnelig filtype" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 #, fuzzy msgid "The original enumerator" msgstr "_Behold originale filnavn" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 -#, fuzzy -msgid "The original extension" -msgstr "Bestem etter filtype" +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ format }" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 +msgid "The modification date" +msgstr "Endringstidspunkt" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "" + +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "The original filename" -msgstr "Behold originalt filnavn" +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ identifikator }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "_Mal:" -#: ../extensions/rename_series/dlg-rename-series.c:64 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "Om_vendt rekkefølge" + +#: ../extensions/rename_series/dlg-rename-series.c:58 msgid "Enumerator" msgstr "" -#: ../extensions/rename_series/dlg-rename-series.c:65 +#: ../extensions/rename_series/dlg-rename-series.c:59 msgid "Original filename" msgstr "Opprinnelig filnavn" -#: ../extensions/rename_series/dlg-rename-series.c:66 +#: ../extensions/rename_series/dlg-rename-series.c:60 msgid "Original extension" msgstr "Opprinnelig filtype" -#: ../extensions/rename_series/dlg-rename-series.c:67 +#: ../extensions/rename_series/dlg-rename-series.c:61 #, fuzzy msgid "Original enumerator" msgstr "_Behold originale filnavn" -#: ../extensions/rename_series/dlg-rename-series.c:68 +#: ../extensions/rename_series/dlg-rename-series.c:62 msgid "Modification date" msgstr "Endringstidspunkt" -#: ../extensions/rename_series/dlg-rename-series.c:69 -#, fuzzy +#: ../extensions/rename_series/dlg-rename-series.c:63 msgid "Digitalization date" -msgstr "Filopprettingsdato" +msgstr "Dato for digitalisering" -#: ../extensions/rename_series/dlg-rename-series.c:70 -#, fuzzy +#: ../extensions/rename_series/dlg-rename-series.c:64 msgid "File attribute" -msgstr "Fil_navn" +msgstr "Filattributt" -#: ../extensions/rename_series/dlg-rename-series.c:556 -#: ../extensions/rename_series/dlg-rename-series.c:687 +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 msgid "Could not rename the files" msgstr "Kunne ikke endre navn på filene" -#: ../extensions/rename_series/dlg-rename-series.c:784 +#: ../extensions/rename_series/dlg-rename-series.c:780 msgid "Could not save the template" msgstr "Kunne ikke lagre mal" -#: ../extensions/rename_series/dlg-rename-series.c:802 +#: ../extensions/rename_series/dlg-rename-series.c:798 msgid "Edit Template" msgstr "Rediger mal" -#: ../extensions/rename_series/dlg-rename-series.c:859 +#: ../extensions/rename_series/dlg-rename-series.c:856 msgid "Old Name" msgstr "Gammelt navn" -#: ../extensions/rename_series/dlg-rename-series.c:870 +#: ../extensions/rename_series/dlg-rename-series.c:867 msgid "New Name" msgstr "Nytt navn" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:944 #, fuzzy msgid "Keep original case" msgstr "Behold originale filnavn" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:945 #, fuzzy msgid "Convert to lower-case" msgstr "Konverter format" -#: ../extensions/rename_series/dlg-rename-series.c:947 +#: ../extensions/rename_series/dlg-rename-series.c:946 #, fuzzy msgid "Convert to upper-case" msgstr "Konverter format" @@ -4340,37 +4252,37 @@ msgid "Resize the selected images" msgstr "Endre størrelse på valgte bilder" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Format" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Endre størrelse på bilder" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 msgid "New dimensions" msgstr "Nye dimensjoner" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "Resize Images" -msgstr "Endre størrelse på bilder" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "_Høyde:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 #, fuzzy msgid "_Preserve original aspect ratios" msgstr "I_nverter aspektraten" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Format" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "pixel" msgstr "piksel" -#: ../extensions/resize_images/dlg-resize-images.c:163 +#: ../extensions/resize_images/dlg-resize-images.c:168 msgid "Resizing images" msgstr "Endrer størrelse på bilder" -#: ../extensions/resize_images/dlg-resize-images.c:358 +#: ../extensions/resize_images/dlg-resize-images.c:412 #, fuzzy msgid "Keep the original format" msgstr "Behold originale filnavn" @@ -4401,44 +4313,79 @@ msgid "Find files" msgstr "Finn filer" -#: ../extensions/search/callbacks.c:133 +#: ../extensions/search/callbacks.c:132 msgid "Search again" msgstr "Søk igjen" #. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/callbacks.c:174 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "Søk" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:195 +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "alle følgende regler" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:196 -#, fuzzy +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" -msgstr "Endre følgende verdierr:" +msgstr "enhver av følgende regler" #: ../extensions/search/gth-search-task.c:181 #, c-format msgid "Files found until now: %s" -msgstr "" +msgstr "Filer funnet så langt: %s" -#: ../extensions/search/gth-search-task.c:270 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "Søker …" -#: ../extensions/search/gth-search-task.c:276 +#: ../extensions/search/gth-search-task.c:277 msgid "Cancel the operation" msgstr "Avbryt operasjonen" -#: ../extensions/search/search.extension.in.in.h:1 +#: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." msgstr "" +#: ../extensions/selections/callbacks.c:77 +msgid "Add to _Selection" +msgstr "Legg til i _utvalg" + +#: ../extensions/selections/callbacks.c:86 +msgid "Selection 1" +msgstr "Utvalg 1" + +#: ../extensions/selections/callbacks.c:91 +msgid "Selection 2" +msgstr "Utvalg 2" + +#: ../extensions/selections/callbacks.c:96 +msgid "Selection 3" +msgstr "Utvalg 3" + +#: ../extensions/selections/callbacks.c:247 +#, c-format +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" + +#: ../extensions/selections/gth-selections-manager.c:239 +#, c-format +msgid "Selection %d" +msgstr "Utvalg %d" + +#: ../extensions/selections/gth-selections-manager.c:242 +#: ../extensions/selections/selections.extension.in.in.h:1 +msgid "Selections" +msgstr "Utvalg" + +#: ../extensions/selections/selections.extension.in.in.h:2 +msgid "Advanced file selection." +msgstr "Avansert filvalg." + #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" msgstr "Ly_sbildevisning" @@ -4447,59 +4394,59 @@ msgid "View as a slideshow" msgstr "Vis som lysbildevisning" -#: ../extensions/slideshow/callbacks.c:406 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "Lysbildevisning" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -msgid "Add files to the playlist" -msgstr "" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "Spilleliste" +msgid "_Personalize" +msgstr "_Personliggjør" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "Tilf_eldig rekkefølge" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "Fjern valgte filer" +msgid "_Transition effect:" +msgstr "" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "Sta_rt på nytt når fullført" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "_Personliggjør" +msgid "R_andom order" +msgstr "Tilf_eldig rekkefølge" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "Sta_rt på nytt når fullført" +msgid "Playlist" +msgstr "Spilleliste" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 -msgid "_Transition effect:" +msgid "Add files to the playlist" msgstr "" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Fjern valgte filer" + #: ../extensions/slideshow/gth-slideshow.c:229 msgid "Playing slideshow" msgstr "Viser lysbildevisning" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 msgid "Choose the files to play" msgstr "Velg filer som skal spilles av" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 msgid "Audio files" msgstr "Lydfiler" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 msgid "Random" msgstr "Tilfeldig" @@ -4530,25 +4477,23 @@ #: ../extensions/slideshow/main.c:319 msgid "Cube from right" -msgstr "" +msgstr "Kube fra høyre" #: ../extensions/slideshow/main.c:325 msgid "Cube from bottom" -msgstr "" +msgstr "Kube fra bunn" #: ../extensions/slideshow/slideshow.extension.in.in.h:2 msgid "View images as a slideshow." msgstr "Vis bilder som lysbildevisning." #: ../extensions/webalbums/callbacks.c:71 -#, fuzzy msgid "_Web Album..." -msgstr "Opprett _web-album..." +msgstr "_Nettalbum …" #: ../extensions/webalbums/callbacks.c:72 -#, fuzzy msgid "Create a static web album" -msgstr "Lager nytt album" +msgstr "Lag et statisk nettalbum" #: ../extensions/webalbums/data/albumthemes/text.h:26 msgid "Click to view the image" @@ -4568,12 +4513,12 @@ msgstr "Indeks" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "Neste" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:105 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "Forrige" @@ -4598,192 +4543,184 @@ msgid "View the previous page" msgstr "Vis forrige side" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 -#, no-c-format -msgid "%C" -msgstr "%C" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -#, no-c-format -msgid "%I" -msgstr "%I" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#, no-c-format -msgid "%i" -msgstr "%i" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 msgid "Adapts to the window width" msgstr "" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -msgid "All images on a single image" -msgstr "" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Nettalbum" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -#, fuzzy -msgid "Image Attributes" -msgstr "Bildeutskrift" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, no-c-format +msgid "%P" +msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Kopier originalfiler til mål" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 #, fuzzy -msgid "Image Page" -msgstr "Bilder per side:" +msgid "_Resize if larger than:" +msgstr "Endre størrelse på bilder" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -msgid "Index Page" +msgid "_Adapt to the window width " msgstr "" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "Show the description, if available" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 +msgid "Index Page" msgstr "" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 #, fuzzy -msgid "Show the following attributes:" -msgstr "Endre følgende verdier:" +msgid "Thumbnail Caption" +msgstr "_Størrelse på miniatyrer:" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 msgid "The current image number" msgstr "" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -#, fuzzy -msgid "The file comment" -msgstr "Sti _til fil" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "The total number of images" msgstr "" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:42 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 #, fuzzy -msgid "Thumbnail Caption" -msgstr "_Størrelse på miniatyrer:" +msgid "The file comment" +msgstr "Sti _til fil" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:43 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 #, fuzzy -msgid "Web Album" -msgstr "Nytt album" +msgid "Image Page" +msgstr "Bilder per side:" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:44 -msgid "_Adapt to the window width " +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" msgstr "" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:45 -msgid "_Copy originals to destination" -msgstr "_Kopier originalfiler til mål" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:49 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 #, fuzzy -msgid "_Resize if larger than:" -msgstr "Endre størrelse på bilder" +msgid "Show the following attributes:" +msgstr "Endre følgende verdier:" -#: ../extensions/webalbums/gth-web-exporter.c:1812 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 #, fuzzy +msgid "Image Attributes" +msgstr "Bildeutskrift" + +#: ../extensions/webalbums/gth-web-exporter.c:1802 msgid "Could not show the destination" -msgstr "Kunne ikke åpne lokasjonen" +msgstr "Kunne ikke vise målet" -#: ../extensions/webalbums/gth-web-exporter.c:1848 +#: ../extensions/webalbums/gth-web-exporter.c:1838 msgid "The album has been created successfully." msgstr "" -#: ../extensions/webalbums/gth-web-exporter.c:2116 -#: ../extensions/webalbums/gth-web-exporter.c:2143 +#: ../extensions/webalbums/gth-web-exporter.c:2106 +#: ../extensions/webalbums/gth-web-exporter.c:2133 msgid "Saving thumbnails" msgstr "Lagrer miniatyrer" -#: ../extensions/webalbums/gth-web-exporter.c:2171 +#: ../extensions/webalbums/gth-web-exporter.c:2161 msgid "Saving HTML pages: Images" msgstr "" -#: ../extensions/webalbums/gth-web-exporter.c:2229 +#: ../extensions/webalbums/gth-web-exporter.c:2219 msgid "Saving HTML pages: Indexes" msgstr "" -#: ../extensions/webalbums/gth-web-exporter.c:2512 +#: ../extensions/webalbums/gth-web-exporter.c:2502 msgid "Copying original images" msgstr "Kopier originalbilder" -#: ../extensions/webalbums/gth-web-exporter.c:2938 +#: ../extensions/webalbums/gth-web-exporter.c:2929 #, fuzzy msgid "Could not find the style folder" msgstr "Kunne ikke slette mappen" -#: ../extensions/webalbums/gth-web-exporter.c:2971 -#, fuzzy +#: ../extensions/webalbums/gth-web-exporter.c:2967 msgid "Could not create a temporary folder" -msgstr "Kunne ikke opprette mappen" +msgstr "Kunne ikke opprette midlertidig mappe" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Nettalbum" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 #, fuzzy msgid "Create static web albums." msgstr "Lager nytt album" -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 -#, fuzzy -msgid "Web Albums" -msgstr "Web-album" +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1251 +#: ../gthumb/gth-browser.c:1817 ../gthumb/gth-browser.c:5973 +#: ../gthumb/gth-browser.c:5992 ../gthumb/gth-browser.c:6016 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Kan ikke laste posisjon «%s»" -#: ../gthumb/dlg-personalize-filters.c:236 +#: ../gthumb/dlg-personalize-filters.c:237 msgid "Filter" msgstr "Filter" -#: ../gthumb/dlg-personalize-filters.c:314 +#: ../gthumb/dlg-personalize-filters.c:315 msgid "Could not save the filter" msgstr "Kunne ikke lagre filter" -#: ../gthumb/dlg-personalize-filters.c:357 +#: ../gthumb/dlg-personalize-filters.c:358 msgid "New Filter" msgstr "Nytt filter" -#: ../gthumb/dlg-personalize-filters.c:386 +#: ../gthumb/dlg-personalize-filters.c:387 msgid "Edit Filter" msgstr "Rediger filter" -#: ../gthumb/dlg-preferences-extensions.c:68 ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 msgid "All" msgstr "Alle" -#: ../gthumb/dlg-preferences-extensions.c:69 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" msgstr "Slått på" -#: ../gthumb/dlg-preferences-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" msgstr "Slått av" -#: ../gthumb/dlg-preferences-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" msgstr "Visning" -#: ../gthumb/dlg-preferences-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "Metadata" -#: ../gthumb/dlg-preferences-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "Filverktøy" -#: ../gthumb/dlg-preferences-extensions.c:76 -#, fuzzy +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" -msgstr "_Begrens til" +msgstr "Listeverktøy" -#: ../gthumb/dlg-preferences-extensions.c:77 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "Importverktøy" -#: ../gthumb/dlg-preferences-extensions.c:78 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" msgstr "Eksportverktøy" -#: ../gthumb/dlg-preferences-extensions.c:215 +#: ../gthumb/dlg-preferences-extensions.c:216 msgid "Could not activate the extension" msgstr "Kunne ikke aktivere utvidelsen" -#: ../gthumb/dlg-preferences-extensions.c:225 +#: ../gthumb/dlg-preferences-extensions.c:226 msgid "Could not deactivate the extension" msgstr "Kunne ikke deaktivere utvidelsen" @@ -4813,7 +4750,7 @@ msgid "File _Format: %s" msgstr "Fil_format: %s" -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:197 +#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 msgid "All Files" msgstr "Alle filer" @@ -4846,30 +4783,30 @@ msgstr "" #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1355 +#: ../gthumb/gio-utils.c:1351 #, c-format msgid "%s of %s" msgstr "" -#: ../gthumb/gio-utils.c:1390 +#: ../gthumb/gio-utils.c:1386 #, c-format msgid "Moving \"%s\" to \"%s\"" msgstr "" -#: ../gthumb/gio-utils.c:1392 +#: ../gthumb/gio-utils.c:1388 #, c-format msgid "Copying \"%s\" to \"%s\"" msgstr "Kopierer «%s» til «%s»" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Moving files" msgstr "Flytter filer" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Copying files" msgstr "Kopierer filer" -#: ../gthumb/gio-utils.c:1734 +#: ../gthumb/gio-utils.c:1751 msgid "Getting file information" msgstr "Henter filinformasjon" @@ -4879,7 +4816,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2749 +#: ../gthumb/glib-utils.c:2945 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4891,13 +4828,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2758 +#: ../gthumb/glib-utils.c:2954 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d.%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:361 +#: ../gthumb/gth-browser-actions-callbacks.c:400 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4905,7 +4842,7 @@ "version." msgstr "" -#: ../gthumb/gth-browser-actions-callbacks.c:365 +#: ../gthumb/gth-browser-actions-callbacks.c:404 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -4913,305 +4850,314 @@ "details." msgstr "" -#: ../gthumb/gth-browser-actions-callbacks.c:369 +#: ../gthumb/gth-browser-actions-callbacks.c:408 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." msgstr "" -#: ../gthumb/gth-browser-actions-callbacks.c:388 +#: ../gthumb/gth-browser-actions-callbacks.c:427 msgid "An image viewer and browser for GNOME." msgstr "Et program for å vise og bla gjennom bilder for GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:391 +#: ../gthumb/gth-browser-actions-callbacks.c:430 msgid "translator_credits" msgstr "Kjartan Maraas " -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_Fil" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "R_ediger" -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "_Gå" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "_Hjelp" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" msgstr "Åpne _med" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" msgstr "I_mporter fra" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" msgstr "E_ksporter til" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" msgstr "Nytt _vindu" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" msgstr "Åpne et nytt vindu" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Åpne" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "Åpne i nytt vindu" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "Rediger forskjellige brukervalg" -#: ../gthumb/gth-browser-actions-entries.h:85 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." msgstr "_Sorter etter …" -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." msgstr "_Filtrer …" -#: ../gthumb/gth-browser-actions-entries.h:96 +#: ../gthumb/gth-browser-actions-entries.h:108 #, fuzzy msgid "Stop loading the current location" msgstr "Kunne ikke åpne lokasjonen" -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:114 #, fuzzy msgid "Reload the current location" msgstr "Kunne ikke åpne lokasjonen" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" msgstr "Vis forrige bilde" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "Vis neste bilde" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "Bytt til fullskjerm" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" msgstr "Forlat fullskjerm" -#: ../gthumb/gth-browser-actions-entries.h:126 ../gthumb/gth-browser.c:3647 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3655 msgid "Go to the previous visited location" msgstr "Gå til sist besøkte lokasjon" -#: ../gthumb/gth-browser-actions-entries.h:131 ../gthumb/gth-browser.c:3668 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3673 msgid "Go to the next visited location" msgstr "Gå til neste besøkte lokasjon" -#: ../gthumb/gth-browser-actions-entries.h:136 ../gthumb/gth-browser.c:3689 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3691 msgid "Go up one level" msgstr "Gå opp et nivå" -#: ../gthumb/gth-browser-actions-entries.h:145 ../gthumb/gth-browser.c:667 +#: ../gthumb/gth-browser-actions-entries.h:161 +msgid "_Location..." +msgstr "_Lokasjon …" + +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "" + +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:673 msgid "_Delete History" msgstr "_Slett historikk" -#: ../gthumb/gth-browser-actions-entries.h:146 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "Delete the list of visited locations" msgstr "Slett listen med besøkte lokasjoner" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "View the folders" msgstr "Vis mapper" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Show information about gthumb" msgstr "Vis informasjon om gThumb" -#: ../gthumb/gth-browser-actions-entries.h:160 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "Contents" msgstr "Innhold" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:192 msgid "Display the gthumb Manual" msgstr "Vis brukerhåndboken for gThumb" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:197 msgid "_Keyboard Shortcuts" msgstr "_Tastatursnarveier" -#: ../gthumb/gth-browser-actions-entries.h:174 +#: ../gthumb/gth-browser-actions-entries.h:206 msgid "_Toolbar" msgstr "Verk_tøylinje" -#: ../gthumb/gth-browser-actions-entries.h:175 +#: ../gthumb/gth-browser-actions-entries.h:207 msgid "View or hide the toolbar of this window" msgstr "Vis eller skjul verktøylinjen i dette vinduet" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:211 msgid "_Statusbar" msgstr "_Statuslinje" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "View or hide the statusbar of this window" msgstr "Vis eller skjul statuslinjen i dette vinduet" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:216 msgid "_Filterbar" msgstr "_Filtreringslinje" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "View or hide the filterbar of this window" msgstr "Vis eller skjul filterverktøylinjen for dette vinduet" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:221 msgid "_Sidebar" msgstr "_Sidelinje" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "View or hide the sidebar of this window" msgstr "Vis eller skjul sidelinjen for dette vinduet" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:226 msgid "_Thumbnail Pane" msgstr "_Miniatyrområde" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:227 #, fuzzy msgid "View or hide the thumbnail pane in viewer mode" msgstr "Vis eller skjul statuslinjen i dette vinduet" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:231 msgid "_Thumbnails" msgstr "_Miniatyrer" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "View thumbnails" msgstr "Vis miniatyrer" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:236 msgid "_Hidden Files" msgstr "_Skjulte filer" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "Show hidden files and folders" msgstr "Vis skjulte filer og mapper" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:242 +#: ../gthumb/gth-browser-actions-entries.h:247 msgid "View file properties" msgstr "Vis egenskaper for fil" -#: ../gthumb/gth-browser-actions-entries.h:214 +#: ../gthumb/gth-browser-actions-entries.h:251 msgid "Edit" msgstr "Rediger" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:252 msgid "Edit file" msgstr "Rediger fil" -#: ../gthumb/gth-browser.c:363 +#: ../gthumb/gth-browser-actions-entries.h:256 +msgid "_Fit Window to Image" +msgstr "Til_pass vinduet til bildet" + +#: ../gthumb/gth-browser-actions-entries.h:257 +#, fuzzy +msgid "Resize the window to the size of the image" +msgstr "Bruk dette vinduet om igjen for å vise andre bilder" + +#: ../gthumb/gth-browser.c:370 #, c-format msgid "Open %s" msgstr "Åpne %s" -#: ../gthumb/gth-browser.c:503 +#: ../gthumb/gth-browser.c:510 msgid "[modified]" msgstr "[endret]" -#: ../gthumb/gth-browser.c:991 +#: ../gthumb/gth-browser.c:1007 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d fil valgt (%s)" msgstr[1] "%d filer valgt (%s)" -#: ../gthumb/gth-browser.c:1026 +#: ../gthumb/gth-browser.c:1042 #, c-format msgid "%s of free space" msgstr "%s av ledig plass" -#: ../gthumb/gth-browser.c:1235 ../gthumb/gth-browser.c:1809 -#: ../gthumb/gth-browser.c:5795 ../gthumb/gth-browser.c:5814 -#: ../gthumb/gth-browser.c:5839 -#, c-format -msgid "Could not load the position \"%s\"" -msgstr "Kan ikke laste posisjon «%s»" - -#: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:1932 +#: ../gthumb/gth-browser.c:1913 ../gthumb/gth-browser.c:1940 #, c-format msgid "No suitable module found for %s" msgstr "" -#: ../gthumb/gth-browser.c:2052 +#: ../gthumb/gth-browser.c:2060 #, c-format msgid "Save changes to file '%s'?" msgstr "Lagre endringer i fil «%s»?" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2065 msgid "If you don't save, changes to the file will be permanently lost." msgstr "" -#: ../gthumb/gth-browser.c:2058 +#: ../gthumb/gth-browser.c:2066 msgid "Do _Not Save" msgstr "I_kke lagre" -#: ../gthumb/gth-browser.c:2863 ../gthumb/gth-browser.c:2883 -#: ../gthumb/gth-source-tree.c:178 ../gthumb/gth-source-tree.c:200 +#: ../gthumb/gth-browser.c:2839 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Kunne ikke endre navn" -#: ../gthumb/gth-browser.c:3328 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3268 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Endret" -#: ../gthumb/gth-browser.c:3648 ../gthumb/gth-browser.c:3669 -#, fuzzy +#: ../gthumb/gth-browser.c:3656 ../gthumb/gth-browser.c:3674 msgid "View the list of visited locations" -msgstr "Slett listen med besøkte lokasjoner" +msgstr "Vis liste med besøkte lokasjoner" -#: ../gthumb/gth-browser.c:3690 +#: ../gthumb/gth-browser.c:3692 #, fuzzy msgid "View the list of upper locations" msgstr "Slett listen med besøkte lokasjoner" -#: ../gthumb/gth-browser.c:5796 -#, fuzzy, c-format +#: ../gthumb/gth-browser.c:5974 +#, c-format msgid "File type not supported" -msgstr "Bildetypen er ikke støttet: %s" +msgstr "Filtypen er ikke støttet" -#: ../gthumb/gth-browser.c:5840 +#: ../gthumb/gth-browser.c:6017 #, fuzzy, c-format msgid "No suitable module found" msgstr "Ingen bilder funnet" -#: ../gthumb/gth-extensions.c:228 -#, fuzzy, c-format +#: ../gthumb/gth-extensions.c:203 +#, c-format msgid "Could not open the module `%s`: %s" -msgstr "Kan ikke flytte mappen «%s»: %s" +msgstr "Kan ikke åpne modulen «%s»: %s" -#: ../gthumb/gth-extensions.c:831 +#: ../gthumb/gth-extensions.c:744 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "" -#: ../gthumb/gth-file-source-vfs.c:116 +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Hjemmemappe" -#: ../gthumb/gth-file-source-vfs.c:121 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" msgstr "Filsystem" -#: ../gthumb/gth-file-source-vfs.c:730 +#: ../gthumb/gth-file-source-vfs.c:739 #, fuzzy msgid "" "The files cannot be moved to the Trash. Do you want to delete them " @@ -5219,23 +5165,23 @@ msgstr "" "Bildene kan ikke flyttes til søppelkurven. Vil du slette dem permanent?" -#: ../gthumb/gth-file-source-vfs.c:741 +#: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" msgstr "Kunne ikke flytte filene til papirkurven" -#: ../gthumb/gth-file-source-vfs.c:785 +#: ../gthumb/gth-file-source-vfs.c:797 #, c-format msgid "Are you sure you want to move \"%s\" to trash?" msgstr "Er du sikker på at du vil flytte «%s» til papirkurven?" -#: ../gthumb/gth-file-source-vfs.c:788 +#: ../gthumb/gth-file-source-vfs.c:801 #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" msgstr[0] "" msgstr[1] "" -#: ../gthumb/gth-file-source-vfs.c:829 +#: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" msgid_plural "" @@ -5243,85 +5189,85 @@ msgstr[0] "" msgstr[1] "" -#: ../gthumb/gth-filterbar.c:405 +#: ../gthumb/gth-filterbar.c:406 #, fuzzy msgid "Hide the filterbar" msgstr "Vis mapper" -#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" -#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "MB" -#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:279 ../gthumb/gth-filter-editor-dialog.c:207 +#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "filer" -#: ../gthumb/gth-filter-editor-dialog.c:254 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" msgstr "stigende" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" msgstr "synkende" -#: ../gthumb/gth-filter-editor-dialog.c:545 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "Ingen grense oppgitt" -#: ../gthumb/gth-folder-tree.c:848 +#: ../gthumb/gth-folder-tree.c:857 msgid "Loading..." msgstr "Laster …" -#: ../gthumb/gth-folder-tree.c:1119 +#: ../gthumb/gth-folder-tree.c:1100 msgid "(Open Parent)" msgstr "(Åpne opphav)" -#: ../gthumb/gth-histogram-view.c:800 +#: ../gthumb/gth-histogram-view.c:826 msgid "Linear scale" msgstr "" -#: ../gthumb/gth-histogram-view.c:812 +#: ../gthumb/gth-histogram-view.c:838 msgid "Logarithmic scale" msgstr "" -#: ../gthumb/gth-histogram-view.c:832 +#: ../gthumb/gth-histogram-view.c:858 msgid "Channel:" msgstr "Kanal:" -#: ../gthumb/gth-histogram-view.c:864 +#: ../gthumb/gth-histogram-view.c:890 msgid "Value" msgstr "Verdi" -#: ../gthumb/gth-histogram-view.c:870 +#: ../gthumb/gth-histogram-view.c:896 msgid "Red" msgstr "Rød" -#: ../gthumb/gth-histogram-view.c:876 +#: ../gthumb/gth-histogram-view.c:902 msgid "Green" msgstr "Grønn" -#: ../gthumb/gth-histogram-view.c:882 +#: ../gthumb/gth-histogram-view.c:908 msgid "Blue" msgstr "Blå" -#: ../gthumb/gth-histogram-view.c:888 +#: ../gthumb/gth-histogram-view.c:914 msgid "Alpha" msgstr "" -#: ../gthumb/gth-histogram-view.c:895 +#: ../gthumb/gth-histogram-view.c:921 msgid "RGB" msgstr "RGB" @@ -5338,7 +5284,7 @@ msgstr "Navn" #: ../gthumb/gth-main-default-metadata.c:40 -#: ../gthumb/gth-main-default-tests.c:248 +#: ../gthumb/gth-main-default-tests.c:284 msgid "Size" msgstr "Størrelse" @@ -5378,23 +5324,23 @@ msgid "dimensions" msgstr "dimensjoner" -#: ../gthumb/gth-main-default-tests.c:225 +#: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Medie" -#: ../gthumb/gth-main-default-tests.c:232 +#: ../gthumb/gth-main-default-tests.c:268 msgid "Text Files" msgstr "Tekstfiler" -#: ../gthumb/gth-main-default-tests.c:240 +#: ../gthumb/gth-main-default-tests.c:276 msgid "Filename" msgstr "Filnavn" -#: ../gthumb/gth-main-default-tests.c:272 +#: ../gthumb/gth-main-default-tests.c:308 msgid "Title (embedded)" msgstr "Tittel (innebygget)" -#: ../gthumb/gth-main-default-tests.c:278 +#: ../gthumb/gth-main-default-tests.c:316 msgid "Description (embedded)" msgstr "Beskrivelse (innebygget)" @@ -5406,7 +5352,7 @@ msgid "No options available for this file type" msgstr "" -#: ../gthumb/gth-progress-dialog.c:142 +#: ../gthumb/gth-progress-dialog.c:144 msgid "Cancel operation" msgstr "Avbryt operasjon" @@ -5414,60 +5360,60 @@ msgid "Saving file information" msgstr "Lagrer filinformasjon" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-tags-entry.c:388 #, c-format msgid "Create tag «%s»" msgstr "Lag tagg «%s»" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:735 msgid "Show all the tags" msgstr "Vis alle tagger" -#: ../gthumb/gth-tags-file.c:234 +#: ../gthumb/gth-tags-file.c:236 msgid "Holidays" msgstr "Ferier" -#: ../gthumb/gth-tags-file.c:235 +#: ../gthumb/gth-tags-file.c:237 msgid "Temporary" msgstr "Midlertidig" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:238 msgid "Screenshots" msgstr "Skjermdump" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:239 msgid "Science" msgstr "Vitenskap" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:240 msgid "Favorite" msgstr "Favoritt" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:241 msgid "Important" msgstr "Viktig" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:242 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:243 msgid "Games" msgstr "Spill" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:244 msgid "Party" msgstr "Fest" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:245 msgid "Birthday" msgstr "Fødselsdag" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:246 msgid "Astronomy" msgstr "Astronomi" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:247 msgid "Family" msgstr "Familie" @@ -5485,18 +5431,18 @@ msgid "is not" msgstr "er ikke" -#: ../gthumb/gth-test-category.c:374 ../gthumb/gth-test-simple.c:800 -#: ../gthumb/gth-test-simple.c:826 ../gthumb/gth-test-simple.c:847 -#: ../gthumb/gth-test-simple.c:873 +#: ../gthumb/gth-test-category.c:394 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:252 msgid "Add a new rule" msgstr "Legg til en ny regel" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:263 msgid "Remove this rule" msgstr "Endre denne regelen" @@ -5540,11 +5486,11 @@ msgid "is after" msgstr "er etter" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:477 msgid "Today" msgstr "I dag" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:485 msgid "Now" msgstr "Nå" @@ -5556,52 +5502,51 @@ msgid "Close _All Windows" msgstr "Lukk _alle vinduer" -#: ../gthumb/gtk-utils.c:704 +#: ../gthumb/gtk-utils.c:551 msgid "Could not display help" msgstr "Kunne ikke vise hjelp" -#: ../gthumb/gtk-utils.c:991 ../gthumb/gtk-utils.c:1000 +#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 msgid "Could not launch the application" msgstr "Kunne ikke starte programmet" -#: ../gthumb/gtk-utils.c:1103 +#: ../gthumb/gtk-utils.c:978 msgid "_Copy Here" msgstr "_Kopier hit" -#: ../gthumb/gtk-utils.c:1108 +#: ../gthumb/gtk-utils.c:983 msgid "_Move Here" msgstr "_Flytt hit" -#: ../gthumb/gtk-utils.c:1113 +#: ../gthumb/gtk-utils.c:988 msgid "_Link Here" msgstr "_Lenk hit" -#: ../gthumb/gtk-utils.c:1122 +#: ../gthumb/gtk-utils.c:997 msgid "Cancel" msgstr "Avbryt" -#: ../gthumb/main.c:72 +#: ../gthumb/main.c:59 msgid "Open a new window" msgstr "Åpne et nytt vindu" -#: ../gthumb/main.c:76 +#: ../gthumb/main.c:63 msgid "Start in fullscreen mode" msgstr "Start i fullskjermmodus" -#: ../gthumb/main.c:80 +#: ../gthumb/main.c:67 msgid "Automatically start a slideshow" msgstr "Start lysbildevisning automatisk" -#: ../gthumb/main.c:84 +#: ../gthumb/main.c:71 msgid "Automatically import digital camera photos" msgstr "Importer bilder dra digitalt kamera automatisk" -#: ../gthumb/main.c:88 +#: ../gthumb/main.c:75 msgid "Show version" msgstr "Vis versjon" -#. command line options -#: ../gthumb/main.c:539 +#: ../gthumb/main.c:344 msgid "- Image browser and viewer" msgstr "- Bla gjennom og se på bilder" diff -Nru gthumb-2.14.3/po/pl.po gthumb-3.0.0/po/pl.po --- gthumb-2.14.3/po/pl.po 2011-11-29 09:20:58.000000000 +0000 +++ gthumb-3.0.0/po/pl.po 2012-03-25 21:09:45.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gthumb\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-17 18:51+0100\n" -"PO-Revision-Date: 2011-11-17 18:52+0100\n" +"POT-Creation-Date: 2012-03-25 22:44+0200\n" +"PO-Revision-Date: 2012-03-25 22:45+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -21,101 +21,109 @@ "X-Poedit-Language: Polish\n" "X-Poedit-Country: Poland\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Plik nie jest prawidłowym plikiem .desktop" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Nierozpoznana wersja pliku .desktop \"%s\"" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "Uruchamianie \"%s\"" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "Program nie przyjmuje dokumentów w wierszu poleceń" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "Nierozpoznana opcja uruchamiania: %d" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "Nie można przekazać adresów URI do wpisu \"Type=Link\" pliku .desktop" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "Nie można uruchomić elementu" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "Rozłącza połączenie z menedżerem sesji" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "Podaje plik zawierający zapisaną konfigurację" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "PLIK" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "Podaje identyfikator zarządzania sesją" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "Identyfikator" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "Opcje zarządzania sesją:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "Wyświetla opcje zarządzania sesją" -#: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "Przeglądarka obrazów" - -#: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "Wyświetlanie i organizacja obrazów" - #. manually set name and icon -#: ../data/gthumb.desktop.in.in.h:3 ../data/gthumb-import.desktop.in.in.h:3 -#: ../gthumb/gth-browser.c:523 ../gthumb/gth-main.c:229 -#: ../gthumb/gth-progress-dialog.c:443 +#: ../data/gthumb.desktop.in.in.h:1 ../gthumb/gth-browser.c:529 +#: ../gthumb/gth-progress-dialog.c:388 ../gthumb/main.c:313 msgid "gThumb" msgstr "gThumb" -#: ../data/gthumb.desktop.in.in.h:4 +#: ../data/gthumb.desktop.in.in.h:2 +msgid "Image Viewer" +msgstr "Przeglądarka obrazów" + +#: ../data/gthumb.desktop.in.in.h:3 msgid "gThumb Image Viewer" msgstr "Przeglądarka obrazów gThumb" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Wyświetlanie i organizacja obrazów" + #: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "Import fotografii z aparatu cyfrowego" +msgid "Import with gThumb" +msgstr "Import za pomocą programu gThumb" #: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "Narzędzie do importu zdjęć" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "Narzędzie do importu zdjęć gThumb" -#: ../data/gthumb.schemas.in.h:1 +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Import fotografii z aparatu cyfrowego" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "" "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want " "to generate thumbnails for all images." @@ -123,81 +131,70 @@ "Dla obrazy powyżej tego rozmiaru (w bajtach) nie zostaną utworzone " "miniatury. Należy użyć 0, aby tworzyć miniatury dla wszystkich obrazów." -#: ../data/gthumb.schemas.in.h:2 -msgid "" -"Possible values are: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" msgstr "" -"Możliwe wartości: actual_size, fit, keep_prev, fit_if_larger, " -"fit_width_if_larger." - -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "Możliwe wartości: high, low." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "Możliwe wartości: light, midtone, dark." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "Możliwe wartości: list, thumbnails." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "Możliwe wartości: small, medium, large." +"Określa, czy zmieniać rozmiar okna tak, aby pasowało do rozmiaru obrazu" -#: ../data/gthumb.schemas.in.h:7 -msgid "" -"Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "" -"Możliwe wartości: system, text_below, text_beside, text_only, icons_only." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Otwieranie plików w aktywnym oknie" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "Możliwe wartości: white, black, checked, none." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +msgid "Whether to reset the scrollbars position after changing image" +msgstr "Określa, czy przywracać położenie pasków przewijania po zmianie obrazu" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to always use a black background." msgstr "Określa, czy zawsze używać czarnego tła." -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" -msgstr "Określa, czy przywracać położenie pasków przewijania po zmianie obrazu" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Możliwe wartości: jpeg, jpg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Możliwe wartości: tiff, tif." + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "" +"Possible values include: general::unsorted, file::name, file::size, file::" +"mtime, exif::photo::datetimeoriginal" +msgstr "" +"Możliwe wartości: general::unsorted, file::name, file::size, file::mtime, " +"exif::photo::datetimeoriginal" #: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "_Rozszerzenia:" + +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "Więcej rozszerzeń..." -#: ../data/ui/extensions-preferences.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:3 msgid "Some extensions are configurable." msgstr "Niektóre rozszerzenia można konfigurować." -#: ../data/ui/extensions-preferences.ui.h:3 -msgid "_Extensions:" -msgstr "_Rozszerzenia:" - #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "_Nazwa filtru:" -#. limit label -#: ../data/ui/filter-editor.ui.h:2 ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 -msgid "_Limit to" -msgstr "_Ograniczenie do" - -#: ../data/ui/filter-editor.ui.h:3 +#: ../data/ui/filter-editor.ui.h:2 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "_Dopasowanie" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 ../gthumb/gth-filter.c:270 +#: ../gthumb/gth-filter.c:342 +msgid "_Limit to" +msgstr "_Ograniczenie do" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "wybrano według" @@ -206,69 +203,74 @@ msgid "Mean:" msgstr "Średnia:" -#: ../data/ui/histogram-info.ui.h:2 +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Odchylenie standardowe:" + +#: ../data/ui/histogram-info.ui.h:4 msgid "Median:" msgstr "Mediana:" +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Piksele:" + #. After the colon there is a percentile. -#: ../data/ui/histogram-info.ui.h:4 +#: ../data/ui/histogram-info.ui.h:8 msgctxt "Pixels" msgid "Max:" msgstr "Maksymalnie:" #. After the colon there is the percentile of selected pixels. -#: ../data/ui/histogram-info.ui.h:6 +#: ../data/ui/histogram-info.ui.h:10 msgctxt "Pixels" msgid "Selected:" msgstr "Wybrano:" -#. After the colon there is the total number of pixels -#: ../data/ui/histogram-info.ui.h:8 -msgid "Pixels:" -msgstr "Piksele:" - -#. Short for "Standard deviation". Try to keep it short in the translation. -#: ../data/ui/histogram-info.ui.h:10 -msgid "Std dev:" -msgstr "Odchylenie standardowe:" +#: ../data/ui/location.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +msgid "_Location:" +msgstr "_Położenie:" #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "_Bez zastępowania poprzedniego pliku" +msgid "Overwrite the old file with the new one?" +msgstr "Zastąpić poprzedni plik nowym?" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Poprzedni plik:" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "Nazwa pliku:" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Rozmiar:" + +#: ../data/ui/overwrite-dialog.ui.h:5 msgid "Modified:" msgstr "Zmodyfikowano:" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "Nowy plik:" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "Poprzedni plik:" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "_Zastąp poprzedni plik" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "Zastąp _wszystkie pliki" - #: ../data/ui/overwrite-dialog.ui.h:8 -msgid "Overwrite the old file with the new one?" -msgstr "Zastąpić poprzedni plik nowym?" +msgid "Do not overwrite _the old file" +msgstr "_Bez zastępowania poprzedniego pliku" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "Size:" -msgstr "Rozmiar:" +msgid "Overwrite _all files" +msgstr "Zastąp _wszystkie pliki" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -291,185 +293,181 @@ msgstr "_Inne filtry:" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Aktywowanie elementów dwukrotnym kliknięciem" +msgid "below the folder list" +msgstr "poniżej listy katalogów" #: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Aktywowanie elementów pojedynczym kliknięciem" +msgid "on the right" +msgstr "po prawej" #: ../data/ui/preferences.ui.h:3 -msgid "Appearance" -msgstr "Wygląd" +msgid "gThumb Preferences" +msgstr "Preferencje programu gThumb" #: ../data/ui/preferences.ui.h:4 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "_Pytanie o potwierdzenie przed usunięciem plików lub katalogów" +msgid "_Toolbar style:" +msgstr "Styl paska _narzędziowego:" #: ../data/ui/preferences.ui.h:5 -msgid "Ask whether to save _modified files" -msgstr "Pytanie o zapis z_modyfikowanych plików" +msgid "T_humbnails in viewer:" +msgstr "_Miniatury w przeglądarce:" -#: ../data/ui/preferences.ui.h:6 ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Czarny" +#: ../data/ui/preferences.ui.h:6 +msgid "System settings" +msgstr "Ustawienia systemowe" -#: ../data/ui/preferences.ui.h:7 ../gthumb/dlg-preferences-extensions.c:72 -#: ../gthumb/gth-browser-actions-entries.h:150 -msgid "Browser" -msgstr "Przeglądarka" +#: ../data/ui/preferences.ui.h:7 +msgid "Text below icons" +msgstr "Tekst pod ikonami" #: ../data/ui/preferences.ui.h:8 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 -msgid "Caption" -msgstr "Opis" +msgid "Text beside icons" +msgstr "Tekst obok ikon" -#: ../data/ui/preferences.ui.h:9 ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "Szachownica" +#: ../data/ui/preferences.ui.h:9 +msgid "Icons only" +msgstr "Tylko ikony" #: ../data/ui/preferences.ui.h:10 -msgid "Choose startup folder" -msgstr "Wybór katalogu startowego" +msgid "Text only" +msgstr "Tylko tekst" #: ../data/ui/preferences.ui.h:11 -msgid "D_etermine image type from content (slower)" -msgstr "_Określanie typu obrazu na podstawie zawartości (wolniejsze)" +msgid "on the bottom" +msgstr "na dole" -#: ../data/ui/preferences.ui.h:12 ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Dopasowanie do szerokości, jeśli większy" +#: ../data/ui/preferences.ui.h:12 +msgid "on the side" +msgstr "na boku" -#: ../data/ui/preferences.ui.h:13 ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Dopasowanie do okna" +#: ../data/ui/preferences.ui.h:13 +msgid "File _properties in browser:" +msgstr "_Właściwości pliku w przeglądarce:" -#: ../data/ui/preferences.ui.h:14 ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Dopasowanie do okna, jeśli większy" +#: ../data/ui/preferences.ui.h:14 +msgid "Appearance" +msgstr "Wygląd" #: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "Używanie ustawień programu Nautilus" +msgid "Go to last _visited location" +msgstr "Przechodzenie do _ostatnio odwiedzonego położenia" #: ../data/ui/preferences.ui.h:16 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:393 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "Ogólne" +msgid "Go to this _folder:" +msgstr "Przejście do _katalogu:" #: ../data/ui/preferences.ui.h:17 -msgid "Go to last _visited location" -msgstr "Przechodzenie do _ostatnio odwiedzonego położenia" +msgid "Choose startup folder" +msgstr "Wybór katalogu startowego" #: ../data/ui/preferences.ui.h:18 -msgid "Go to this _folder:" -msgstr "Przejście do _katalogu:" +msgid "Set to C_urrent" +msgstr "Ustaw na _bieżący" -#: ../data/ui/preferences.ui.h:19 ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Tylko ikony" +#: ../data/ui/preferences.ui.h:19 +msgid "_Reuse the active window to open files" +msgstr "Uży_cie aktywnego okna do otwierania plików" -#: ../data/ui/preferences.ui.h:20 ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Zachowanie poprzedniego powiększenia" +#: ../data/ui/preferences.ui.h:20 +msgid "On startup:" +msgstr "Podczas uruchamiania:" #: ../data/ui/preferences.ui.h:21 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-crop.c:448 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 -#: ../extensions/file_tools/gth-file-tool-rotate.c:414 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "Brak" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "_Pytanie o potwierdzenie przed usunięciem plików lub katalogów" #: ../data/ui/preferences.ui.h:22 -msgid "On startup:" -msgstr "Podczas uruchamiania:" +msgid "Ask whether to save _modified files" +msgstr "Pytanie o zapis z_modyfikowanych plików" #: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:192 +msgid "_Store metadata inside files if possible" +msgstr "Prze_chowywanie metadanych w plikach, jeśli to możliwe" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 msgid "Other" msgstr "Inne" -#: ../data/ui/preferences.ui.h:24 -msgid "Set image to actual size" -msgstr "Ustawia _bieżący rozmiar obrazu" - #: ../data/ui/preferences.ui.h:25 -msgid "Set to C_urrent" -msgstr "Ustaw na _bieżący" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Ogólne" -#. Set widgets data. -#: ../data/ui/preferences.ui.h:26 ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Ustawienia systemowe" +#: ../data/ui/preferences.ui.h:26 +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Opis" #: ../data/ui/preferences.ui.h:27 -msgid "T_humbnails in viewer:" -msgstr "_Miniatury w przeglądarce:" - -#: ../data/ui/preferences.ui.h:28 ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Tekst pod ikonami" +msgid "Thumbnail _size:" +msgstr "_Rozmiar miniatur:" -#: ../data/ui/preferences.ui.h:29 ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Tekst obok ikon" - -#: ../data/ui/preferences.ui.h:30 ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Tylko tekst" +#: ../data/ui/preferences.ui.h:28 +msgid "48" +msgstr "48" + +#: ../data/ui/preferences.ui.h:29 +msgid "64" +msgstr "64" + +#: ../data/ui/preferences.ui.h:30 +msgid "85" +msgstr "85" #: ../data/ui/preferences.ui.h:31 -msgid "Thumbnail _size:" -msgstr "_Rozmiar miniatur:" +msgid "95" +msgstr "95" -#: ../data/ui/preferences.ui.h:32 ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Biały" +#: ../data/ui/preferences.ui.h:32 +msgid "112" +msgstr "112" #: ../data/ui/preferences.ui.h:33 -msgid "_Store metadata inside files if possible" -msgstr "Prze_chowywanie metadanych w plikach, jeśli to możliwe" +msgid "128" +msgstr "128" #: ../data/ui/preferences.ui.h:34 -msgid "_Toolbar style:" -msgstr "Styl paska _narzędziowego:" +msgid "164" +msgstr "164" #: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "Preferencje programu gthumb" +msgid "200" +msgstr "200" #: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "na dole" +msgid "256" +msgstr "256" #: ../data/ui/preferences.ui.h:37 -msgid "on the side" -msgstr "na boku" +msgid "D_etermine image type from content (slower)" +msgstr "_Określanie typu obrazu na podstawie zawartości (wolniejsze)" + +#: ../data/ui/preferences.ui.h:38 ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Przeglądarka" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" msgstr "Porządkowanie według" #: ../data/ui/sort-order.ui.h:2 -msgid "_Inverse order" -msgstr "_Odwrócona kolejność" - -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" msgstr "_Porządkowanie według:" +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "_Odwrócona kolejność" + #: ../extensions/23hq/23hq.extension.in.in.h:1 msgid "23" msgstr "23" @@ -478,23 +476,23 @@ msgid "Upload images to 23hq.com" msgstr "Wysyłanie obrazów do serwisu 23hq.com" -#: ../extensions/23hq/callbacks.c:67 +#: ../extensions/23hq/callbacks.c:68 msgid "_23..." msgstr "_23..." -#: ../extensions/23hq/callbacks.c:68 +#: ../extensions/23hq/callbacks.c:69 msgid "Upload photos to 23" msgstr "Wysyłanie obrazów do serwisu 23" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -msgid "Add bookmarks support." -msgstr "Dodaje obsługę zakładek." - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "Zakładki" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Dodaje obsługę zakładek." + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 @@ -520,6 +518,7 @@ #: ../extensions/rename_series/rename_series.extension.in.in.h:3 #: ../extensions/resize_images/resize_images.extension.in.in.h:3 #: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" @@ -554,13 +553,13 @@ msgstr "_Zakładki:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "_Położenie" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "_Nazwa" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Położenie" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "Nie można usunąć zakładki" @@ -594,16 +593,16 @@ msgstr "Bieżący katalog i jego p_odkatalogi" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "Źródło" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "_Wybrane pliki" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Źródło" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Zapisz na płytę" @@ -620,9 +619,9 @@ #: ../extensions/catalogs/actions.c:92 ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 -#: ../extensions/file_manager/actions.c:65 -#: ../extensions/list_tools/gth-script-editor-dialog.c:319 -#: ../gthumb/gth-filter-editor-dialog.c:491 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format msgid "No name specified" msgstr "Nie podano nazwy" @@ -630,7 +629,7 @@ #: ../extensions/catalogs/actions.c:99 ../extensions/catalogs/actions.c:220 #: ../extensions/catalogs/dlg-add-to-catalog.c:281 #: ../extensions/catalogs/dlg-add-to-catalog.c:401 -#: ../extensions/file_manager/actions.c:72 +#: ../extensions/file_manager/actions.c:75 #, c-format msgid "Invalid name. The following characters are not allowed: %s" msgstr "Nieprawidłowa nazwa. Następujące znaki nie są dozwolone: %s" @@ -638,7 +637,8 @@ #: ../extensions/catalogs/actions.c:155 ../extensions/catalogs/actions.c:267 #: ../extensions/catalogs/dlg-add-to-catalog.c:338 #: ../extensions/catalogs/dlg-add-to-catalog.c:448 -#: ../extensions/file_manager/actions.c:103 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 msgid "Name already used" msgstr "Nazwa jest już użyta" @@ -655,7 +655,7 @@ #: ../extensions/catalogs/actions.c:181 ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 #: ../extensions/catalogs/dlg-add-to-catalog.c:474 -#: ../extensions/file_manager/actions.c:133 +#: ../extensions/file_manager/actions.c:136 msgid "C_reate" msgstr "Ut_wórz" @@ -673,7 +673,7 @@ msgid "Could not remove the catalog" msgstr "Nie można usunąć katalogu" -#: ../extensions/catalogs/actions.c:361 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" msgstr "Na pewno usunąć \"%s\"?" @@ -691,8 +691,7 @@ msgstr "Przechodzi do katalogu zawierającego zaznaczony plik" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/edit_metadata/callbacks.c:116 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:86 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Inne..." @@ -735,29 +734,29 @@ #: ../extensions/catalogs/callbacks.c:497 #: ../extensions/catalogs/callbacks.c:502 -#: ../extensions/photo_importer/dlg-photo-importer.c:359 -#: ../extensions/photo_importer/dlg-photo-importer.c:399 -#: ../gthumb/gth-file-list.c:45 ../gthumb/gth-folder-tree.c:874 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(Pusty)" -#: ../extensions/catalogs/callbacks.c:695 +#: ../extensions/catalogs/callbacks.c:697 msgid "Catalog Properties" msgstr "Właściwości katalogu" -#: ../extensions/catalogs/callbacks.c:709 +#: ../extensions/catalogs/callbacks.c:711 msgid "Organize" msgstr "Organizuj" -#: ../extensions/catalogs/callbacks.c:710 +#: ../extensions/catalogs/callbacks.c:712 msgid "Automatically organize files by date" msgstr "Automatycznie organizuje pliki według daty" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1024 +#: ../extensions/catalogs/gth-catalog.c:1025 msgid "Catalogs" msgstr "Katalogi" @@ -774,114 +773,114 @@ msgstr "K_atalogi:" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "Nowa _kolecja" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "_Nowy katalog" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "Nowa _kolecja" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:922 -#: ../extensions/webalbums/gth-web-exporter.c:1852 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1842 msgid "_View the destination" msgstr "_Wyświetl miejsce docelowe" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "Katalog" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:201 +#: ../gthumb/gth-file-properties.c:212 msgid "Properties" msgstr "Właściwości" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Nazwa:" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "_Data:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "_Nazwa:" +msgid "Catalog" +msgstr "Katalog" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -msgid "Catalog _Preview:" -msgstr "Podgląd _katalogu:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 -msgid "Organization:" -msgstr "Organizacja:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "Organizuj pliki" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" msgstr "Organizowanie plików" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Organizacja:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Select All" msgstr "Zaznacz wszystko" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "Odznacz wszystko" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "Podgląd _katalogu:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:470 -#: ../gthumb/gth-main-default-tests.c:264 +#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Data wykonania zdjęcia" #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -#: ../gthumb/gth-main-default-tests.c:256 +#: ../gthumb/gth-main-default-tests.c:292 msgid "File modified date" msgstr "Data modyfikacji pliku" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "Ignorowanie katalog zawierających jeden plik" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "Umieszczanie pojedynczych plików w katalogu:" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "Pojedyncze" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:261 +#: ../extensions/comments/main.c:159 msgid "Tag" msgstr "Etykieta" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 -#: ../gthumb/gth-main-default-tests.c:284 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "etykieta" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "Etykieta (osadzona)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "_Grupowanie plików według:" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "P_rzeszukiwanie podkatalogów" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Ignorowanie katalog zawierających jeden plik" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Umieszczanie pojedynczych plików w katalogu:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "etykieta" +msgid "Singles" +msgstr "Pojedyncze" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -889,7 +888,7 @@ msgstr "Nie można dodać plików do katalogu" #: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/search/gth-search-task.c:352 +#: ../extensions/search/gth-search-task.c:356 msgid "Could not create the catalog" msgstr "Nie można utworzyć katalogu" @@ -897,7 +896,7 @@ msgid "Could not save the catalog" msgstr "Nie można zapisać katalogu" -#: ../extensions/catalogs/dlg-catalog-properties.c:166 +#: ../extensions/catalogs/dlg-catalog-properties.c:159 msgid "Could not load the catalog" msgstr "Nie można wczytać katalogu" @@ -907,52 +906,53 @@ "Pliki zostaną zorganizowane w katalogach. Żaden plik nie zostanie " "przeniesiony na dysku." -#: ../extensions/catalogs/gth-catalog.c:1145 ../extensions/comments/main.c:43 +#: ../extensions/catalogs/gth-catalog.c:1122 ../extensions/comments/main.c:44 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Etykiety" -#: ../extensions/catalogs/gth-file-source-catalogs.c:848 +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 #, c-format msgid "The catalog '%s' already exists, do you want to overwrite it?" msgstr "Katalog \"%s\" już istnieje. Zastąpić go?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:850 +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 #, c-format msgid "The library '%s' already exists, do you want to overwrite it?" msgstr "Kolekcja \"%s\" już istnieje. Zastąpić ją?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:858 +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 msgid "Over_write" msgstr "_Zastąp" -#: ../extensions/catalogs/gth-file-source-catalogs.c:976 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 msgid "Cannot move the files" msgstr "Nie można przenieść plików" -#: ../extensions/catalogs/gth-file-source-catalogs.c:978 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 msgid "Cannot copy the files" msgstr "Nie można skopiować plików" -#: ../extensions/catalogs/gth-file-source-catalogs.c:983 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 msgid "Invalid destination." msgstr "Nieprawidłowe miejsce docelowe." -#: ../extensions/catalogs/gth-file-source-catalogs.c:1030 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format msgid "Copying files to '%s'" msgstr "Kopiowanie plików do \"%s\"" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1283 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1388 msgid "Could not remove the files from the catalog" msgstr "Nie można usunąć plików z katalogu" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1341 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:683 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:711 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1214 -#: ../extensions/search/gth-search.c:295 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1446 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Nieprawidłowy format pliku" @@ -977,86 +977,91 @@ msgid "Change the files date" msgstr "Zmiana daty plików" -#: ../extensions/change_date/data/gthumb_change_date.schemas.in.h:1 -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "Możliwe wartości: pixels, percentage" - #: ../extensions/change_date/data/ui/change-date.ui.h:1 -msgid "+" -msgstr "+" +msgid "Change Date" +msgstr "Zmiana daty" #: ../extensions/change_date/data/ui/change-date.ui.h:2 -msgid "-" -msgstr "-" +msgid "Change the following values:" +msgstr "Zmienianie następujących wartości:" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -msgid "A_djust by" -msgstr "_Dostosowanie według" +msgid "_Last modified date" +msgstr "Data _ostatniej modyfikacji" #: ../extensions/change_date/data/ui/change-date.ui.h:4 -msgid "Change Date" -msgstr "Zmiana daty" +msgid "Co_mment date" +msgstr "Data ko_mentarza" #: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Change the following values:" -msgstr "Zmienianie następujących wartości:" +msgid "Exif DateTimeOriginal tag" +msgstr "Znacznik DateTimeOriginal formatu Exif" #: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Change to:" msgstr "Zmiana na:" #: ../extensions/change_date/data/ui/change-date.ui.h:7 -msgid "Co_mment date" -msgstr "Data ko_mentarza" +msgid "The _following date:" +msgstr "_Następująca data:" #: ../extensions/change_date/data/ui/change-date.ui.h:8 -msgid "Date p_hoto was taken" -msgstr "Data wykonania _zdjęcia" - -#: ../extensions/change_date/data/ui/change-date.ui.h:9 -msgid "Exif DateTimeOriginal tag" -msgstr "Znacznik DateTimeOriginal formatu Exif" - -#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "Data _modyfikacji pliku" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File c_reation date" msgstr "_Data utworzenia pliku" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 -msgid "The _following date:" -msgstr "_Następująca data:" +#: ../extensions/change_date/data/ui/change-date.ui.h:10 +msgid "Date p_hoto was taken" +msgstr "Data wykonania _zdjęcia" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 -msgid "_Last modified date" -msgstr "Data _ostatniej modyfikacji" +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "A_djust by" +msgstr "_Dostosowanie według" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "hours" msgstr "godziny" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "minutes" msgstr "minuty" -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "sekundy" -#: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "Dodawanie komentarzy i etykiet do każdego typu pliku." +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +msgid "+" +msgstr "+" -#: ../extensions/comments/comments.extension.in.in.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:16 +msgid "-" +msgstr "-" + +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Zaimportuj osadzone metadane" + +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "" +"Importuje metadane przechowywane w plikach do systemu komentarzy programu " +"gThumb" + +#: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "Komentarze i etykiety" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Dodawanie komentarzy i etykiet do każdego typu pliku." + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Preferencje" @@ -1064,37 +1069,37 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Synchronizowanie z osadzonymi metadanymi" -#: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:111 +#: ../extensions/comments/main.c:34 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Komentarz" -#: ../extensions/comments/main.c:39 ../gthumb/gth-main-default-metadata.c:46 +#: ../extensions/comments/main.c:40 ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Tytuł" -#: ../extensions/comments/main.c:40 ../extensions/comments/main.c:245 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:143 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:16 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Opis" -#: ../extensions/comments/main.c:41 ../extensions/comments/main.c:253 +#: ../extensions/comments/main.c:42 ../extensions/comments/main.c:151 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Miejsce" -#: ../extensions/comments/main.c:42 ../gthumb/gth-main-default-metadata.c:51 +#: ../extensions/comments/main.c:43 ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Data" -#: ../extensions/comments/main.c:44 ../gthumb/gth-main-default-metadata.c:54 +#: ../extensions/comments/main.c:45 ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Ocena" @@ -1119,7 +1124,7 @@ msgstr "Utwórz ścianę obrazu" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" msgstr "Odbitka stykowa" @@ -1128,24 +1133,32 @@ msgstr "Tworzenie obrazu indeksu zawierającego miniatury zaznaczonych plików." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid "Background" -msgstr "Tło" +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-crop.c:454 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Brak" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -msgid "C_olor:" -msgstr "K_olor:" +msgid "Simple" +msgstr "Zwykły" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Caption:" -msgstr "Opis:" +msgid "Simple with shadow" +msgstr "Zwykły z cieniem" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 -msgid "Frame" -msgstr "Ramka" +msgid "Shadow only" +msgstr "Tylko cień" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 +msgid "Slide" +msgstr "Slajd" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 msgid "Inward Shadow" msgstr "Cień do wewnątrz" @@ -1153,242 +1166,244 @@ msgid "Outward Shadow" msgstr "Cień od zewnątrz" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 -msgid "Select a color" -msgstr "Wybór koloru" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -msgid "Select a font" -msgstr "Wybór czcionki" +msgid "Background" +msgstr "Tło" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -msgid "Shadow only" -msgstr "Tylko cień" +msgid "_Solid color" +msgstr "Je_dnolity kolor" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -msgid "Simple" -msgstr "Zwykły" +msgid "_Gradient" +msgstr "_Gradient" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -msgid "Simple with shadow" -msgstr "Zwykły z cieniem" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +msgid "_Horizontal:" +msgstr "_Poziomo:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -msgid "Slide" -msgstr "Slajd" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 +msgid "_Vertical:" +msgstr "P_ionowo:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#: ../extensions/rename_series/dlg-rename-series.c:63 -msgid "Text" -msgstr "Tekst" +msgid "Select a color" +msgstr "Wybór koloru" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "_Footer:" -msgstr "_Stopka:" +msgid "Frame" +msgstr "Ramka" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -msgid "_Gradient" -msgstr "_Gradient" +msgid "_Style:" +msgstr "_Styl:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "_Header:" -msgstr "_Nagłówek:" +msgid "C_olor:" +msgstr "K_olor:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Horizontal:" -msgstr "_Poziomo:" +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Tekst" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "_Nagłówek:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -msgid "_Solid color" -msgstr "Je_dnolity kolor" +msgid "Select a font" +msgstr "Wybór czcionki" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 -msgid "_Style:" -msgstr "_Styl:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "_Stopka:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "_Vertical:" -msgstr "P_ionowo:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Opis:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "Bieżący numer strony" -#. translate only the text in the curly brackets #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, no-c-format -msgid "%D{ format }" -msgstr "%D{ format }" +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Całkowita liczba stron" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -msgid "All images on a single page" -msgstr "Wszystkie obrazy na jednej stronie" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:6 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:10 -msgid "Choose destination folder" -msgstr "Wybór katalogu docelowego" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Kod specjalny" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -msgid "Columns:" -msgstr "Kolumny:" +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ format }" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -msgid "Create _HTML image map" -msgstr "Utwórz mapę _HTML obrazu" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -msgid "Create a new theme" -msgstr "Utwórz nowy motyw" +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "Bieżąca data" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -msgid "Delete the selected theme" -msgstr "Usuń zaznaczony motyw" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "Miejsce _docelowe:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 -msgid "Edit the selected theme" -msgstr "Modyfikuj zaznaczony motyw" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "Wybór katalogu docelowego" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 msgid "File_name:" msgstr "_Nazwa pliku:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Nowa cyfra wyliczania" + #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Images per page:" -msgstr "Obrazy na stronę:" +msgid "Create _HTML image map" +msgstr "Utwórz mapę _HTML obrazu" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Layout" -msgstr "Układ" +#: ../extensions/pixbuf_savers/preferences.c:134 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Zapisywanie" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 -msgid "New enumerator digit" -msgstr "Nowa cyfra wyliczania" +msgid "Create a new theme" +msgstr "Utwórz nowy motyw" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -msgid "Re_verse order" -msgstr "Od_wrócony porządek" +msgid "Edit the selected theme" +msgstr "Modyfikuj zaznaczony motyw" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -msgid "S_ort:" -msgstr "P_orządkowanie:" +msgid "Delete the selected theme" +msgstr "Usuń zaznaczony motyw" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "Saving" -msgstr "Zapisywanie" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:20 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -msgid "Special code" -msgstr "Kod specjalny" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Motyw" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -msgid "Sq_uared" -msgstr "_Kwadratowo" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Kolumny:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -msgid "The current date" -msgstr "Bieżąca data" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Obrazy na stronę:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "The current page number" -msgstr "Bieżący numer strony" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Wszystkie obrazy na jednej stronie" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The total number of pages" -msgstr "Całkowita liczba stron" +msgid "_All pages with the same size" +msgstr "_Wszystkie strony tego samego rozmiaru" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "Theme" -msgstr "Motyw" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Układ" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 -msgid "Thumbnails" -msgstr "Miniatury" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "P_orządkowanie:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 -msgid "_All pages with the same size" -msgstr "_Wszystkie strony tego samego rozmiaru" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "Od_wrócony porządek" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "_Destination:" -msgstr "Miejsce _docelowe:" +msgid "_Size:" +msgstr "_Rozmiar:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "_Kwadratowo" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -msgid "_Size:" -msgstr "_Rozmiar:" +msgid "Thumbnails" +msgstr "Miniatury" -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" msgstr "Ściana obrazu" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:483 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:495 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:509 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 msgid "Could not save the theme" msgstr "Nie można zapisać motywu" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:654 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 msgid "Could not delete the theme" msgstr "Nie można usunąć motywu" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 msgid "Creating images" msgstr "Tworzenie obrazów" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 msgid "Generating thumbnails" msgstr "Tworzenie miniatur" @@ -1400,15 +1415,15 @@ msgid "Footer" msgstr "Stopka" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:197 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 msgid "Theme Properties" msgstr "Właściwości motywu" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:212 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 msgid "Copy _From" msgstr "Skopiuj _z" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:348 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 msgid "New theme" msgstr "Nowy motyw" @@ -1428,34 +1443,34 @@ msgid "Save images in a different format" msgstr "Zapisywanie obrazów w innym formacie" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 msgid "Convert Format" msgstr "Konwersja formatu" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Nowy format" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "Miejsce docelowe" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "Nowy format" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Use the original image folder" msgstr "_Użycie katalogu pierwotnego obrazu" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/dlg-convert-format.c:93 msgid "Converting images" msgstr "Konwertowanie obrazów" -#: ../extensions/desktop_background/actions.c:203 +#: ../extensions/desktop_background/actions.c:162 msgid "Could not show the desktop background properties" msgstr "Nie można wyświetlić właściwości tła pulpitu" -#: ../extensions/desktop_background/actions.c:269 -#: ../extensions/desktop_background/actions.c:287 +#: ../extensions/desktop_background/actions.c:228 +#: ../extensions/desktop_background/actions.c:246 msgid "Could not set the desktop background" msgstr "Nie można ustawić tła pulpitu" @@ -1472,51 +1487,51 @@ msgid "Desktop background" msgstr "Tło pulpitu" -#: ../extensions/edit_metadata/actions.c:129 +#: ../extensions/edit_metadata/actions.c:66 msgid "" "Are you sure you want to permanently delete the metadata of the selected " "files?" msgstr "Na pewno trwale usunąć metadane zaznaczonych plików?" -#: ../extensions/edit_metadata/actions.c:136 +#: ../extensions/edit_metadata/actions.c:73 msgid "If you delete the metadata, it will be permanently lost." msgstr "Usunięcie metadanych spowoduje ich bezpowrotne utracenie." -#: ../extensions/edit_metadata/callbacks.c:108 +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "_Etykiety" -#: ../extensions/edit_metadata/callbacks.c:112 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" msgstr "Modyfikuje komentarze i inne informacje zaznaczonych plików" -#: ../extensions/edit_metadata/callbacks.c:117 -msgid "Choose another tag" -msgstr "Wybierz inną etykietę" +#: ../extensions/edit_metadata/callbacks.c:107 +msgid "Set the tags of the selected files" +msgstr "Ustawia etykiety zaznaczonych plików" -#: ../extensions/edit_metadata/callbacks.c:121 +#: ../extensions/edit_metadata/callbacks.c:112 msgid "Delete Metadata" msgstr "Usuń metadane" -#: ../extensions/edit_metadata/callbacks.c:122 +#: ../extensions/edit_metadata/callbacks.c:113 msgid "Delete the comment and the embedded metadata of the selected files" msgstr "Usuwa komentarze i osadzone metadane zaznaczonych plików" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "_Opis:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Miejsce:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "_Etykiety:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "_Miejsce:" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "_Ocena:" @@ -1525,72 +1540,80 @@ msgid "_Title:" msgstr "_Tytuł:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:63 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "Nie można zapisać metadanych pliku" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:150 -#: ../gthumb/gth-overwrite-dialog.c:166 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "Nie można odczytać informacji o pliku" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Modyfikowanie metadanych" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Allow to edit files metadata." msgstr "Umożliwienie modyfikowania metadanych plików." -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 -msgid "Edit metadata" -msgstr "Modyfikowanie metadanych" +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "Metadane pliku %s" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d plik" +msgstr[1] "%d pliki" +msgstr[2] "%d plików" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +msgid "Sa_ve and Close" +msgstr "_Zapisz i zamknij" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:467 +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Zapisywanie tylko zmie_nionych pól" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:547 msgid "No date" msgstr "Brak daty" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:468 +#: ../extensions/edit_metadata/gth-edit-general-page.c:548 msgid "The following date" msgstr "Następująca data" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:469 -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Bieżąca data" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:471 +#: ../extensions/edit_metadata/gth-edit-general-page.c:551 msgid "Last modified date" msgstr "Data ostatniej modyfikacji" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:472 +#: ../extensions/edit_metadata/gth-edit-general-page.c:552 msgid "File creation date" msgstr "Data utworzenia pliku" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:553 msgid "Do not modify" msgstr "Bez modyfikacji" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:105 -msgid "Save only cha_nged fields" -msgstr "Zapisywanie tylko zmie_nionych pól" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:161 -#, c-format -msgid "%s Metadata" -msgstr "Metadane pliku %s" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:165 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:332 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d plik" -msgstr[1] "%d pliki" -msgstr[2] "%d plików" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Nowa etykieta" +msgid "%s Tags" +msgstr "Etykiety pliku %s" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 msgid "Assign Tags" msgstr "Przydzielenie etykiet" @@ -1616,53 +1639,53 @@ msgstr "Przykład rozszerzenia." #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "_Tytuł i autor:" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "_Prawa autorskie:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "_Kraj:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "_Kod:" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "_Zasługi:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "State/Province:" -msgstr "Stan/województwo:" - #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_Byline:" -msgstr "_Autor:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "Ż_ródło:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_City:" -msgstr "_Miasto:" +msgid "_Urgency:" +msgstr "_Ważność:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -msgid "_Code:" -msgstr "_Kod:" +msgid "_Object Name:" +msgstr "Nazwa _obiektu:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "_Tytuł i autor:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Language:" -msgstr "_Język:" +msgid "_Byline:" +msgstr "_Autor:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -msgid "_Object Name:" -msgstr "Nazwa _obiektu:" +msgid "_City:" +msgstr "_Miasto:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -msgid "_Source:" -msgstr "Ż_ródło:" +msgid "_Language:" +msgstr "_Język:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 -msgid "_Urgency:" -msgstr "_Ważność:" +msgid "State/Province:" +msgstr "Stan/województwo:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1716,11 +1739,11 @@ msgid "XMP Attached" msgstr "Dołączone XMP" -#: ../extensions/exiv2_tools/main.c:255 +#: ../extensions/exiv2_tools/main.c:256 msgid "date photo was taken" msgstr "data wykonania zdjęcia" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" msgstr "Współdziel" @@ -1733,76 +1756,76 @@ msgstr "Wysyła zdjęcia do serwisu Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -msgid "1024 x 1024" -msgstr "1024 x 1024" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +msgid "Export to Flickr" +msgstr "Wyeksportuj do serwisu Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -msgid "1280 x 1280" -msgstr "1280 x 1280" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "_Wyślij" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -msgid "1600 x 1600" -msgstr "1600 x 1600" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +msgid "_Account:" +msgstr "_Konto:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -msgid "2048 x 2048" -msgstr "2048 x 2048" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Modyfikuj konta" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -msgid "720 x 720" -msgstr "720 x 720" - -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "A_lbum:" msgstr "A_lbum:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "Add a new album" msgstr "Dodaj nowy album" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +msgid "Resize the images if larger than this size" +msgstr "Zmiana rozmiaru obrazów, jeśli jest większy niż dany rozmiar" + #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "Modyfikuj konta" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +msgid "_Resize to:" +msgstr "Zmiana _rozmiaru na:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "Wyeksportuj do serwisu Flickr" +msgid "720 x 720" +msgstr "720 x 720" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 -msgid "Resize the images if larger than this size" -msgstr "Zmiana rozmiaru obrazów, jeśli jest większy niż dany rozmiar" +msgid "1024 x 1024" +msgstr "1024 x 1024" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -msgid "_Account:" -msgstr "_Konto:" +msgid "1280 x 1280" +msgstr "1280 x 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "Zmiana _rozmiaru na:" +msgid "1600 x 1600" +msgstr "1600 x 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "_Wyślij" +msgid "2048 x 2048" +msgstr "2048 x 2048" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 msgid "A_ccount:" msgstr "_Konto:" @@ -1814,27 +1837,23 @@ msgid "A_ccounts:" msgstr "_Konta:" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "Private" -msgstr "Prywatne" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 -msgid "Private photos, visible to friends" -msgstr "Prywatne zdjęcia, widoczne dla przyjaciół" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Zdjęcia publiczne" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 -msgid "_Location:" -msgstr "_Położenie:" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +msgid "Private photos, visible to friends" +msgstr "Prywatne zdjęcia, widoczne dla przyjaciół" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Prywatne" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 msgid "_Visibility:" msgstr "_Widoczność:" @@ -1845,18 +1864,18 @@ msgstr "_Upoważnij..." #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Po ukończeniu należy kliknąć przycisk \"Kontynuuj\" poniżej." + +#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 #: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 msgid "C_ontinue" msgstr "K_ontynuuj" -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker_utils/flickr-authentication.c:435 -#: ../extensions/oauth/oauth-authentication.c:450 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Po ukończeniu należy kliknąć przycisk \"Kontynuuj\" poniżej." - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1868,34 +1887,34 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1851 +#: ../extensions/webalbums/gth-web-exporter.c:1841 msgid "_Open in the Browser" msgstr "_Otwórz w przeglądarce" -#: ../extensions/facebook/dlg-export-to-facebook.c:128 -#: ../extensions/facebook/dlg-export-to-facebook.c:333 -#: ../extensions/facebook/facebook-authentication.c:219 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:234 -#: ../extensions/flicker_utils/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 #: ../extensions/photobucket/dlg-export-to-photobucket.c:376 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:377 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "Nie można połączyć się z serwerem" -#: ../extensions/facebook/dlg-export-to-facebook.c:180 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 msgid "Could not upload the files" msgstr "Nie można wysłać plików" -#: ../extensions/facebook/dlg-export-to-facebook.c:410 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 #: ../extensions/photobucket/dlg-export-to-photobucket.c:462 @@ -1903,35 +1922,35 @@ msgid "Could not create the album" msgstr "Nie można utworzyć albumu" -#: ../extensions/facebook/dlg-export-to-facebook.c:479 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 #: ../extensions/photobucket/dlg-export-to-photobucket.c:534 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 msgid "New Album" msgstr "Nowy album" -#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1816 +#: ../extensions/image_print/gth-image-print-job.c:1789 #: ../extensions/photobucket/dlg-export-to-photobucket.c:614 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 msgid "No valid file selected." msgstr "Nie wybrano prawidłowych plików." -#: ../extensions/facebook/dlg-export-to-facebook.c:559 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 #: ../extensions/photobucket/dlg-export-to-photobucket.c:615 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 msgid "Could not export the files" msgstr "Nie można wyeksportować plików" -#: ../extensions/facebook/dlg-export-to-facebook.c:567 -#: ../extensions/find_duplicates/gth-find-duplicates.c:284 -#: ../extensions/find_duplicates/gth-find-duplicates.c:376 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:255 +#: ../extensions/find_duplicates/gth-find-duplicates.c:347 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 #: ../extensions/photobucket/dlg-export-to-photobucket.c:623 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:800 -#: ../gthumb/gth-browser.c:990 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:1005 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" @@ -1939,44 +1958,44 @@ msgstr[1] "%d pliki (%s)" msgstr[2] "%d plików (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:589 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:590 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:643 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 #, c-format msgid "Export to %s" msgstr "Eksport do serwisu %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:229 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:229 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:229 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "Nowe dane uwierzytelniające..." -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker_utils/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." msgstr "Wybierz _konto..." -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker_utils/flickr-authentication.c:434 -#: ../extensions/oauth/oauth-authentication.c:449 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 #, c-format msgid "" "Return to this window when you have finished the authorization process on %s" msgstr "" "Należy wrócić do tego okna po ukończeniu procesu upoważnienia w serwisie %s" -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker_utils/flickr-authentication.c:514 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" msgstr "Program gthumb wymaga upoważnienia, aby wysłać zdjęcia do serwisu %s" -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker_utils/flickr-authentication.c:515 -#: ../extensions/oauth/oauth-authentication.c:530 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 #, c-format msgid "" "Click 'Authorize' to open your web browser and authorize gthumb to upload " @@ -1987,31 +2006,31 @@ "upoważnić program gthumb do wysyłania zdjęć do serwisu %s. Po ukończeniu " "należy wrócić do tego okna, aby zakończyć upoważnienie." -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker_utils/flickr-authentication.c:615 -#: ../extensions/oauth/oauth-authentication.c:632 +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:681 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Wybierz konto" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker_utils/flickr-authentication.c:724 -#: ../extensions/oauth/oauth-authentication.c:741 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:742 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Modyfikuj konta" -#: ../extensions/facebook/facebook-connection.c:304 -#: ../extensions/facebook/facebook-connection.c:464 -#: ../extensions/facebook/facebook-service.c:191 -#: ../extensions/facebook/facebook-service.c:294 -#: ../extensions/facebook/facebook-service.c:497 -#: ../extensions/flicker_utils/flickr-connection.c:295 -#: ../extensions/flicker_utils/flickr-connection.c:442 -#: ../extensions/flicker_utils/flickr-service.c:224 -#: ../extensions/flicker_utils/flickr-service.c:427 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:195 +#: ../extensions/flicker_utils/flickr-service.c:398 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2019,17 +2038,17 @@ msgid "Unknown error" msgstr "Nieznany błąd" -#: ../extensions/facebook/facebook-connection.c:339 -#: ../extensions/facebook/facebook-connection.c:490 -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-connection.c:321 -#: ../extensions/flicker_utils/flickr-connection.c:468 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 -#: ../extensions/picasaweb/google-connection.c:373 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" msgstr "Łączenie z serwerem" @@ -2041,132 +2060,132 @@ msgid "Upload images to Facebook" msgstr "Wysyłanie obrazów do serwisu Facebook" -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "Pobieranie informacji o koncie" -#: ../extensions/facebook/facebook-service.c:425 -#: ../extensions/flicker_utils/flickr-service.c:352 -#: ../extensions/photobucket/photobucket-service.c:236 -#: ../extensions/picasaweb/picasa-web-service.c:238 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:209 msgid "Getting the album list" msgstr "Pobieranie listy albumów" -#: ../extensions/facebook/facebook-service.c:554 -#: ../extensions/flicker_utils/flickr-service.c:455 -#: ../extensions/flicker_utils/flickr-service.c:575 -#: ../extensions/flicker_utils/flickr-service.c:613 -#: ../extensions/photobucket/photobucket-service.c:345 -#: ../extensions/picasaweb/picasa-web-service.c:329 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:426 +#: ../extensions/flicker_utils/flickr-service.c:546 +#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:300 msgid "Creating the new album" msgstr "Tworzenie nowego albumu" -#: ../extensions/facebook/facebook-service.c:613 -#: ../extensions/flicker_utils/flickr-service.c:663 -#: ../extensions/photobucket/photobucket-service.c:402 -#: ../extensions/picasaweb/picasa-web-service.c:386 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:357 #, c-format msgid "Could not upload '%s': %s" msgstr "Nie można wysłać \"%s\": %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:699 -#: ../extensions/flicker_utils/flickr-service.c:774 -#: ../extensions/photobucket/photobucket-service.c:459 -#: ../extensions/picasaweb/picasa-web-service.c:441 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:412 #, c-format msgid "Uploading '%s'" msgstr "Wysyłanie \"%s\"" -#: ../extensions/facebook/facebook-service.c:915 -#: ../extensions/flicker_utils/flickr-service.c:943 -#: ../extensions/photobucket/photobucket-service.c:628 -#: ../extensions/picasaweb/picasa-web-service.c:634 +#: ../extensions/facebook/facebook-service.c:886 +#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:605 msgid "Uploading the files to the server" msgstr "Wysyłanie plików na serwer" -#: ../extensions/facebook/facebook-service.c:1032 -#: ../extensions/flicker_utils/flickr-service.c:1106 -#: ../extensions/picasaweb/picasa-web-service.c:747 +#: ../extensions/facebook/facebook-service.c:1003 +#: ../extensions/flicker_utils/flickr-service.c:1077 +#: ../extensions/picasaweb/picasa-web-service.c:718 msgid "Getting the photo list" msgstr "Pobieranie listy zdjęć" -#: ../extensions/file_manager/actions.c:130 +#: ../extensions/file_manager/actions.c:133 msgid "New folder" msgstr "Nowy katalog" -#: ../extensions/file_manager/actions.c:131 +#: ../extensions/file_manager/actions.c:134 msgid "Enter the folder name:" msgstr "Nazwę katalogu: " -#: ../extensions/file_manager/actions.c:397 +#: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:847 +#: ../extensions/file_manager/callbacks.c:842 msgid "Could not move the files" msgstr "Nie można przenieść plików" -#: ../extensions/file_manager/actions.c:398 +#: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:848 +#: ../extensions/file_manager/callbacks.c:843 msgid "" "Files cannot be moved to the current location, as alternative you can choose " "to copy them." msgstr "" "Nie można przenieść plików do bieżącego położenia, ale można je skopiować." -#: ../extensions/file_manager/actions.c:555 +#: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "Nie można otworzyć położenia" -#: ../extensions/file_manager/actions.c:688 +#: ../extensions/file_manager/actions.c:696 msgid "" "The folder is not empty, do you want to delete the folder and its content " "permanently?" msgstr "Katalog nie jest pusty. Trwale usunąć go i jego zawartość?" -#: ../extensions/file_manager/actions.c:704 +#: ../extensions/file_manager/actions.c:712 msgid "Could not delete the folder" msgstr "Nie można usunąć katalogu" -#: ../extensions/file_manager/actions.c:765 +#: ../extensions/file_manager/actions.c:773 msgid "" "The folder cannot be moved to the Trash. Do you want to delete it " "permanently?" msgstr "Nie można przenieść katalogu do kosza. Usunąć go trwale?" -#: ../extensions/file_manager/actions.c:772 +#: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" msgstr "Nie można przenieść katalogu do kosza" -#: ../extensions/file_manager/actions.c:808 -#: ../gthumb/gth-file-source-vfs.c:826 +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" msgstr "Na pewno trwale usunąć \"%s\"?" -#: ../extensions/file_manager/actions.c:818 -#: ../gthumb/gth-file-source-vfs.c:839 +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "Usunięcie pliku spowoduje jego trwałe utracenie." -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Move To" msgstr "Przenieś do" -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Copy To" msgstr "Skopiuj do" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Move" msgstr "Przenieś" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Copy" msgstr "Skopiuj" @@ -2190,7 +2209,7 @@ #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 -#: ../gthumb/gth-file-source-vfs.c:800 +#: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" msgstr "P_rzenieś do kosza" @@ -2210,7 +2229,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "_Zmień nazwę" @@ -2252,9 +2271,9 @@ msgid "Move the selected files to another folder" msgstr "Przenosi zaznaczone pliki do innego katalogu" -#: ../extensions/file_manager/callbacks.c:1009 -#: ../extensions/find_duplicates/gth-find-duplicates.c:610 -#: ../gthumb/gth-browser.c:4945 ../gthumb/gth-browser.c:4979 +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:581 +#: ../gthumb/gth-browser.c:4939 ../gthumb/gth-browser.c:4973 msgid "Could not perform the operation" msgstr "Nie można wykonać działania" @@ -2271,451 +2290,451 @@ msgstr "Usuwanie plików" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "_Jasność:" +msgid "_Preview" +msgstr "_Podgląd" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "Poziomy kolorów" +msgid "B_rightness:" +msgstr "_Jasność:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "Kon_trast:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "_Cyjan-czerwony" +msgid "_Saturation:" +msgstr "_Nasycenie:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "G_amma:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "_Magenta-zielony" +msgid "Cyan-_Red:" +msgstr "_Cyjan-czerwony" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Preview" -msgstr "_Podgląd" +msgid "_Magenta-Green:" +msgstr "_Magenta-zielony" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 -msgid "_Reset" -msgstr "P_rzywróć" +msgid "_Yellow-Blue:" +msgstr "Żół_ty-niebieski:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -msgid "_Saturation:" -msgstr "_Nasycenie:" +msgid "Color Levels" +msgstr "Poziomy kolorów" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 -msgid "_Yellow-Blue:" -msgstr "Żół_ty-niebieski:" - -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "P_rzywróć" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "Współczynnik proporcji" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +msgid "_Position:" +msgstr "_Położenie:" +#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "C_rop" -msgstr "_Przytnij" +msgid "×" +msgstr "×" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "Center" -msgstr "Wyśrodkuj" +msgid "_Grid:" +msgstr "_Siatka:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:6 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "Odwróć proporcje obra_zu" - -#. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -msgid "M_ultiple of:" -msgstr "_Wielokrotność liczby:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 msgid "Maximize" msgstr "Zmaksymalizuj" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +msgid "Center" +msgstr "Wyśrodkuj" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "Selection" msgstr "Wybór" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 -msgid "_Grid:" -msgstr "_Siatka:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "I_nvert aspect ratio" +msgstr "Odwróć proporcje obra_zu" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 -msgid "_Position:" -msgstr "_Położenie:" +#. after the colon there is a control to select the size in pixels +#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +msgid "M_ultiple of:" +msgstr "_Wielokrotność liczby:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 msgid "px" msgstr "pks" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "Aspect ratio" +msgstr "Współczynnik proporcji" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "C_rop" +msgstr "_Przytnij" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Szerokość:" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +msgid "Heigh_t:" +msgstr "_Wysokość:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Set the image size to this value" +msgstr "Ustawienie rozmiaru obrazu na tę wartość" #: ../extensions/file_tools/data/ui/resize-options.ui.h:4 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Wymiary" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "_Wysokość:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 msgid "High _quality" msgstr "Wy_soka jakość" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "New dimensions:" -msgstr "Nowe wymiary:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 #: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "Options" msgstr "Opcje" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" msgstr "Pierwotne wymiary:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "Mnożnik:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -msgid "Set the image size to this value" -msgstr "Ustawienie rozmiaru obrazu na tę wartość" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 -msgid "_Width:" -msgstr "_Szerokość:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Nowe wymiary:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "piksele" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 msgid "Align" msgstr "Wyrównaj" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -msgid "Alignment" -msgstr "Wyrównanie" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 msgid "Angle" msgstr "Kąt" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Point 1:" +msgstr "Punkt 1:" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -msgid "Bounding box" -msgstr "Pudełko brzegowe" +msgid "Point 2:" +msgstr "Punkt 2:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -msgid "Crop borders" -msgstr "Przytnij krawędzie" +msgid "Keep aspect ratio" +msgstr "Utrzymanie współczynnika skalowania" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "" -"Draw a line on the image \n" -"to set the alignment." -msgstr "" -"Należy narysować linię na obrazie,\n" -"aby ustawić wyrównanie." +msgid "Image size" +msgstr "Rozmiar obrazu" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 msgid "Grid:" msgstr "Siatka:" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Pick a background color" +msgstr "Proszę wybrać kolor tła" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -msgid "Image size" -msgstr "Rozmiar obrazu" +msgid "_Transparent" +msgstr "_Przezroczyste" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "Keep aspect ratio" -msgstr "Utrzymanie współczynnika skalowania" +msgid "_Background:" +msgstr "_Tło:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -msgid "Original size" -msgstr "Pierwotny rozmiar" +msgid "Reset" +msgstr "Przywróć" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Należy narysować linię na obrazie,\n" +"aby ustawić wyrównanie." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 msgid "Parallel" msgstr "Równolegle" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 msgid "Perpendicular" msgstr "Prostopadle" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 -msgid "Pick a background color" -msgstr "Proszę wybrać kolor tła" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 -msgid "Point 1:" -msgstr "Punkt 1:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 -msgid "Point 2:" -msgstr "Punkt 2:" +msgid "Alignment" +msgstr "Wyrównanie" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -msgid "Reset" -msgstr "Przywróć" +msgid "Original size" +msgstr "Pierwotny rozmiar" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 -msgid "_Background:" -msgstr "_Tło:" +msgid "Bounding box" +msgstr "Pudełko brzegowe" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 -msgid "_Transparent" -msgstr "_Przezroczyste" +msgid "Crop borders" +msgstr "Przytnij krawędzie" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -msgid "Amount:" -msgstr "Ilość:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Podgląd:" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 -msgid "Radius:" -msgstr "Promień:" - -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 msgid "Threshold:" msgstr "Próg:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Promień:" + #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 -msgid "_Preview:" -msgstr "_Podgląd:" +msgid "Amount:" +msgstr "Ilość:" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 -msgid "Basic tools to modify images." -msgstr "Podstawowe narzędzia do modyfikowania obrazów." - -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Image tools" msgstr "Narzędzia do obrazów" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +msgid "Basic tools to modify images." +msgstr "Podstawowe narzędzia do modyfikowania obrazów." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors..." msgstr "Dostosuj kolory..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors" msgstr "Dostosowanie kolorów" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:528 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Zmiana jasności, kontrastu, nasycenia i poziomu gamma obrazu" -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 msgid "Square" msgstr "Kwadrat" -#: ../extensions/file_tools/gth-file-tool-crop.c:423 -#: ../extensions/file_tools/gth-file-tool-resize.c:494 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:499 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (obraz)" -#: ../extensions/file_tools/gth-file-tool-crop.c:426 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:503 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (ekran)" -#: ../extensions/file_tools/gth-file-tool-crop.c:430 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:508 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:431 -#: ../extensions/file_tools/gth-file-tool-resize.c:504 +#: ../extensions/file_tools/gth-file-tool-crop.c:433 +#: ../extensions/file_tools/gth-file-tool-resize.c:509 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, książka)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:505 +#: ../extensions/file_tools/gth-file-tool-crop.c:434 +#: ../extensions/file_tools/gth-file-tool-resize.c:510 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:506 +#: ../extensions/file_tools/gth-file-tool-crop.c:435 +#: ../extensions/file_tools/gth-file-tool-resize.c:511 msgid "3:2 (Postcard)" msgstr "3:2 (pocztówka)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:507 +#: ../extensions/file_tools/gth-file-tool-crop.c:436 +#: ../extensions/file_tools/gth-file-tool-resize.c:512 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:437 +#: ../extensions/file_tools/gth-file-tool-resize.c:513 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:438 +#: ../extensions/file_tools/gth-file-tool-resize.c:514 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:439 +#: ../extensions/file_tools/gth-file-tool-resize.c:515 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/rename_series/gth-template-selector.c:260 +#: ../extensions/file_tools/gth-file-tool-crop.c:440 +#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Własny" -#: ../extensions/file_tools/gth-file-tool-crop.c:449 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:455 +#: ../extensions/file_tools/gth-file-tool-rotate.c:416 msgid "Rule of Thirds" msgstr "Reguła trzech" -#: ../extensions/file_tools/gth-file-tool-crop.c:450 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:456 +#: ../extensions/file_tools/gth-file-tool-rotate.c:417 msgid "Golden Sections" msgstr "Złoty podział" -#: ../extensions/file_tools/gth-file-tool-crop.c:451 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:457 +#: ../extensions/file_tools/gth-file-tool-rotate.c:418 msgid "Center Lines" msgstr "Linie wyśrodkowane" -#: ../extensions/file_tools/gth-file-tool-crop.c:452 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:458 +#: ../extensions/file_tools/gth-file-tool-rotate.c:419 msgid "Uniform" msgstr "Jednolite" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop..." msgstr "Przytnij..." -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop" msgstr "Przycięcie" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:65 -#: ../extensions/file_tools/gth-file-tool-negative.c:65 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 msgid "Applying changes" msgstr "Zastosowywanie zmian" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:189 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 msgid "Desaturate" msgstr "Desaturacja" -#: ../extensions/file_tools/gth-file-tool-enhance.c:116 +#: ../extensions/file_tools/gth-file-tool-enhance.c:119 msgid "White balance correction" msgstr "Korekcja balansu bieli" -#: ../extensions/file_tools/gth-file-tool-enhance.c:339 +#: ../extensions/file_tools/gth-file-tool-enhance.c:342 msgid "Enhance Colors" msgstr "Ulepszenie kolorów" -#: ../extensions/file_tools/gth-file-tool-enhance.c:340 +#: ../extensions/file_tools/gth-file-tool-enhance.c:343 msgid "Automatic white balance correction" msgstr "Automatyczna korekcja balansu bieli" -#: ../extensions/file_tools/gth-file-tool-equalize.c:83 +#: ../extensions/file_tools/gth-file-tool-equalize.c:86 msgid "Equalizing image histogram" msgstr "Wyrównywanie histogramu obrazu" -#: ../extensions/file_tools/gth-file-tool-equalize.c:261 +#: ../extensions/file_tools/gth-file-tool-equalize.c:275 msgid "Equalize" msgstr "Wyrównaj histogram" -#: ../extensions/file_tools/gth-file-tool-equalize.c:262 +#: ../extensions/file_tools/gth-file-tool-equalize.c:276 msgid "Equalize image histogram" msgstr "Wyrównaj histogram obrazu" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Odbij w pionie" -#: ../extensions/file_tools/gth-file-tool-flip.c:74 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 msgid "Flip the image vertically" msgstr "Obraca obraz pionowo" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Odbij w poziomie" -#: ../extensions/file_tools/gth-file-tool-mirror.c:74 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 msgid "Mirror the image horizontally" msgstr "Odbija obraz poziomo" -#: ../extensions/file_tools/gth-file-tool-negative.c:183 +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Negatyw" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Ponów" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize..." msgstr "Zmień rozmiar..." -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize" msgstr "Zmień rozmiar" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate..." msgstr "Obróć..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate" msgstr "Obróć" -#: ../extensions/file_tools/gth-file-tool-rotate.c:597 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Freely rotate the image" msgstr "Dowolnie obraca obraz" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Obróć w lewo" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 msgid "Rotate the image by 90 degrees counterclockwise" msgstr "Obraca obraz o 90 stopni w lewo" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Obróć w prawo" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 msgid "Rotate the image by 90 degrees clockwise" msgstr "Obraca obraz o 90 stopni w prawo" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Zapisz jako" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Zapisz" @@ -2723,15 +2742,15 @@ msgid "Sharpening image" msgstr "Wyostrzanie obrazu" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus..." msgstr "Zwiększ ostrość..." -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus" msgstr "Zwiększenie ostrości" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Cofnij" @@ -2748,38 +2767,38 @@ msgstr "_Katalogi:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Wyszukiwanie duplikatów" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 msgid "Duplicates:" msgstr "Duplikaty:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 msgid "Files:" msgstr "Pliki:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -msgid "No duplicates found." -msgstr "Nie odnaleziono duplikatów." - #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -msgid "Search for Duplicates" -msgstr "Wyszukiwanie duplikatów" - -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 -#: ../gthumb/gth-browser-actions-entries.h:32 +#: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "_Widok" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Nie odnaleziono duplikatów." + #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 msgid "Find Duplicates" msgstr "Wyszukiwanie duplikatów" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "_Rozpoczęcie w:" -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" msgstr "_Filtr:" @@ -2807,8 +2826,8 @@ msgid "no file" msgstr "brak pliku" -#: ../extensions/find_duplicates/gth-find-duplicates.c:426 -#: ../extensions/find_duplicates/gth-find-duplicates.c:521 +#: ../extensions/find_duplicates/gth-find-duplicates.c:397 +#: ../extensions/find_duplicates/gth-find-duplicates.c:492 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" @@ -2816,15 +2835,15 @@ msgstr[1] "%d duplikaty" msgstr[2] "%d duplikatów" -#: ../extensions/find_duplicates/gth-find-duplicates.c:565 +#: ../extensions/find_duplicates/gth-find-duplicates.c:536 msgid "Search completed" msgstr "Ukończono wyszukiwanie" -#: ../extensions/find_duplicates/gth-find-duplicates.c:577 +#: ../extensions/find_duplicates/gth-find-duplicates.c:548 msgid "Searching for duplicates" msgstr "Wyszukiwanie duplikatów" -#: ../extensions/find_duplicates/gth-find-duplicates.c:580 +#: ../extensions/find_duplicates/gth-find-duplicates.c:551 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2834,19 +2853,19 @@ msgstr[1] "Pozostały %d pliki" msgstr[2] "Pozostało %d plików" -#: ../extensions/find_duplicates/gth-find-duplicates.c:663 +#: ../extensions/find_duplicates/gth-find-duplicates.c:634 msgid "Getting the file list" msgstr "Pobieranie listy plików" -#: ../extensions/find_duplicates/gth-find-duplicates.c:769 +#: ../extensions/find_duplicates/gth-find-duplicates.c:740 msgid "Duplicates" msgstr "Duplikaty" -#: ../extensions/find_duplicates/gth-find-duplicates.c:1023 +#: ../extensions/find_duplicates/gth-find-duplicates.c:997 msgid "Select" msgstr "Wybierz" -#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:63 +#: ../extensions/flicker/callbacks.c:59 ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr..." @@ -2854,7 +2873,7 @@ msgid "Download photos from Flickr" msgstr "Pobieranie zdjęć z serwisu Flickr" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "Wysyłanie zdjęć do serwisu Flickr" @@ -2866,135 +2885,128 @@ msgid "Upload images to Flickr" msgstr "Wysyłanie obrazów do serwisu Flickr" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Wolne miejsce:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "_Ukrycie z publicznych wyszukiwań" - -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -msgid "Moderate content" -msgstr "Umiarkowana treść" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "Z_estaw zdjęć:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "Prywatne zdjęcia" +msgid "_Privacy:" +msgstr "_Prywatność:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "Prywatne zdjęcia, widoczne dla rodziny" +msgid "Hi_de from public searches" +msgstr "_Ukrycie z publicznych wyszukiwań" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Bezpieczeństwo:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Private photos, visible to family and friends" msgstr "Prywatne zdjęcia, widoczne dla rodziny i przyjaciół" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 -msgid "Restricted content" -msgstr "Ograniczona treść" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 -msgid "Safe content" -msgstr "Bezpieczna treść" +msgid "Private photos, visible to family" +msgstr "Prywatne zdjęcia, widoczne dla rodziny" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos" +msgstr "Prywatne zdjęcia" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 -msgid "_Privacy:" -msgstr "_Prywatność:" +msgid "Safe content" +msgstr "Bezpieczna treść" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 -msgid "_Safety:" -msgstr "_Bezpieczeństwo:" +msgid "Moderate content" +msgstr "Umiarkowana treść" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Restricted content" +msgstr "Ograniczona treść" + +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "_Import" msgstr "Za_importuj" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:357 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:827 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "Nie można pobrać listy zdjęć" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:394 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:559 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:861 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1024 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 msgid "No album selected" msgstr "Nie wybrano albumu" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:577 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 #, c-format msgid "Import from %s" msgstr "Import zdjęć z serwisu %s" -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1118 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 #: ../gthumb/gth-browser.c:2008 msgid "Could not save the file" msgstr "Nie można zapisać pliku" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "Nie można wykonać zrzutu ekranu" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1266 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 msgid "Save Image" msgstr "Zapis obrazu" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Zrzut ekranu" -#. this is an empty time +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Wolniej" + #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "--:--" -msgstr "--:--" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +msgid "Play" +msgstr "Odtwórz" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 -msgid "Change volume level" -msgstr "Zmienia poziom głośności" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Faster" msgstr "Szybciej" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:657 -msgid "Play" -msgstr "Odtwórz" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Slower" -msgstr "Wolniej" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Time:" msgstr "Czas:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--:--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Toggle volume" msgstr "Zmienia głośność" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 -msgctxt "time" -msgid "/" -msgstr "/" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Zmienia poziom głośności" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 -#: ../extensions/photo_importer/dlg-photo-importer.c:614 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Wybór katalogu" @@ -3006,29 +3018,29 @@ msgid "Play audio and video files." msgstr "Odtwarzanie plików dźwiękowych i wideo." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:94 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Zrzut ekranu" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:95 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Wykonaj zrzut ekranu" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:634 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 msgid "Playing video" msgstr "Odtwarzanie nagrania wideo" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:647 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Pause" msgstr "Wstrzymaj" #: ../extensions/gstreamer_tools/main.c:31 -#: ../gthumb/gth-main-default-tests.c:211 +#: ../gthumb/gth-main-default-tests.c:247 msgid "Video" msgstr "Wideo" #: ../extensions/gstreamer_tools/main.c:32 -#: ../gthumb/gth-main-default-tests.c:218 +#: ../gthumb/gth-main-default-tests.c:254 msgid "Audio" msgstr "Dźwięk" @@ -3037,7 +3049,7 @@ msgstr "Wykonawca" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "Album" @@ -3059,13 +3071,13 @@ msgstr "Liczba klatek na sekundę" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 -#: ../extensions/image_viewer/gth-image-viewer-page.c:222 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Szerokość" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "Wysokość" @@ -3087,10 +3099,10 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1321 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 #: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:429 -#: ../extensions/webalbums/gth-web-exporter.c:2456 +#: ../extensions/webalbums/dlg-web-exporter.c:442 +#: ../extensions/webalbums/gth-web-exporter.c:2446 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3103,94 +3115,94 @@ msgid "Print the selected images" msgstr "Drukuje zaznaczone obrazy" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 -msgid "Centered" -msgstr "Wyśrodkowane" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 -msgid "Image" -msgstr "Obraz" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Left" -msgstr "Lewo" +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 +msgid "Centered" +msgstr "Wyśrodkowane" #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Position:" -msgstr "Położenie:" +msgid "The total number of files" +msgstr "Całkowita liczba plików" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 -msgid "Preview" -msgstr "Podgląd" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -msgid "Rotation:" -msgstr "Obrót:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 msgid "The event description" msgstr "Opis wydarzenia" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "_Wiersze:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Obraz" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Położenie:" + #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "The total number of files" -msgstr "Całkowita liczba plików" +msgid "Left" +msgstr "Lewo" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "Góra" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Obrót:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "Jednostka:" #: ../extensions/image_print/data/ui/print-layout.ui.h:28 -msgid "_Rows:" -msgstr "_Wiersze:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 -msgid "inches" -msgstr "cale" +msgid "Preview" +msgstr "Podgląd" #: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "milimetry" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 -msgid "Fonts" -msgstr "Czcionki" +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "cale" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 msgid "Select Caption Font" msgstr "Wybór czcionki podpisu" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -msgid "Select Footer Font" -msgstr "Wybór czcionki stopki" - #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" msgstr "Wybór czcionki nagłówka" -#: ../extensions/image_print/gth-image-print-job.c:997 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Wybór czcionki stopki" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Czcionki" + +#: ../extensions/image_print/gth-image-print-job.c:971 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Strona %d z %d" -#: ../extensions/image_print/gth-image-print-job.c:1761 -#: ../extensions/image_print/gth-image-print-job.c:1888 -#: ../extensions/image_print/gth-image-print-job.c:1925 +#: ../extensions/image_print/gth-image-print-job.c:1734 +#: ../extensions/image_print/gth-image-print-job.c:1861 +#: ../extensions/image_print/gth-image-print-job.c:1898 msgid "Could not print" msgstr "Nie można wydrukować" -#: ../extensions/image_print/gth-image-print-job.c:1823 -#: ../gthumb/gth-main-default-tests.c:204 +#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Obrazy" -#: ../extensions/image_print/gth-image-print-job.c:1890 -#: ../gthumb/gth-image-loader.c:233 ../gthumb/gth-image-loader.c:306 +#: ../extensions/image_print/gth-image-print-job.c:1863 +#: ../gthumb/gth-image-loader.c:204 ../gthumb/gth-image-loader.c:278 msgid "No suitable loader available for this file type" msgstr "" "Brak dostępnego odpowiedniego programu wczytującego dla tego typu pliku" @@ -3202,19 +3214,19 @@ msgstr "Wczytywanie \"%s\"" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2695 +#: ../extensions/webalbums/gth-web-exporter.c:2685 msgid "Loading images" msgstr "Wczytywanie obrazów" #: ../extensions/image_print/image_print.extension.in.in.h:1 -msgid "Allow to print images choosing the page layout." -msgstr "Umożliwienie drukowania obrazów wybierając układ stron." - -#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Image print" msgstr "Drukowanie obrazów" -#: ../extensions/image_print/preferences.c:76 +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "Umożliwienie drukowania obrazów wybierając układ stron." + +#: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "Drukowanie" @@ -3222,30 +3234,30 @@ msgid "Rotate the selected images 90° to the right" msgstr "Obraca zaznaczone obrazy o 90° w prawo" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" msgstr "Obraca zaznaczone obrazy o 90° w lewo" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Fizyczny obrót obrazów" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" msgstr "Obraca zaznaczone obrazy zgodnie z osadzonym ułożeniem" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" msgstr "Przywróć ułożenie EXIF" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" msgstr "Przywraca osadzone ułożenie bez obracania obrazów" #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2349 -#: ../extensions/webalbums/gth-web-exporter.c:2433 +#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Zapisywanie obrazów" @@ -3257,12 +3269,12 @@ msgid "Rotate images without data loss." msgstr "Obracanie obrazów bez utraty danych." -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "Problem podczas przekształacania obrazu: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" "This transformation may introduce small image distortions along one or more " "edges, because the image dimensions are not multiples of 8.\n" @@ -3287,214 +3299,213 @@ "krawędziach. W praktycznym zastosowaniu ten tryb daje najlepsze rezultaty, " "ale przekształcenie nie jest wtedy do końca bezstratne." -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" msgstr "_Przytnij" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "Z_aakceptuj zniekształcenia" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -msgid "" -"Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, " -"fit-width, fit-width-if-larger." -msgstr "" -"Możliwe wartości: actual-size, keep-prev, fit-size, fit-size-if-larger, fit-" -"width, fit-width-if-larger." - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -msgid "Whether to resize the window to fit the size of the image" -msgstr "" -"Określa, czy zmieniać rozmiar okna tak, aby pasowało do rozmiaru obrazu" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "Po wczytaniu obrazu:" +msgid "Set to actual size" +msgstr "Ustawianie na rzeczywisty rozmiar" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Wysoka" +msgid "Keep previous zoom" +msgstr "Zachowanie poprzedniego powiększenia" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Niska" +msgid "Fit to window" +msgstr "Dopasowanie do okna" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "Dopasowanie do okna, jeśli większy" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 -msgid "Reset scrollbar positions" -msgstr "Przywracanie położenia suwaków przewijania" +msgid "Fit to width" +msgstr "Dopasowanie do szerokości" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 -msgid "Transparency _type:" -msgstr "_Typ przezroczystości:" +msgid "Fit to width if larger" +msgstr "Dopasowanie do szerokości, jeśli większy" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Przywracanie położenia suwaków przewijania" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "Po wczytaniu obrazu:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "Jakość _zbliżenia:" -#: ../extensions/image_viewer/gth-image-histogram.c:74 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "_Typ przezroczystości:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Wysoka" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Niska" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Biały" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Czarny" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Szachownica" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "Histogram" -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 msgid "Copy Image" msgstr "Skopiuj obraz" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 msgid "Copy the image to the clipboard" msgstr "Kopiuje obraz do schowka" -#: ../extensions/image_viewer/gth-image-viewer-page.c:197 +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 msgid "Paste Image" msgstr "Wklej obraz" -#: ../extensions/image_viewer/gth-image-viewer-page.c:198 +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 msgid "Paste the image from the clipboard" msgstr "Wkleja obraz ze schowka" -#: ../extensions/image_viewer/gth-image-viewer-page.c:202 +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "Przybliż" -#: ../extensions/image_viewer/gth-image-viewer-page.c:203 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Powiększenie" -#: ../extensions/image_viewer/gth-image-viewer-page.c:207 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Oddal" -#: ../extensions/image_viewer/gth-image-viewer-page.c:208 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Pomniejszenie" -#: ../extensions/image_viewer/gth-image-viewer-page.c:212 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:213 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Rozmiar rzeczywisty" -#: ../extensions/image_viewer/gth-image-viewer-page.c:217 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Dopasowanie" -#: ../extensions/image_viewer/gth-image-viewer-page.c:218 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Powiększenie do rozmiarów okna" -#: ../extensions/image_viewer/gth-image-viewer-page.c:223 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Przybliżenie, aby dopasować szerokość" -#: ../extensions/image_viewer/gth-image-viewer-page.c:230 -msgid "_Fit Window to Image" -msgstr "_Dopasowanie okna do obrazu" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:231 -msgid "Resize the window to the size of the image" -msgstr "Zmienia rozmiar okna na rozmiar obrazu" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -msgid "Basic image viewing." -msgstr "Podstawowe przeglądanie obrazów." - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Przeglądarka obrazów" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Ustawianie na rzeczywisty rozmiar" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Dopasowanie do szerokości" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Podstawowe przeglądanie obrazów." -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Przeglądarka" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "Możliwe wartości: none, file_date, current_date" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "Możliwe wartości: yyyymmdd, yyyymm, yyyy" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:3 -msgid "The day of the month" -msgstr "Dzień miesiąca" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "Miejsce _docelowe" -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "Godzina" +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "_Automatyczne podkatalogi" -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "Minuty" +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +msgid "as _single subfolder" +msgstr "jako poje_dynczy podkatalog" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "Miesiąc" +msgid "The year" +msgstr "Rok" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "Sekundy" +msgid "The month" +msgstr "Miesiąc" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "Rok" +msgid "The day of the month" +msgstr "Dzień miesiąca" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -msgid "_Automatic subfolder" -msgstr "_Automatyczne podkatalogi" +msgid "The hour" +msgstr "Godzina" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "Miejsce _docelowe" +msgid "The minutes" +msgstr "Minuty" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -msgid "as _single subfolder" -msgstr "jako poje_dynczy podkatalog" +msgid "The seconds" +msgstr "Sekundy" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "Nieprawidłowe miejsce docelowe" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "przykład: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:326 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Data pliku" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:336 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "rok-miesiąc-dzień" -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "rok-miesiąc" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "rok" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "własny format" #: ../extensions/importer/gth-import-task.c:442 #: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:643 +#: ../extensions/importer/gth-import-task.c:648 msgid "Importing files" msgstr "Importowanie plików" @@ -3506,25 +3517,25 @@ msgid "The selected files are already present in the destination." msgstr "Zaznaczone pliki już znajdują się w miejscu docelowym." -#: ../extensions/importer/gth-import-task.c:619 -#: ../gthumb/gth-file-source-vfs.c:685 +#: ../extensions/importer/gth-import-task.c:622 +#: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Nie można usunąć plików" -#: ../extensions/importer/gth-import-task.c:620 +#: ../extensions/importer/gth-import-task.c:623 msgid "Delete operation not supported." msgstr "Działanie usuwania jest nieobsługiwane." -#: ../extensions/importer/gth-import-task.c:704 +#: ../extensions/importer/gth-import-task.c:709 msgid "Last imported" msgstr "Ostatnio zaimportowano" -#: ../extensions/importer/gth-import-task.c:839 +#: ../extensions/importer/gth-import-task.c:815 msgid "No file specified." msgstr "Nie podano pliku." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:876 +#: ../extensions/importer/gth-import-task.c:852 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3533,17 +3544,15 @@ "Za mało wolnego miejsca w \"%s\".\n" "Wymagane: %s. Dostępne: %s." -#: ../extensions/list_tools/callbacks.c:65 ../gthumb/gth-filterbar.c:303 +#: ../extensions/list_tools/callbacks.c:76 ../gthumb/gth-filterbar.c:304 msgid "Personalize..." msgstr "Dostosuj..." -#: ../extensions/list_tools/callbacks.c:238 -#: ../extensions/list_tools/callbacks.c:249 +#: ../extensions/list_tools/callbacks.c:320 msgid "Tools" msgstr "Narzędzia" -#: ../extensions/list_tools/callbacks.c:240 -#: ../extensions/list_tools/callbacks.c:251 +#: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" msgstr "Narzędzia wsadowe do obróbki wielu plików" @@ -3552,97 +3561,97 @@ msgstr "_Pomiń" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "Polece_nia:" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "Polecenia" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "Polece_nia:" + #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, no-c-format -msgid "%E" -msgstr "%E" +msgid "_Wait for the command to finish" +msgstr "_Oczekiwanie na ukończenie polecenia" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "_Wykonanie polecenie raz dla każdego pliku" #: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format -msgid "%N" -msgstr "%N" +msgid "_Terminal command (shell script)" +msgstr "Polecenie _terminala (skrypt powłoki)" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "_Skrót:" + +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +msgid "The file uri" +msgstr "Adres URI pliku" -#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:7 -#, no-c-format -msgid "%ask{ message }{ default value }" -msgstr "%ask{ wiadomość }{ domyślna wartość }" +msgid "The file path" +msgstr "Ścieżka do pliku" -#. Translate only 'attribute name' -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#, no-c-format -msgid "%attr{ attribute name }" -msgstr "%attr{ atrybut nazwa }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "Podstawowa nazwa pliku" -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:13 -#, no-c-format -msgid "%quote{ text }" -msgstr "%quote{ tekst }" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "Ścieżka do katalogu nadrzędnego" +#. Translate only 'message' and 'default_value'. #: ../extensions/list_tools/data/ui/script-editor.ui.h:14 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 -msgid "A file attribute" -msgstr "Atrybut pliku" +#, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "%ask{ wiadomość }{ domyślna wartość }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:15 msgid "Ask an input value" msgstr "Pytanie o wartość wejściową" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:17 -msgid "E_xecute command once for every file" -msgstr "_Wykonanie polecenie raz dla każdego pliku" - +#. Translate only 'attribute name' #: ../extensions/list_tools/data/ui/script-editor.ui.h:18 -msgid "Quote the text " -msgstr "Cytowanie tekstu " +#, no-c-format +msgid "%attr{ attribute name }" +msgstr "%attr{ atrybut nazwa }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:19 -msgid "Sh_ortcut:" -msgstr "_Skrót:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "Atrybut pliku" #: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -msgid "The file basename" -msgstr "Podstawowa nazwa pliku" +#, no-c-format +msgid "%N" +msgstr "%N" #: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" msgstr "Podstawowa nazwa pliku bez rozszerzenia" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -msgid "The file extension" -msgstr "Rozszerzenie pliku" - #: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -msgid "The file path" -msgstr "Ścieżka do pliku" +#, no-c-format +msgid "%E" +msgstr "%E" #: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -msgid "The file uri" -msgstr "Adres URI pliku" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "The parent folder path" -msgstr "Ścieżka do katalogu nadrzędnego" +msgid "The file extension" +msgstr "Rozszerzenie pliku" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "_Command:" -msgstr "Pole_cenie:" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ tekst }" #: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "_Terminal command (shell script)" -msgstr "Polecenie _terminala (skrypt powłoki)" +msgid "Quote the text " +msgstr "Cytowanie tekstu " #: ../extensions/list_tools/data/ui/script-editor.ui.h:30 -msgid "_Wait for the command to finish" -msgstr "_Oczekiwanie na ukończenie polecenia" +msgid "_Command:" +msgstr "Pole_cenie:" #: ../extensions/list_tools/dlg-personalize-scripts.c:257 msgid "Script" @@ -3653,7 +3662,7 @@ msgstr "Skrót" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "Wyświetl" @@ -3673,32 +3682,32 @@ msgid "Are you sure you want to delete the selected command?" msgstr "Na pewno usunąć zaznaczone polecenie?" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" msgstr "Wartość:" -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:570 -#: ../extensions/webalbums/gth-web-exporter.c:582 -#: ../extensions/webalbums/gth-web-exporter.c:590 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:560 +#: ../extensions/webalbums/gth-web-exporter.c:572 +#: ../extensions/webalbums/gth-web-exporter.c:580 msgid "Malformed command" msgstr "Błędnie sformatowane polecenie" -#: ../extensions/list_tools/gth-script-editor-dialog.c:176 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "brak" -#: ../extensions/list_tools/gth-script-editor-dialog.c:182 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "klawisz %d na klawiaturze numerycznej" -#: ../extensions/list_tools/gth-script-editor-dialog.c:325 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "Nie podano polecenia" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "Polecenie nieprawidłowo zakończyło działanie ze stanem %d" @@ -3711,33 +3720,33 @@ msgid "Scripting and batch manipulation of files." msgstr "Skrypty i wsadowe modyfikowanie plików." -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "S" msgstr "S" -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "N" msgstr "N" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "W" msgstr "W" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "E" msgstr "E" -#: ../extensions/map_view/gth-map-view.c:196 +#: ../extensions/map_view/gth-map-view.c:205 #: ../extensions/map_view/map_view.extension.in.in.h:1 msgid "Map" msgstr "Mapa" #. No GPS label -#: ../extensions/map_view/gth-map-view.c:265 +#: ../extensions/map_view/gth-map-view.c:276 msgid "The geographical position information is not available for this image." msgstr "Informacje o położeniu geograficznym nie są dostępne dla tego obrazu." @@ -3754,39 +3763,39 @@ msgstr "Wyślij zdjęcia do serwisu PhotoBucket" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -msgid "1 megabyte file size" -msgstr "Plik o rozmiarze 1 megabajta" +msgid "Tiny ( 100 x 75 )" +msgstr "Malutkie (100 x 75)" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "Ekran 15ʺ (800 x 600)" +msgid "Small ( 160 x 120 )" +msgstr "Małe (160 x 120)" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "Ekran 17ʺ (1024 x 768)" +msgid "Medium ( 320 x 240 )" +msgstr "Średnie (320 x 240)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 msgid "Large ( 640 x 480 )" msgstr "Duże (640 x 480)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "Średnie (320 x 240)" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "Ekran 15ʺ (800 x 600)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 -msgid "Small ( 160 x 120 )" -msgstr "Małe (160 x 120)" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "Ekran 17ʺ (1024 x 768)" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "Malutkie (100 x 75)" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +msgid "1 megabyte file size" +msgstr "Plik o rozmiarze 1 megabajta" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 msgid "_Scramble filenames" msgstr "_Szyfrowanie nazw plików" -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 msgid "_Container:" msgstr "_Kontener:" @@ -3847,60 +3856,60 @@ msgstr "Importuje zdjęcia i inne pliki z katalogu" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "Po zaimportowaniu z urządzenia:" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 msgid "_Rotate the images physically" msgstr "_Fizyczne obracanie obrazów" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "Po zaimportowaniu z urządzenia:" + #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../gthumb/gth-filterbar.c:413 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:414 msgid "S_how:" msgstr "_Wyświetlanie:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -msgid "_Delete the imported files from the source" -msgstr "_Usuwanie zaimportowanych plików ze źródła" - #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "_Etykiety:" + +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 msgid "_Event:" msgstr "Wydarz_enie:" #: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Tags:" -msgstr "_Etykiety:" +msgid "_Delete the imported files from the source" +msgstr "_Usuwanie zaimportowanych plików ze źródła" -#: ../extensions/photo_importer/dlg-photo-importer.c:222 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:173 +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 msgid "Could not import the files" msgstr "Nie można zaimportować plików" #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:294 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "Pliki do zaimportowania: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:334 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" msgstr "Nie można wczytać katalogu" -#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 #: ../gthumb/gth-browser.c:1921 msgid "Getting folder listing..." msgstr "Pobieranie listy katalogu..." -#: ../extensions/photo_importer/dlg-photo-importer.c:410 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "Puste" -#: ../extensions/photo_importer/dlg-photo-importer.c:580 +#: ../extensions/photo_importer/dlg-photo-importer.c:586 msgid "Import from Removable Device" msgstr "Zaimportuj z urządzenia wymiennego" -#: ../extensions/photo_importer/dlg-photo-importer.c:612 +#: ../extensions/photo_importer/dlg-photo-importer.c:618 msgid "Import from Folder" msgstr "Zaimportuj z katalogu" @@ -3913,7 +3922,7 @@ msgstr "Importowanie zdjęć z urządzeń wymiennych." #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." msgstr "_Picasa Web Album..." @@ -3921,60 +3930,60 @@ msgid "Download photos from Picasa Web Album" msgstr "Pobierz zdjęcia z serwisu Picasa Web Album" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" msgstr "Wyślij zdjęcia do serwisu Picasa Web Album" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 msgid "Export to Picasa Web Albums" msgstr "Wyeksportuj do serwisu Picasa Web Album" -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Albums:" msgstr "_Albumy:" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 msgid "Import from Picasa Web Album" msgstr "Zaimportuj z serwisu Picasa Web Album" -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 msgid "_Album:" msgstr "_Album:" #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 +msgid "_E-Mail:" +msgstr "Adres _e-mail:" + +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 msgid "" "Type the characters you see in the picture below. Letters are not case-" "sensitive." msgstr "Proszę wpisać poniższe znaki. Wielkość liter nie ma znaczenia." -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "_E-Mail:" -msgstr "Adres _e-mail:" - #: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 msgid "_Password:" msgstr "_Hasło:" -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "Public" msgstr "Publiczne" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:307 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "Nie można pobrać listy albumów" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:391 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" msgstr "Picasa Web Album" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:478 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "Konto" -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:133 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 msgid "Could not load the file" msgstr "Nie można wczytać pliku" @@ -3986,39 +3995,27 @@ msgid "Upload images to Picasa Web Albums" msgstr "Wysyłanie obrazów do serwisu Picasa Web Album" -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: jpeg, jpg." -msgstr "Możliwe wartości: jpeg, jpg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:2 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Możliwe wartości: none, deflate, jpeg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:3 -msgid "Possible values are: tiff, tif." -msgstr "Możliwe wartości: tiff, tif." - #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "_Optymalizacja" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 msgid "_Default extension:" msgstr "_Domyślne rozszerzenie:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "_Przyrostowy" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 msgid "_Quality:" msgstr "_Jakość:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 msgid "_Smoothing:" msgstr "W_ygładzanie:" +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "_Optymalizacja" + +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Przyrostowy" + #: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 msgid "Compression _level:" msgstr "Poziom _kompresji:" @@ -4031,48 +4028,48 @@ msgid "_RLE compression" msgstr "Kompresja _RLE" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "Kompresja" - #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "_Zwykła (deflacja)" +msgid "_No compression" +msgstr "_Bez kompresji" #: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "Rozdzielczość" +msgid "No_rmal (Deflate)" +msgstr "_Zwykła (deflacja)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 msgid "_Loss compression (JPEG)" msgstr "Kompresja _stratna (JPEG)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_No compression" -msgstr "_Bez kompresji" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +msgid "Compression" +msgstr "Kompresja" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 msgid "dpi" msgstr "dpi" -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:527 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +msgid "Resolution" +msgstr "Rozdzielczość" + +#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 msgid "JPEG" msgstr "JPEG" -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 +#: ../extensions/pixbuf_savers/gth-png-saver.c:140 msgid "PNG" msgstr "PNG" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 #: ../gthumb/gth-buffer-data.c:84 msgid "Insufficient memory" msgstr "Brak pamięci" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 msgid "TGA" msgstr "TGA" -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:542 +#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 msgid "TIFF" msgstr "TIFF" @@ -4086,30 +4083,30 @@ "Zapisywanie obrazów w często używanych formatach, takich jak JPEG, PNG i TIFF" #: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "Umożliwienie wczytywania obrazów w formacie Raw." - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 msgid "Raw format support" msgstr "Obsługa formatu Raw" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Umożliwienie wczytywania obrazów w formacie Raw." + +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 msgid "_X:" msgstr "_X:" -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 msgid "_Y:" msgstr "_Y:" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." msgstr "Usuwanie efektu czerwonych oczu..." -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "Usuwanie efektu czerwonych oczu" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:470 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" msgstr "usuwa efekt czerwonych oczu powodowany przez lampy błyskowe" @@ -4121,146 +4118,134 @@ msgid "Tool to remove the red-eye effect from a photo." msgstr "Narzędzie do usuwania efektu czerwonych oczu ze zdjęcia." -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "" -"Possible values include: general::unsorted, file::name, file::size, file::" -"mtime, exif::photo::datetimeoriginal" -msgstr "" -"Możliwe wartości: general::unsorted, file::name, file::size, file::mtime, " -"exif::photo::datetimeoriginal" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "Możliwe wartości: 0 (none), 1 (lower), 2 (upper)" - #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -msgid "add" -msgstr "dodaj" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "digits" msgstr "cyfry" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 msgid "format:" msgstr "format:" -#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 msgid "remove" msgstr "usuń" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, no-c-format -msgid "%A{ identifier }" -msgstr "%A{ identyfikator }" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "dodaj" -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, no-c-format -msgid "%M{ format }" -msgstr "%M{ format }" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Zmień nazwę" #. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 msgid "Cas_e:" msgstr "Wi_elkość liter:" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 msgid "Edit template" msgstr "Modyfikuj szablon" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Re_verse Order" -msgstr "Odw_rócony porządek" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Pierwotna nazwa pliku" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -msgid "Rename" -msgstr "Zmień nazwę" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "Pierwotne rozszerzenie" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 -msgid "The digitalization date" -msgstr "Data cyfryzacji" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "Pierwotne wyliczanie" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ format }" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 msgid "The modification date" msgstr "Data modyfikacji" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -msgid "The original enumerator" -msgstr "Pierwotne wyliczanie" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 -msgid "The original extension" -msgstr "Pierwotne rozszerzenie" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "Data cyfryzacji" +#. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "The original filename" -msgstr "Pierwotna nazwa pliku" +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ identyfikator }" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Template:" msgstr "_Szablon:" -#: ../extensions/rename_series/dlg-rename-series.c:64 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "Odw_rócony porządek" + +#: ../extensions/rename_series/dlg-rename-series.c:58 msgid "Enumerator" msgstr "Wyliczanie" -#: ../extensions/rename_series/dlg-rename-series.c:65 +#: ../extensions/rename_series/dlg-rename-series.c:59 msgid "Original filename" msgstr "Pierwotna nazwa pliku" -#: ../extensions/rename_series/dlg-rename-series.c:66 +#: ../extensions/rename_series/dlg-rename-series.c:60 msgid "Original extension" msgstr "Pierwotne rozszerzenie" -#: ../extensions/rename_series/dlg-rename-series.c:67 +#: ../extensions/rename_series/dlg-rename-series.c:61 msgid "Original enumerator" msgstr "Pierwotne wyliczanie" -#: ../extensions/rename_series/dlg-rename-series.c:68 +#: ../extensions/rename_series/dlg-rename-series.c:62 msgid "Modification date" msgstr "Data modyfikacji" -#: ../extensions/rename_series/dlg-rename-series.c:69 +#: ../extensions/rename_series/dlg-rename-series.c:63 msgid "Digitalization date" msgstr "Data cyfryzacji" -#: ../extensions/rename_series/dlg-rename-series.c:70 +#: ../extensions/rename_series/dlg-rename-series.c:64 msgid "File attribute" msgstr "Atrybut pliku" -#: ../extensions/rename_series/dlg-rename-series.c:556 -#: ../extensions/rename_series/dlg-rename-series.c:687 +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 msgid "Could not rename the files" msgstr "Nie można zmienić nazw plików" -#: ../extensions/rename_series/dlg-rename-series.c:784 +#: ../extensions/rename_series/dlg-rename-series.c:780 msgid "Could not save the template" msgstr "Nie można zapisać szablonu" -#: ../extensions/rename_series/dlg-rename-series.c:802 +#: ../extensions/rename_series/dlg-rename-series.c:798 msgid "Edit Template" msgstr "Modyfikuj szablon" -#: ../extensions/rename_series/dlg-rename-series.c:859 +#: ../extensions/rename_series/dlg-rename-series.c:856 msgid "Old Name" msgstr "Poprzednia nazwa" -#: ../extensions/rename_series/dlg-rename-series.c:870 +#: ../extensions/rename_series/dlg-rename-series.c:867 msgid "New Name" msgstr "Nowa nazwa" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:944 msgid "Keep original case" msgstr "Zachowanie pierwotnej wielości liter" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:945 msgid "Convert to lower-case" msgstr "Konwersja do małych liter" -#: ../extensions/rename_series/dlg-rename-series.c:947 +#: ../extensions/rename_series/dlg-rename-series.c:946 msgid "Convert to upper-case" msgstr "Konwersja do wielkich liter" @@ -4284,36 +4269,36 @@ msgid "Resize the selected images" msgstr "Zmień rozmiar zaznaczonych obrazów" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Format" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Zmiana rozmiaru obrazów" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 msgid "New dimensions" msgstr "Nowe wymiary" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "Resize Images" -msgstr "Zmiana rozmiaru obrazów" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 msgid "_Height:" msgstr "_Wysokość:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 msgid "_Preserve original aspect ratios" msgstr "Zachowanie pierwotnych proporcji obrazów" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Format" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "pixel" msgstr "piksel" -#: ../extensions/resize_images/dlg-resize-images.c:166 +#: ../extensions/resize_images/dlg-resize-images.c:168 msgid "Resizing images" msgstr "Zmienianie rozmiarów obrazów" -#: ../extensions/resize_images/dlg-resize-images.c:408 +#: ../extensions/resize_images/dlg-resize-images.c:412 msgid "Keep the original format" msgstr "Zachowanie pierwotnego formatu" @@ -4342,23 +4327,23 @@ msgid "Find files" msgstr "Znajdź pliki" -#: ../extensions/search/callbacks.c:133 +#: ../extensions/search/callbacks.c:132 msgid "Search again" msgstr "Znajdź ponownie" #. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 -#: ../extensions/search/search.extension.in.in.h:2 +#: ../extensions/search/callbacks.c:174 +#: ../extensions/search/search.extension.in.in.h:1 msgid "Search" msgstr "Wyszukiwanie" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:195 +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "wszystkie poniższe reguły" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:196 +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "dowolna z poniższych reguł" @@ -4367,18 +4352,56 @@ msgid "Files found until now: %s" msgstr "Odnalezione pliki: %s" -#: ../extensions/search/gth-search-task.c:270 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "Wyszukiwanie..." -#: ../extensions/search/gth-search-task.c:276 +#: ../extensions/search/gth-search-task.c:277 msgid "Cancel the operation" msgstr "Anuluj działanie" -#: ../extensions/search/search.extension.in.in.h:1 +#: ../extensions/search/search.extension.in.in.h:2 msgid "File search tool." msgstr "Narzędzie do wyszukiwania plików." +#: ../extensions/selections/callbacks.c:62 +msgid "Add to _Selection" +msgstr "Dodaj do _zaznaczenia" + +#: ../extensions/selections/callbacks.c:65 +msgid "Selection 1" +msgstr "Zaznaczenie 1" + +#: ../extensions/selections/callbacks.c:70 +msgid "Selection 2" +msgstr "Zaznaczenie 2" + +#: ../extensions/selections/callbacks.c:75 +msgid "Selection 3" +msgstr "Zaznaczenie 3" + +#: ../extensions/selections/callbacks.c:180 +#, c-format +msgid "" +"Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "" +"Użycie klawiszy lt-%d dodaje pliki do tego zaznaczenia, a użycie Ctrl-%d je " +"wyświetla." + +#: ../extensions/selections/gth-selections-manager.c:250 +#, c-format +msgid "Selection %d" +msgstr "Zaznaczenie %d" + +#: ../extensions/selections/gth-selections-manager.c:253 +#: ../extensions/selections/selections.extension.in.in.h:1 +msgid "Selections" +msgstr "Zaznaczenia" + +#: ../extensions/selections/selections.extension.in.in.h:2 +msgid "Advanced file selection." +msgstr "Zaawansowane zaznaczanie plików." + #: ../extensions/slideshow/callbacks.c:56 msgid "_Slideshow" msgstr "Pokaz _slajdów" @@ -4387,59 +4410,59 @@ msgid "View as a slideshow" msgstr "Wyświetl jako pokaz slajdów" -#: ../extensions/slideshow/callbacks.c:406 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "Pokaz slajdów" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -msgid "Add files to the playlist" -msgstr "Dodaj pliki do listy odtwarzania" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "Lista odtwarzania" +msgid "_Personalize" +msgstr "_Dostosuj" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "_Losowy porządek" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "Usuń zaznaczone pliki" +msgid "_Transition effect:" +msgstr "_Efekt przejścia:" #. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 msgid "_Change automatically, every" msgstr "Automatyczna _zmiana co" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "Ponowne _uruchomienie po ukończeniu" + #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "_Dostosuj" +msgid "R_andom order" +msgstr "_Losowy porządek" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "Ponowne _uruchomienie po ukończeniu" +msgid "Playlist" +msgstr "Lista odtwarzania" #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 -msgid "_Transition effect:" -msgstr "_Efekt przejścia:" +msgid "Add files to the playlist" +msgstr "Dodaj pliki do listy odtwarzania" + +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Usuń zaznaczone pliki" #: ../extensions/slideshow/gth-slideshow.c:229 msgid "Playing slideshow" msgstr "Odtwarzanie pokazu slajdów" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 msgid "Choose the files to play" msgstr "Wybór plików do odtworzenia" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 msgid "Audio files" msgstr "Pliki dźwiękowe" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 msgid "Random" msgstr "Losowo" @@ -4505,12 +4528,12 @@ msgstr "Indeks" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "Następny" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:105 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "Poprzedni" @@ -4535,169 +4558,176 @@ msgid "View the previous page" msgstr "Wyświetl poprzednią stronę" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Wszystkie obrazy na jednym" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 +msgid "Adapts to the window width" +msgstr "Dostosowanie do szerokości okna" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Album WWW" + #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 #, no-c-format msgid "%P" msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 -msgid "Adapts to the window width" -msgstr "Dostosowanie do szerokości okna" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 -msgid "All images on a single image" -msgstr "Wszystkie obrazy na jednym" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Kopiowanie oryginałów do katalogu docelowego" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 -msgid "Image Attributes" -msgstr "Atrybuty obrazu" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "_Zmienianie rozmiaru, jeśli większe od:" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "Image Page" -msgstr "Strona obrazu" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "_Adapt to the window width " +msgstr "_Dostosowanie do szerokości okna" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 msgid "Index Page" msgstr "Strona indeksu" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Show the description, if available" -msgstr "Wyświetlanie opisu, jeśli jest dostępny" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Show the following attributes:" -msgstr "Wyświetlanie następujących atrybutów:" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "Podpis miniatury" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 msgid "The current image number" msgstr "Numer bieżącego obrazu" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -msgid "The file comment" -msgstr "Komentarz pliku" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "The total number of images" msgstr "Całkowita liczba obrazów" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "Thumbnail Caption" -msgstr "Podpis miniatury" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +msgid "The file comment" +msgstr "Komentarz pliku" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 -msgid "Web Album" -msgstr "Album WWW" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "Strona obrazu" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "_Adapt to the window width " -msgstr "_Dostosowanie do szerokości okna" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "Wyświetlanie opisu, jeśli jest dostępny" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "_Copy originals to destination" -msgstr "_Kopiowanie oryginałów do katalogu docelowego" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "Wyświetlanie następujących atrybutów:" #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -msgid "_Resize if larger than:" -msgstr "_Zmienianie rozmiaru, jeśli większe od:" +msgid "Image Attributes" +msgstr "Atrybuty obrazu" -#: ../extensions/webalbums/gth-web-exporter.c:1812 +#: ../extensions/webalbums/gth-web-exporter.c:1802 msgid "Could not show the destination" msgstr "Nie można wyświetlić miejsca docelowego" -#: ../extensions/webalbums/gth-web-exporter.c:1848 +#: ../extensions/webalbums/gth-web-exporter.c:1838 msgid "The album has been created successfully." msgstr "Pomyślnie utworzono album." -#: ../extensions/webalbums/gth-web-exporter.c:2116 -#: ../extensions/webalbums/gth-web-exporter.c:2143 +#: ../extensions/webalbums/gth-web-exporter.c:2106 +#: ../extensions/webalbums/gth-web-exporter.c:2133 msgid "Saving thumbnails" msgstr "Zapisywanie miniatur" -#: ../extensions/webalbums/gth-web-exporter.c:2171 +#: ../extensions/webalbums/gth-web-exporter.c:2161 msgid "Saving HTML pages: Images" msgstr "Zapisywanie stron HTML: obrazy" -#: ../extensions/webalbums/gth-web-exporter.c:2229 +#: ../extensions/webalbums/gth-web-exporter.c:2219 msgid "Saving HTML pages: Indexes" msgstr "Zapisywanie stron HTML: indeksy" -#: ../extensions/webalbums/gth-web-exporter.c:2512 +#: ../extensions/webalbums/gth-web-exporter.c:2502 msgid "Copying original images" msgstr "Kopiowanie oryginalnych obrazów" -#: ../extensions/webalbums/gth-web-exporter.c:2938 +#: ../extensions/webalbums/gth-web-exporter.c:2929 msgid "Could not find the style folder" msgstr "Nie można odnaleźć katalogu stylów" -#: ../extensions/webalbums/gth-web-exporter.c:2971 +#: ../extensions/webalbums/gth-web-exporter.c:2967 msgid "Could not create a temporary folder" msgstr "Nie można utworzyć katalogu tymczasowego" #: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Albumy WWW" + +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 msgid "Create static web albums." msgstr "Tworzenie statycznych albumów WWW." -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 -msgid "Web Albums" -msgstr "Albumy WWW" +#: ../gthumb/dlg-location.c:200 ../gthumb/gth-browser.c:1250 +#: ../gthumb/gth-browser.c:1809 ../gthumb/gth-browser.c:5899 +#: ../gthumb/gth-browser.c:5918 ../gthumb/gth-browser.c:5942 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Nie można wczytać położenia \"%s\"" -#: ../gthumb/dlg-personalize-filters.c:236 +#: ../gthumb/dlg-personalize-filters.c:237 msgid "Filter" msgstr "Filtr" -#: ../gthumb/dlg-personalize-filters.c:314 +#: ../gthumb/dlg-personalize-filters.c:315 msgid "Could not save the filter" msgstr "Nie można zapisać filtru" -#: ../gthumb/dlg-personalize-filters.c:357 +#: ../gthumb/dlg-personalize-filters.c:358 msgid "New Filter" msgstr "Nowy filtr" -#: ../gthumb/dlg-personalize-filters.c:386 +#: ../gthumb/dlg-personalize-filters.c:387 msgid "Edit Filter" msgstr "Modyfikuj filtr" -#: ../gthumb/dlg-preferences-extensions.c:68 ../gthumb/gth-filterbar.c:269 +#: ../gthumb/dlg-preferences-extensions.c:67 ../gthumb/gth-filterbar.c:270 msgid "All" msgstr "Wszystko" -#: ../gthumb/dlg-preferences-extensions.c:69 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" msgstr "Włączone" -#: ../gthumb/dlg-preferences-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" msgstr "Wyłączone" -#: ../gthumb/dlg-preferences-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" msgstr "Przeglądarki" -#: ../gthumb/dlg-preferences-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "Metadane" -#: ../gthumb/dlg-preferences-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "Narzędzia do obsługi plików" -#: ../gthumb/dlg-preferences-extensions.c:76 +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "Narzędzia do obsługi list" -#: ../gthumb/dlg-preferences-extensions.c:77 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "Importowanie" -#: ../gthumb/dlg-preferences-extensions.c:78 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" msgstr "Eksportowanie" -#: ../gthumb/dlg-preferences-extensions.c:215 +#: ../gthumb/dlg-preferences-extensions.c:216 msgid "Could not activate the extension" msgstr "Nie można aktywować rozszerzenia" -#: ../gthumb/dlg-preferences-extensions.c:225 +#: ../gthumb/dlg-preferences-extensions.c:226 msgid "Could not deactivate the extension" msgstr "Nie można deaktywować rozszerzenia" @@ -4727,7 +4757,7 @@ msgid "File _Format: %s" msgstr "_Format pliku: %s" -#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:197 +#: ../gthumb/eggfileformatchooser.c:397 ../gthumb/gth-main-default-tests.c:233 msgid "All Files" msgstr "Wszystkie pliki" @@ -4762,30 +4792,30 @@ msgstr "Nie rozpoznano formatu pliku" #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1355 +#: ../gthumb/gio-utils.c:1351 #, c-format msgid "%s of %s" msgstr "%s z %s" -#: ../gthumb/gio-utils.c:1390 +#: ../gthumb/gio-utils.c:1386 #, c-format msgid "Moving \"%s\" to \"%s\"" msgstr "Przenoszenie \"%s\" do \"%s\"" -#: ../gthumb/gio-utils.c:1392 +#: ../gthumb/gio-utils.c:1388 #, c-format msgid "Copying \"%s\" to \"%s\"" msgstr "Kopiowanie \"%s\" do \"%s\"" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Moving files" msgstr "Przenoszenie plików" -#: ../gthumb/gio-utils.c:1733 +#: ../gthumb/gio-utils.c:1750 msgid "Copying files" msgstr "Kopiowanie plików" -#: ../gthumb/gio-utils.c:1734 +#: ../gthumb/gio-utils.c:1751 msgid "Getting file information" msgstr "Pobieranie informacji o pliku" @@ -4795,7 +4825,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2749 +#: ../gthumb/glib-utils.c:2848 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4807,13 +4837,13 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2758 +#: ../gthumb/glib-utils.c:2857 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:361 +#: ../gthumb/gth-browser-actions-callbacks.c:400 msgid "" "gthumb is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -4825,7 +4855,7 @@ "przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według " "wersji drugiej tej Licencji lub którejś z późniejszych wersji." -#: ../gthumb/gth-browser-actions-callbacks.c:365 +#: ../gthumb/gth-browser-actions-callbacks.c:404 msgid "" "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -4837,7 +4867,7 @@ "HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania " "bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU." -#: ../gthumb/gth-browser-actions-callbacks.c:369 +#: ../gthumb/gth-browser-actions-callbacks.c:408 msgid "" "You should have received a copy of the GNU General Public License along with " "gthumb. If not, see http://www.gnu.org/licenses/." @@ -4846,212 +4876,229 @@ "Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie " "- proszę odwiedzić stronę internetową ." -#: ../gthumb/gth-browser-actions-callbacks.c:388 +#: ../gthumb/gth-browser-actions-callbacks.c:427 msgid "An image viewer and browser for GNOME." msgstr "Przeglądarka obrazów dla środowiska GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:391 +#: ../gthumb/gth-browser-actions-callbacks.c:430 msgid "translator_credits" -msgstr "Aviary.pl , 2011" +msgstr "Aviary.pl , 2011, 2012" -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_Plik" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "_Edycja" -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "Przej_dź" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "Pomo_c" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" msgstr "_Otwórz za pomocą" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" msgstr "Zai_mportuj z" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" msgstr "Wye_ksportuj do" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" msgstr "_Nowe okno" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" msgstr "Otwiera inne okno" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Otwórz" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "Otwiera w nowym oknie" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "Modyfikuje różne preferencje" -#: ../gthumb/gth-browser-actions-entries.h:85 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." msgstr "Porzą_dkowanie według.." -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." msgstr "_Filtr..." -#: ../gthumb/gth-browser-actions-entries.h:96 +#: ../gthumb/gth-browser-actions-entries.h:108 msgid "Stop loading the current location" msgstr "Zatrzymuje wczytywanie bieżącego położenia" -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:114 msgid "Reload the current location" msgstr "Ponownie wczytuje bieżące położenie" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" msgstr "Wyświetla poprzedni obraz" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "Wyświetla następny obraz" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "Przełącza na tryb pełnoekranowy" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" msgstr "Opuść tryb pełnoekranowy" -#: ../gthumb/gth-browser-actions-entries.h:126 ../gthumb/gth-browser.c:3647 +#: ../gthumb/gth-browser-actions-entries.h:144 ../gthumb/gth-browser.c:3586 msgid "Go to the previous visited location" msgstr "Przechodzi do poprzednio odwiedzonego położenia" -#: ../gthumb/gth-browser-actions-entries.h:131 ../gthumb/gth-browser.c:3668 +#: ../gthumb/gth-browser-actions-entries.h:150 ../gthumb/gth-browser.c:3604 msgid "Go to the next visited location" msgstr "Przechodzi do kolejnej odwiedzonego położenia" -#: ../gthumb/gth-browser-actions-entries.h:136 ../gthumb/gth-browser.c:3689 +#: ../gthumb/gth-browser-actions-entries.h:156 ../gthumb/gth-browser.c:3622 msgid "Go up one level" msgstr "Przechodzi o jeden poziom do góry" -#: ../gthumb/gth-browser-actions-entries.h:145 ../gthumb/gth-browser.c:667 +#: ../gthumb/gth-browser-actions-entries.h:161 +msgid "_Location..." +msgstr "_Położenie..." + +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "Określa położenie do otwarcia" + +#: ../gthumb/gth-browser-actions-entries.h:173 ../gthumb/gth-browser.c:672 msgid "_Delete History" msgstr "_Usuń historię" -#: ../gthumb/gth-browser-actions-entries.h:146 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "Delete the list of visited locations" msgstr "Usuwa listę odwiedzonych położeń" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "View the folders" msgstr "Wyświetla katalogi" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Show information about gthumb" msgstr "Wyświetla informacji o programie gthumb" -#: ../gthumb/gth-browser-actions-entries.h:160 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "Contents" msgstr "Spis treści" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:192 msgid "Display the gthumb Manual" msgstr "Wyświetla podręcznik programu gthumb" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:197 msgid "_Keyboard Shortcuts" msgstr "_Skróty klawiszowe" -#: ../gthumb/gth-browser-actions-entries.h:174 +#: ../gthumb/gth-browser-actions-entries.h:206 msgid "_Toolbar" msgstr "Pasek _narzędziowy" -#: ../gthumb/gth-browser-actions-entries.h:175 +#: ../gthumb/gth-browser-actions-entries.h:207 msgid "View or hide the toolbar of this window" msgstr "Wyświetla lub ukrywa pasek narzędziowy tego okna" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:211 msgid "_Statusbar" msgstr "Pasek _stanu" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:212 msgid "View or hide the statusbar of this window" msgstr "Wyświetla lub ukrywa pasek stanu tego okna" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:216 msgid "_Filterbar" msgstr "Pasek _filtru" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:217 msgid "View or hide the filterbar of this window" msgstr "Wyświetla lub ukrywa pasek filtra tego okna" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:221 msgid "_Sidebar" msgstr "Pasek _boczny" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:222 msgid "View or hide the sidebar of this window" msgstr "Wyświetla lub ukrywa pasek filtra tego okna" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:226 msgid "_Thumbnail Pane" msgstr "Panel _miniatur" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:227 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Wyświetla lub ukrywa panel miniatur w trybie przeglądarki" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:231 msgid "_Thumbnails" msgstr "_Miniatury" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:232 msgid "View thumbnails" msgstr "Wyświetla miniatury" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:236 msgid "_Hidden Files" msgstr "_Ukryte pliki" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:237 msgid "Show hidden files and folders" msgstr "Wyświetla ukryte pliki i katalogi" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:242 +#: ../gthumb/gth-browser-actions-entries.h:247 msgid "View file properties" msgstr "Wyświetla właściwości pliku" -#: ../gthumb/gth-browser-actions-entries.h:214 +#: ../gthumb/gth-browser-actions-entries.h:251 msgid "Edit" msgstr "Edycja" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:252 msgid "Edit file" msgstr "Modyfikuje plik" -#: ../gthumb/gth-browser.c:363 +#: ../gthumb/gth-browser-actions-entries.h:256 +msgid "_Fit Window to Image" +msgstr "_Dopasowanie okna do obrazu" + +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Resize the window to the size of the image" +msgstr "Zmienia rozmiar okna na rozmiar obrazu" + +#: ../gthumb/gth-browser.c:369 #, c-format msgid "Open %s" msgstr "Otwórz %s" -#: ../gthumb/gth-browser.c:503 +#: ../gthumb/gth-browser.c:509 msgid "[modified]" msgstr "[zmodyfikowano]" -#: ../gthumb/gth-browser.c:991 +#: ../gthumb/gth-browser.c:1006 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" @@ -5059,18 +5106,11 @@ msgstr[1] "Wybrano %d pliki (%s)" msgstr[2] "Wybrano %d plików (%s)" -#: ../gthumb/gth-browser.c:1026 +#: ../gthumb/gth-browser.c:1041 #, c-format msgid "%s of free space" msgstr "Wolne miejsce: %s" -#: ../gthumb/gth-browser.c:1235 ../gthumb/gth-browser.c:1809 -#: ../gthumb/gth-browser.c:5797 ../gthumb/gth-browser.c:5816 -#: ../gthumb/gth-browser.c:5841 -#, c-format -msgid "Could not load the position \"%s\"" -msgstr "Nie można wczytać położenia \"%s\"" - #: ../gthumb/gth-browser.c:1905 ../gthumb/gth-browser.c:1932 #, c-format msgid "No suitable module found for %s" @@ -5090,67 +5130,66 @@ msgid "Do _Not Save" msgstr "_Nie zapisuj" -#: ../gthumb/gth-browser.c:2863 ../gthumb/gth-browser.c:2883 -#: ../gthumb/gth-source-tree.c:178 ../gthumb/gth-source-tree.c:200 +#: ../gthumb/gth-browser.c:2828 ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Nie można zmienić nazwy" -#: ../gthumb/gth-browser.c:3328 ../gthumb/gth-main-default-metadata.c:41 +#: ../gthumb/gth-browser.c:3257 ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Zmodyfikowano" -#: ../gthumb/gth-browser.c:3648 ../gthumb/gth-browser.c:3669 +#: ../gthumb/gth-browser.c:3587 ../gthumb/gth-browser.c:3605 msgid "View the list of visited locations" msgstr "Wyświetla listę odwiedzonych położeń" -#: ../gthumb/gth-browser.c:3690 +#: ../gthumb/gth-browser.c:3623 msgid "View the list of upper locations" msgstr "Wyświetla listę wyższych położeń" -#: ../gthumb/gth-browser.c:5798 +#: ../gthumb/gth-browser.c:5900 #, c-format msgid "File type not supported" msgstr "Nieobsługiwany typ pliku" -#: ../gthumb/gth-browser.c:5842 +#: ../gthumb/gth-browser.c:5943 #, c-format msgid "No suitable module found" msgstr "Nie odnaleziono odpowiedniego modułu" -#: ../gthumb/gth-extensions.c:228 +#: ../gthumb/gth-extensions.c:203 #, c-format msgid "Could not open the module `%s`: %s" msgstr "Nie można otworzyć modułu \"%s\": %s" -#: ../gthumb/gth-extensions.c:831 +#: ../gthumb/gth-extensions.c:744 #, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Rozszerzenie \"%1$s\" jest wymagane przez rozszerzenie \"%2$s\"" -#: ../gthumb/gth-file-source-vfs.c:116 +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Katalog domowy" -#: ../gthumb/gth-file-source-vfs.c:121 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" msgstr "System plików" -#: ../gthumb/gth-file-source-vfs.c:730 +#: ../gthumb/gth-file-source-vfs.c:739 msgid "" "The files cannot be moved to the Trash. Do you want to delete them " "permanently?" msgstr "Nie można przenieść plików do kosza. Usunąć je trwale?" -#: ../gthumb/gth-file-source-vfs.c:741 +#: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" msgstr "Nie można przenieść plików do kosza" -#: ../gthumb/gth-file-source-vfs.c:785 +#: ../gthumb/gth-file-source-vfs.c:797 #, c-format msgid "Are you sure you want to move \"%s\" to trash?" msgstr "Na pewno przenieść \"%s\" do kosza?" -#: ../gthumb/gth-file-source-vfs.c:788 +#: ../gthumb/gth-file-source-vfs.c:801 #, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" @@ -5158,7 +5197,7 @@ msgstr[1] "Na pewno przenieść do kosza %'d zaznaczone pliki?" msgstr[2] "Na pewno przenieść do kosza %'d zaznaczonych plików?" -#: ../gthumb/gth-file-source-vfs.c:829 +#: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" msgid_plural "" @@ -5167,84 +5206,84 @@ msgstr[1] "Na pewno trwale usunąć %'d zaznaczone pliki?" msgstr[2] "Na pewno trwale usunąć %'d zaznaczonych plików?" -#: ../gthumb/gth-filterbar.c:405 +#: ../gthumb/gth-filterbar.c:406 msgid "Hide the filterbar" msgstr "Ukrywa pasek filtru" -#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter.c:43 ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" -#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter.c:44 ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "MB" -#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter.c:45 ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:279 ../gthumb/gth-filter-editor-dialog.c:207 +#: ../gthumb/gth-filter.c:291 ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "pliki" -#: ../gthumb/gth-filter-editor-dialog.c:254 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" msgstr "rosnąco" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" msgstr "malejąco" -#: ../gthumb/gth-filter-editor-dialog.c:545 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "Nie podano ograniczenia" -#: ../gthumb/gth-folder-tree.c:848 +#: ../gthumb/gth-folder-tree.c:857 msgid "Loading..." msgstr "Wczytywanie..." -#: ../gthumb/gth-folder-tree.c:1119 +#: ../gthumb/gth-folder-tree.c:1100 msgid "(Open Parent)" msgstr "(Otwórz nadrzędny)" -#: ../gthumb/gth-histogram-view.c:800 +#: ../gthumb/gth-histogram-view.c:826 msgid "Linear scale" msgstr "Skala liniowa" -#: ../gthumb/gth-histogram-view.c:812 +#: ../gthumb/gth-histogram-view.c:838 msgid "Logarithmic scale" msgstr "Skala logarytmiczna" -#: ../gthumb/gth-histogram-view.c:832 +#: ../gthumb/gth-histogram-view.c:858 msgid "Channel:" msgstr "Kanał:" -#: ../gthumb/gth-histogram-view.c:864 +#: ../gthumb/gth-histogram-view.c:890 msgid "Value" msgstr "Wartość" -#: ../gthumb/gth-histogram-view.c:870 +#: ../gthumb/gth-histogram-view.c:896 msgid "Red" msgstr "Czerwony" -#: ../gthumb/gth-histogram-view.c:876 +#: ../gthumb/gth-histogram-view.c:902 msgid "Green" msgstr "Zielony" -#: ../gthumb/gth-histogram-view.c:882 +#: ../gthumb/gth-histogram-view.c:908 msgid "Blue" msgstr "Niebieski" -#: ../gthumb/gth-histogram-view.c:888 +#: ../gthumb/gth-histogram-view.c:914 msgid "Alpha" msgstr "Alfa" -#: ../gthumb/gth-histogram-view.c:895 +#: ../gthumb/gth-histogram-view.c:921 msgid "RGB" msgstr "RGB" @@ -5261,7 +5300,7 @@ msgstr "Nazwa" #: ../gthumb/gth-main-default-metadata.c:40 -#: ../gthumb/gth-main-default-tests.c:248 +#: ../gthumb/gth-main-default-tests.c:284 msgid "Size" msgstr "Rozmiar" @@ -5301,23 +5340,23 @@ msgid "dimensions" msgstr "wymiary" -#: ../gthumb/gth-main-default-tests.c:225 +#: ../gthumb/gth-main-default-tests.c:261 msgid "Media" msgstr "Multimedia" -#: ../gthumb/gth-main-default-tests.c:232 +#: ../gthumb/gth-main-default-tests.c:268 msgid "Text Files" msgstr "Pliki tekstowe" -#: ../gthumb/gth-main-default-tests.c:240 +#: ../gthumb/gth-main-default-tests.c:276 msgid "Filename" msgstr "Nazwa pliku" -#: ../gthumb/gth-main-default-tests.c:272 +#: ../gthumb/gth-main-default-tests.c:308 msgid "Title (embedded)" msgstr "Tytuł (osadzony)" -#: ../gthumb/gth-main-default-tests.c:278 +#: ../gthumb/gth-main-default-tests.c:316 msgid "Description (embedded)" msgstr "Opis (osadzony)" @@ -5329,7 +5368,7 @@ msgid "No options available for this file type" msgstr "Brak dostępnych opcji dla tego typu pliku" -#: ../gthumb/gth-progress-dialog.c:142 +#: ../gthumb/gth-progress-dialog.c:144 msgid "Cancel operation" msgstr "Anuluj działanie" @@ -5337,60 +5376,60 @@ msgid "Saving file information" msgstr "Zapisywanie informacji o pliku" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-tags-entry.c:388 #, c-format msgid "Create tag «%s»" msgstr "Utwórz etykietę \"%s\"" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:735 msgid "Show all the tags" msgstr "Wyświetl wszystkie etykiety" -#: ../gthumb/gth-tags-file.c:234 +#: ../gthumb/gth-tags-file.c:236 msgid "Holidays" msgstr "Wakacje" -#: ../gthumb/gth-tags-file.c:235 +#: ../gthumb/gth-tags-file.c:237 msgid "Temporary" msgstr "Tymczasowe" -#: ../gthumb/gth-tags-file.c:236 +#: ../gthumb/gth-tags-file.c:238 msgid "Screenshots" msgstr "Zrzuty ekranu" -#: ../gthumb/gth-tags-file.c:237 +#: ../gthumb/gth-tags-file.c:239 msgid "Science" msgstr "Nauka" -#: ../gthumb/gth-tags-file.c:238 +#: ../gthumb/gth-tags-file.c:240 msgid "Favorite" msgstr "Ulubione" -#: ../gthumb/gth-tags-file.c:239 +#: ../gthumb/gth-tags-file.c:241 msgid "Important" msgstr "Ważne" -#: ../gthumb/gth-tags-file.c:240 +#: ../gthumb/gth-tags-file.c:242 msgid "GNOME" msgstr "GNOME" -#: ../gthumb/gth-tags-file.c:241 +#: ../gthumb/gth-tags-file.c:243 msgid "Games" msgstr "Gry" -#: ../gthumb/gth-tags-file.c:242 +#: ../gthumb/gth-tags-file.c:244 msgid "Party" msgstr "Impreza" -#: ../gthumb/gth-tags-file.c:243 +#: ../gthumb/gth-tags-file.c:245 msgid "Birthday" msgstr "Urodziny" -#: ../gthumb/gth-tags-file.c:244 +#: ../gthumb/gth-tags-file.c:246 msgid "Astronomy" msgstr "Astronomia" -#: ../gthumb/gth-tags-file.c:245 +#: ../gthumb/gth-tags-file.c:247 msgid "Family" msgstr "Rodzina" @@ -5408,18 +5447,18 @@ msgid "is not" msgstr "nie wynosi" -#: ../gthumb/gth-test-category.c:374 ../gthumb/gth-test-simple.c:800 -#: ../gthumb/gth-test-simple.c:826 ../gthumb/gth-test-simple.c:847 -#: ../gthumb/gth-test-simple.c:873 +#: ../gthumb/gth-test-category.c:394 ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "Określenie testu jest niepełne" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:252 msgid "Add a new rule" msgstr "Dodaj nową regułę" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:263 msgid "Remove this rule" msgstr "Usuń tę regułę" @@ -5463,11 +5502,11 @@ msgid "is after" msgstr "jest po" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:477 msgid "Today" msgstr "Dzisiaj" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:485 msgid "Now" msgstr "Teraz" @@ -5479,52 +5518,51 @@ msgid "Close _All Windows" msgstr "Z_amknij wszystkie okna" -#: ../gthumb/gtk-utils.c:704 +#: ../gthumb/gtk-utils.c:551 msgid "Could not display help" msgstr "Nie można wyświetlić pomocy" -#: ../gthumb/gtk-utils.c:991 ../gthumb/gtk-utils.c:1000 +#: ../gthumb/gtk-utils.c:868 ../gthumb/gtk-utils.c:875 msgid "Could not launch the application" msgstr "Nie można uruchomić programu" -#: ../gthumb/gtk-utils.c:1103 +#: ../gthumb/gtk-utils.c:978 msgid "_Copy Here" msgstr "S_kopiuj tutaj" -#: ../gthumb/gtk-utils.c:1108 +#: ../gthumb/gtk-utils.c:983 msgid "_Move Here" msgstr "_Przenieś tutaj" -#: ../gthumb/gtk-utils.c:1113 +#: ../gthumb/gtk-utils.c:988 msgid "_Link Here" msgstr "_Dowiąż tutaj" -#: ../gthumb/gtk-utils.c:1122 +#: ../gthumb/gtk-utils.c:997 msgid "Cancel" msgstr "Anuluj" -#: ../gthumb/main.c:72 +#: ../gthumb/main.c:59 msgid "Open a new window" msgstr "Otwiera nowe okno" -#: ../gthumb/main.c:76 +#: ../gthumb/main.c:63 msgid "Start in fullscreen mode" msgstr "Uruchamia w trybie pełnoekranowym" -#: ../gthumb/main.c:80 +#: ../gthumb/main.c:67 msgid "Automatically start a slideshow" msgstr "Automatycznie uruchomia pokaz slajdów" -#: ../gthumb/main.c:84 +#: ../gthumb/main.c:71 msgid "Automatically import digital camera photos" msgstr "Automatycznie importuje zdjęcia z aparatu" -#: ../gthumb/main.c:88 +#: ../gthumb/main.c:75 msgid "Show version" msgstr "Wyświetla wersję" -#. command line options -#: ../gthumb/main.c:539 +#: ../gthumb/main.c:344 msgid "- Image browser and viewer" msgstr "- przeglądarka obrazów" diff -Nru gthumb-2.14.3/po/POTFILES.in gthumb-3.0.0/po/POTFILES.in --- gthumb-2.14.3/po/POTFILES.in 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/po/POTFILES.in 2012-04-09 19:21:40.000000000 +0000 @@ -1,5 +1,8 @@ -# DO NOT EDIT. This file is automatically generated. # List of source files which contain translatable strings. +# +# DO NOT EDIT. This file is automatically generated, to +# update the content run the following command: +# sh update-potfiles.sh > POTFILES.in [encoding: UTF-8] copy-n-paste/eggdesktopfile.c copy-n-paste/eggdesktopfile.h @@ -9,10 +12,31 @@ copy-n-paste/eggsmclient-xsmp.c data/gthumb.desktop.in.in data/gthumb-import.desktop.in.in -data/gthumb.schemas.in +data/org.gnome.gthumb.change-date.gschema.xml.in +data/org.gnome.gthumb.comments.gschema.xml.in +data/org.gnome.gthumb.contact-sheet.gschema.xml.in +data/org.gnome.gthumb.convert-format.gschema.xml.in +data/org.gnome.gthumb.crop.gschema.xml.in +data/org.gnome.gthumb.facebook.gschema.xml.in +data/org.gnome.gthumb.file-manager.gschema.xml.in +data/org.gnome.gthumb.gschema.xml.in +data/org.gnome.gthumb.gstreamer-tools.gschema.xml.in +data/org.gnome.gthumb.image-print.gschema.xml.in +data/org.gnome.gthumb.image-viewer.gschema.xml.in +data/org.gnome.gthumb.importer.gschema.xml.in +data/org.gnome.gthumb.photo-importer.gschema.xml.in +data/org.gnome.gthumb.picasaweb.gschema.xml.in +data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in +data/org.gnome.gthumb.rename-series.gschema.xml.in +data/org.gnome.gthumb.resize.gschema.xml.in +data/org.gnome.gthumb.resize-images.gschema.xml.in +data/org.gnome.gthumb.rotate.gschema.xml.in +data/org.gnome.gthumb.slideshow.gschema.xml.in +data/org.gnome.gthumb.webalbums.gschema.xml.in [type: gettext/glade]data/ui/extensions-preferences.ui [type: gettext/glade]data/ui/filter-editor.ui [type: gettext/glade]data/ui/histogram-info.ui +[type: gettext/glade]data/ui/location.ui [type: gettext/glade]data/ui/overwrite-dialog.ui [type: gettext/glade]data/ui/personalize-filters.ui [type: gettext/glade]data/ui/preferences.ui @@ -47,6 +71,8 @@ extensions/cairo_io/cairo-io-jpeg.h extensions/cairo_io/cairo-io-png.c extensions/cairo_io/cairo-io-png.h +extensions/cairo_io/cairo-io-svg.c +extensions/cairo_io/cairo-io-svg.h extensions/cairo_io/main.c extensions/catalogs/actions.c extensions/catalogs/actions.h @@ -75,7 +101,6 @@ extensions/change_date/callbacks.c extensions/change_date/callbacks.h [type: gettext/ini]extensions/change_date/change_date.extension.in.in -extensions/change_date/data/gthumb_change_date.schemas.in [type: gettext/glade]extensions/change_date/data/ui/change-date.ui extensions/change_date/dlg-change-date.c extensions/change_date/dlg-change-date.h @@ -83,13 +108,18 @@ extensions/change_date/gth-change-date-task.h extensions/change_date/main.c extensions/change_date/preferences.h +extensions/comments/actions.c +extensions/comments/actions.h +extensions/comments/callbacks.c +extensions/comments/callbacks.h [type: gettext/ini]extensions/comments/comments.extension.in.in -extensions/comments/data/gthumb-comments.schemas.in [type: gettext/glade]extensions/comments/data/ui/comments-preferences.ui extensions/comments/dlg-comments-preferences.c extensions/comments/dlg-comments-preferences.h extensions/comments/gth-comment.c extensions/comments/gth-comment.h +extensions/comments/gth-import-metadata-task.c +extensions/comments/gth-import-metadata-task.h extensions/comments/gth-metadata-provider-comment.c extensions/comments/gth-metadata-provider-comment.h extensions/comments/main.c @@ -99,7 +129,6 @@ extensions/contact_sheet/callbacks.c extensions/contact_sheet/callbacks.h [type: gettext/ini]extensions/contact_sheet/contact_sheet.extension.in.in -extensions/contact_sheet/data/gthumb_contact_sheet.schemas.in [type: gettext/glade]extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui [type: gettext/glade]extensions/contact_sheet/data/ui/contact-sheet.ui [type: gettext/glade]extensions/contact_sheet/data/ui/image-wall.ui @@ -120,7 +149,6 @@ extensions/convert_format/callbacks.c extensions/convert_format/callbacks.h [type: gettext/ini]extensions/convert_format/convert_format.extension.in.in -extensions/convert_format/data/gthumb_convert_format.schemas.in [type: gettext/glade]extensions/convert_format/data/ui/convert-format.ui extensions/convert_format/dlg-convert-format.c extensions/convert_format/dlg-convert-format.h @@ -143,23 +171,27 @@ [type: gettext/ini]extensions/edit_metadata/edit_metadata.extension.in.in extensions/edit_metadata/gth-delete-metadata-task.c extensions/edit_metadata/gth-delete-metadata-task.h -extensions/edit_metadata/gth-edit-comment-page.c -extensions/edit_metadata/gth-edit-comment-page.h +extensions/edit_metadata/gth-edit-comment-dialog.c +extensions/edit_metadata/gth-edit-comment-dialog.h +extensions/edit_metadata/gth-edit-general-page.c +extensions/edit_metadata/gth-edit-general-page.h extensions/edit_metadata/gth-edit-metadata-dialog.c extensions/edit_metadata/gth-edit-metadata-dialog.h -extensions/edit_metadata/gth-tag-chooser-dialog.c -extensions/edit_metadata/gth-tag-chooser-dialog.h +extensions/edit_metadata/gth-edit-tags-dialog.c +extensions/edit_metadata/gth-edit-tags-dialog.h extensions/edit_metadata/gth-tag-task.c extensions/edit_metadata/gth-tag-task.h extensions/edit_metadata/main.c +extensions/edit_metadata/utils.c +extensions/edit_metadata/utils.h [type: gettext/ini]extensions/example/src/example.extension.in.in extensions/example/src/main.c [type: gettext/glade]extensions/exiv2_tools/data/ui/edit-exiv2-page.ui [type: gettext/ini]extensions/exiv2_tools/exiv2_tools.extension.in.in extensions/exiv2_tools/exiv2-utils.cpp extensions/exiv2_tools/exiv2-utils.h -extensions/exiv2_tools/gth-edit-exiv2-page.c -extensions/exiv2_tools/gth-edit-exiv2-page.h +extensions/exiv2_tools/gth-edit-iptc-page.c +extensions/exiv2_tools/gth-edit-iptc-page.h extensions/exiv2_tools/gth-metadata-provider-exiv2.c extensions/exiv2_tools/gth-metadata-provider-exiv2.h extensions/exiv2_tools/main.c @@ -171,7 +203,6 @@ extensions/facebook/actions.h extensions/facebook/callbacks.c extensions/facebook/callbacks.h -extensions/facebook/data/gthumb-facebook.schemas.in [type: gettext/glade]extensions/facebook/data/ui/export-to-facebook.ui [type: gettext/glade]extensions/facebook/data/ui/facebook-account-chooser.ui [type: gettext/glade]extensions/facebook/data/ui/facebook-account-manager.ui @@ -209,7 +240,6 @@ extensions/file_manager/actions.h extensions/file_manager/callbacks.c extensions/file_manager/callbacks.h -extensions/file_manager/data/gthumb-file-manager.schemas.in [type: gettext/ini]extensions/file_manager/file_manager.extension.in.in extensions/file_manager/gth-copy-task.c extensions/file_manager/gth-copy-task.h @@ -227,9 +257,6 @@ extensions/file_tools/cairo-rotate.h extensions/file_tools/callbacks.c extensions/file_tools/callbacks.h -extensions/file_tools/data/gthumb_crop_options.schemas.in -extensions/file_tools/data/gthumb_resize_options.schemas.in -extensions/file_tools/data/gthumb_rotate_options.schemas.in [type: gettext/glade]extensions/file_tools/data/ui/adjust-colors-options.ui [type: gettext/glade]extensions/file_tools/data/ui/crop-options.ui [type: gettext/glade]extensions/file_tools/data/ui/resize-options.ui @@ -335,7 +362,6 @@ extensions/flicker_utils/main.c extensions/gstreamer_tools/actions.c extensions/gstreamer_tools/actions.h -extensions/gstreamer_tools/data/gthumb-gstreamer.schemas.in [type: gettext/glade]extensions/gstreamer_tools/data/ui/mediabar.ui [type: gettext/glade]extensions/gstreamer_tools/data/ui/save-screenshot.ui [type: gettext/ini]extensions/gstreamer_tools/gstreamer_tools.extension.in.in @@ -355,7 +381,6 @@ extensions/image_print/actions.h extensions/image_print/callbacks.c extensions/image_print/callbacks.h -extensions/image_print/data/gthumb_image_print.schemas.in [type: gettext/glade]extensions/image_print/data/ui/print-layout.ui [type: gettext/glade]extensions/image_print/data/ui/print-preferences.ui extensions/image_print/gth-image-info.c @@ -380,7 +405,6 @@ extensions/image_rotation/main.c extensions/image_rotation/rotation-utils.c extensions/image_rotation/rotation-utils.h -extensions/image_viewer/data/gthumb-image-viewer.schemas.in [type: gettext/glade]extensions/image_viewer/data/ui/image-viewer-preferences.ui extensions/image_viewer/gth-image-histogram.c extensions/image_viewer/gth-image-histogram.h @@ -392,7 +416,6 @@ extensions/image_viewer/main.c extensions/image_viewer/preferences.c extensions/image_viewer/preferences.h -extensions/importer/data/gthumb-importer.schemas.in [type: gettext/glade]extensions/importer/data/ui/import-preferences.ui extensions/importer/gth-import-destination-button.c extensions/importer/gth-import-destination-button.h @@ -488,7 +511,6 @@ extensions/photo_importer/actions.h extensions/photo_importer/callbacks.c extensions/photo_importer/callbacks.h -extensions/photo_importer/data/gthumb_photo_importer.schemas.in [type: gettext/glade]extensions/photo_importer/data/ui/photo-importer-options.ui [type: gettext/glade]extensions/photo_importer/data/ui/photo-importer.ui extensions/photo_importer/dlg-photo-importer.c @@ -500,7 +522,6 @@ extensions/picasaweb/actions.h extensions/picasaweb/callbacks.c extensions/picasaweb/callbacks.h -extensions/picasaweb/data/gthumb-picasaweb.schemas.in [type: gettext/glade]extensions/picasaweb/data/ui/export-to-picasaweb.ui [type: gettext/glade]extensions/picasaweb/data/ui/import-from-picasaweb.ui [type: gettext/glade]extensions/picasaweb/data/ui/picasa-web-account-chooser.ui @@ -534,7 +555,6 @@ extensions/picasaweb/picasa-web-user.c extensions/picasaweb/picasa-web-user.h extensions/picasaweb/preferences.h -extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in [type: gettext/glade]extensions/pixbuf_savers/data/ui/jpeg-options.ui [type: gettext/glade]extensions/pixbuf_savers/data/ui/png-options.ui [type: gettext/glade]extensions/pixbuf_savers/data/ui/save-options-preferences.ui @@ -561,7 +581,6 @@ [type: gettext/ini]extensions/red_eye_removal/red_eye_removal.extension.in.in extensions/rename_series/callbacks.c extensions/rename_series/callbacks.h -extensions/rename_series/data/gthumb_rename_series.schemas.in [type: gettext/glade]extensions/rename_series/data/ui/code-selector.ui [type: gettext/glade]extensions/rename_series/data/ui/rename-series.ui extensions/rename_series/dlg-rename-series.c @@ -579,7 +598,6 @@ extensions/resize_images/actions.h extensions/resize_images/callbacks.c extensions/resize_images/callbacks.h -extensions/resize_images/data/gthumb_resize_images.schemas.in [type: gettext/glade]extensions/resize_images/data/ui/resize-images.ui extensions/resize_images/dlg-resize-images.c extensions/resize_images/dlg-resize-images.h @@ -601,11 +619,22 @@ extensions/search/gth-search-task.h extensions/search/main.c [type: gettext/ini]extensions/search/search.extension.in.in +extensions/selections/actions.c +extensions/selections/actions.h +extensions/selections/callbacks.c +extensions/selections/callbacks.h +extensions/selections/gth-file-source-selections.c +extensions/selections/gth-file-source-selections.h +extensions/selections/gth-metadata-provider-selections.c +extensions/selections/gth-metadata-provider-selections.h +extensions/selections/gth-selections-manager.c +extensions/selections/gth-selections-manager.h +extensions/selections/main.c +[type: gettext/ini]extensions/selections/selections.extension.in.in extensions/slideshow/actions.c extensions/slideshow/actions.h extensions/slideshow/callbacks.c extensions/slideshow/callbacks.h -extensions/slideshow/data/gthumb-slideshow.schemas.in [type: gettext/glade]extensions/slideshow/data/ui/slideshow-preferences.ui extensions/slideshow/gth-slideshow.c extensions/slideshow/gth-slideshow.h @@ -624,7 +653,6 @@ extensions/webalbums/callbacks.c extensions/webalbums/callbacks.h extensions/webalbums/data/albumthemes/text.h -extensions/webalbums/data/gthumb_webalbums.schemas.in [type: gettext/glade]extensions/webalbums/data/ui/web-album-exporter.ui extensions/webalbums/dlg-web-exporter.c extensions/webalbums/dlg-web-exporter.h @@ -635,6 +663,8 @@ [type: gettext/ini]extensions/webalbums/webalbums.extension.in.in gthumb/cairo-utils.c gthumb/cairo-utils.h +gthumb/dlg-location.c +gthumb/dlg-location.h gthumb/dlg-personalize-filters.c gthumb/dlg-personalize-filters.h gthumb/dlg-preferences.c @@ -648,8 +678,6 @@ gthumb/eggfileformatchooser.c gthumb/eggfileformatchooser.h gthumb/egg-macros.h -gthumb/gconf-utils.c -gthumb/gconf-utils.h gthumb/gedit-message-area.c gthumb/gedit-message-area.h gthumb/gio-utils.c @@ -663,6 +691,8 @@ gthumb/gsignature.h gthumb/gth-async-task.c gthumb/gth-async-task.h +gthumb/gth-auto-paned.c +gthumb/gth-auto-paned.h gthumb/gth-browser-actions-callbacks.c gthumb/gth-browser-actions-callbacks.h gthumb/gth-browser-actions-entries.h @@ -671,8 +701,6 @@ gthumb/gth-browser-ui.h gthumb/gth-buffer-data.c gthumb/gth-buffer-data.h -gthumb/gth-cell-renderer-thumbnail.c -gthumb/gth-cell-renderer-thumbnail.h gthumb/gth-dumb-notebook.c gthumb/gth-dumb-notebook.h gthumb/gth-duplicable.c @@ -715,6 +743,8 @@ gthumb/gth-filter.h gthumb/gth-folder-tree.c gthumb/gth-folder-tree.h +gthumb/gth-grid-view.c +gthumb/gth-grid-view.h gthumb/gth-histogram.c gthumb/gth-histogram.h gthumb/gth-histogram-view.c @@ -723,8 +753,6 @@ gthumb/gth-hook.h gthumb/gth-icon-cache.c gthumb/gth-icon-cache.h -gthumb/gth-icon-view.c -gthumb/gth-icon-view.h gthumb/gth-image.c gthumb/gth-image-dragger.c gthumb/gth-image-dragger.h @@ -745,8 +773,6 @@ gthumb/gth-image-viewer-tool.h gthumb/gth-info-bar.c gthumb/gth-info-bar.h -gthumb/gth-list-view.c -gthumb/gth-list-view.h gthumb/gth-load-file-data-task.c gthumb/gth-load-file-data-task.h gthumb/gth-location-chooser.c @@ -758,6 +784,8 @@ gthumb/gth-main-default-tests.c gthumb/gth-main-default-types.c gthumb/gth-main.h +gthumb/gth-menu-action.c +gthumb/gth-menu-action.h gthumb/gth-menu-button.c gthumb/gth-menu-button.h gthumb/gth-metadata.c @@ -821,6 +849,8 @@ gthumb/gth-time.h gthumb/gth-time-selector.c gthumb/gth-time-selector.h +gthumb/gth-toggle-menu-action.c +gthumb/gth-toggle-menu-action.h gthumb/gth-toggle-menu-tool-button.c gthumb/gth-toggle-menu-tool-button.h gthumb/gth-toolbox.c diff -Nru gthumb-2.14.3/po/ru.po gthumb-3.0.0/po/ru.po --- gthumb-2.14.3/po/ru.po 2011-10-17 08:50:18.000000000 +0000 +++ gthumb-3.0.0/po/ru.po 2012-02-19 15:01:32.000000000 +0000 @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: gthumb trunk\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb&component=general\n" -"POT-Creation-Date: 2011-01-09 15:51+0000\n" -"PO-Revision-Date: 2011-01-10 18:17+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-12-13 18:49+0000\n" +"PO-Revision-Date: 2012-01-05 00:47+0300\n" "Last-Translator: Yuri Myasoedov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -20,67 +20,71 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Файл не является правильным .desktop файлом" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Неизвестная версия файла .desktop «%s»" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "Запуск %s" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "Приложение не поддерживает открытие документов через командную строку" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "Неизвестный параметр запуска: %d" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format -#| msgid "Can't pass document URIs to a desktop entry" msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "Невозможно передать URI в запись «Type=Link» файла .desktop" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "Не может быть запущено" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "Запретить соединение с диспетчером сеансов" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "Указать файл, содержащий сохранённую конфигурацию" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "ФАЙЛ" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "Указать ID диспетчера сеансов" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "ID" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "Параметры управления сеансом:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "Показать параметры управления сеансом" @@ -92,8 +96,11 @@ msgid "View and organize your images" msgstr "Просмотр изображений и ведение альбомов" +#. manually set name and icon #: ../data/gthumb.desktop.in.in.h:3 -#: ../data/gthumb-import.desktop.in.in.h:3 +#: ../gthumb/gth-browser.c:529 +#: ../gthumb/gth-progress-dialog.c:386 +#: ../gthumb/main.c:313 msgid "gThumb" msgstr "gThumb" @@ -106,6 +113,10 @@ msgstr "Импортировать фотографии с цифровой камеры" #: ../data/gthumb-import.desktop.in.in.h:2 +msgid "Import with gThumb" +msgstr "Импортировать с помощью gThumb" + +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "Photo Import Tool" msgstr "Инструмент импортирования фотографий" @@ -113,67 +124,55 @@ msgid "gThumb Photo Import Tool" msgstr "Инструмент импортирования фотографий gThumb" -#: ../data/gthumb.schemas.in.h:1 +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want to generate thumbnails for all images." msgstr "Для изображений больше указанного размера не будут создаваться миниатюры. Если установлено значение 0, миниатюры будут создаваться для всех изображений." -#: ../data/gthumb.schemas.in.h:2 -msgid "Possible values are: actual_size, fit, keep_prev, fit_if_larger, fit_width_if_larger." -msgstr "Возможные значения: actual_size, fit, keep_prev, fit_if_larger, fit_width_if_larger." - -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "Возможные значения: high, low." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "Возможные значения: light, midtone, dark." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "Возможные значения: list, thumbnails." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "Возможные значения: small, medium, large." - -#: ../data/gthumb.schemas.in.h:7 -msgid "Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "Возможные значения: system, text_below, text_beside, text_only, icons_only." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +#| msgid "Open another window" +msgid "Open files in the active window" +msgstr "Открывать файлы в текущем окне" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Whether to resize the window to fit the size of the image" +msgstr "Изменять ли размер окна, чтобы подогнать размер изображения" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "Возможные значения: white, black, checked, none." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 msgid "Whether to always use a black background." msgstr "Всегда ли использовать чёрный фон." -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" -msgstr "Восстанавливать позиции полос прокрутки после изменения изображения" - -#: ../data/ui/extensions.ui.h:1 -msgid "Available _extensions:" -msgstr "_Доступные расширения:" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 +#| msgid "Whether to reset the scrollbar positions after changing image" +msgid "Whether to reset the scrollbars position after changing image" +msgstr "Сбрасывать ли положение полос прокрутки после изменения изображения" + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Возможные значения: jpeg, jpg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Возможные значения: tiff, tif." -#: ../data/ui/extensions.ui.h:2 +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" +msgstr "Возможные значения: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" + +#: ../data/ui/extensions-preferences.ui.h:1 msgid "More extensions..." msgstr "Дополнительные расширения…" -#: ../data/ui/extensions.ui.h:3 -msgid "_Categories:" -msgstr "Ка_тегории:" - -#: ../data/ui/extensions.ui.h:4 -msgid "gthumb Extensions" -msgstr "Расширения gthumb" +#: ../data/ui/extensions-preferences.ui.h:2 +msgid "Some extensions are configurable." +msgstr "Некоторые расширения можно настраивать." + +#: ../data/ui/extensions-preferences.ui.h:3 +msgid "_Extensions:" +msgstr "_Расширения:" #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" @@ -181,8 +180,8 @@ #. limit label #: ../data/ui/filter-editor.ui.h:2 -#: ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 +#: ../gthumb/gth-filter.c:268 +#: ../gthumb/gth-filter.c:340 msgid "_Limit to" msgstr "_Ограничить до" @@ -195,6 +194,36 @@ msgid "selected by" msgstr "выбрано с помощью" +#: ../data/ui/histogram-info.ui.h:1 +msgid "Mean:" +msgstr "Среднее:" + +#: ../data/ui/histogram-info.ui.h:2 +msgid "Median:" +msgstr "Медиана:" + +#. After the colon there is a percentile. +#: ../data/ui/histogram-info.ui.h:4 +msgctxt "Pixels" +msgid "Max:" +msgstr "Макс.:" + +#. After the colon there is the percentile of selected pixels. +#: ../data/ui/histogram-info.ui.h:6 +msgctxt "Pixels" +msgid "Selected:" +msgstr "Выделено:" + +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:8 +msgid "Pixels:" +msgstr "Пикселов:" + +#. Short for "Standard deviation". Try to keep it short in the translation. +#: ../data/ui/histogram-info.ui.h:10 +msgid "Std dev:" +msgstr "Станд. отклон.:" + #: ../data/ui/overwrite-dialog.ui.h:1 msgid "Do not overwrite _the old file" msgstr "Не перезаписывать _старый файл" @@ -229,7 +258,7 @@ #: ../data/ui/overwrite-dialog.ui.h:9 #: ../extensions/file_tools/data/ui/crop-options.ui.h:9 -#: ../extensions/image_print/data/ui/print-layout.ui.h:13 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 msgid "Size:" msgstr "Размер:" @@ -254,183 +283,107 @@ msgstr "_Другие фильтры:" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Активировать элементы двойным щелчком" - -#: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Активировать элементы одним щелчком" - -#: ../data/ui/preferences.ui.h:3 msgid "Appearance" msgstr "Внешний вид" -#: ../data/ui/preferences.ui.h:4 +#: ../data/ui/preferences.ui.h:2 msgid "As_k confirmation before deleting files or catalogs" msgstr "Запрашивать _подтверждение перед удалением файлов или каталогов" -#: ../data/ui/preferences.ui.h:5 +#: ../data/ui/preferences.ui.h:3 msgid "Ask whether to save _modified files" msgstr "Запрашивать подтверждение для сохранения _изменённых файлов" -#: ../data/ui/preferences.ui.h:6 -#: ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Чёрным цветом" - -#: ../data/ui/preferences.ui.h:7 -#: ../gthumb/dlg-extensions.c:69 -#: ../gthumb/gth-browser-actions-entries.h:155 +#: ../data/ui/preferences.ui.h:4 +#: ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:173 msgid "Browser" msgstr "Обозреватель" -#: ../data/ui/preferences.ui.h:8 +#: ../data/ui/preferences.ui.h:5 #: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:1 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 msgid "Caption" msgstr "Подпись" -#: ../data/ui/preferences.ui.h:9 -#: ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "шахматным рисунком" - -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:6 msgid "Choose startup folder" msgstr "Выберите начальную папку" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:7 msgid "D_etermine image type from content (slower)" msgstr "Определять тип изображения по содер_жимому (медленнее)" -#: ../data/ui/preferences.ui.h:12 -#: ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Подогнать по ширине, если больше" - -#: ../data/ui/preferences.ui.h:13 -#: ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Подогнать по окну" - -#: ../data/ui/preferences.ui.h:14 -#: ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Подогнать по окну, если больше" - -#: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "Использовать управление, как в Nautilus" +#: ../data/ui/preferences.ui.h:8 +msgid "File _properties in browser:" +msgstr "_Свойства файла в браузере:" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:9 #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:374 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/edit_metadata/gth-edit-general-page.c:404 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 #: ../gthumb/gth-main-default-metadata.c:33 msgid "General" msgstr "Общие" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:10 msgid "Go to last _visited location" msgstr "Перейти к _месту последнего посещения" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:11 msgid "Go to this _folder:" msgstr "Перейти в указанную _папку:" -#: ../data/ui/preferences.ui.h:19 -#: ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Только значки" - -#: ../data/ui/preferences.ui.h:20 -#: ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Оставить предыдущий режим масштабирования" - -#: ../data/ui/preferences.ui.h:21 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 -#: ../extensions/file_tools/gth-file-tool-crop.c:399 -#: ../extensions/file_tools/gth-file-tool-crop.c:425 -#: ../extensions/file_tools/gth-file-tool-resize.c:422 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:278 -msgid "None" -msgstr "Отсутствует" - -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:12 msgid "On startup:" msgstr "При запуске:" -#: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:192 +#: ../data/ui/preferences.ui.h:13 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 msgid "Other" msgstr "Другое" -#: ../data/ui/preferences.ui.h:24 -msgid "Set image to actual size" -msgstr "Не масштабировать изображение" - -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:14 msgid "Set to C_urrent" msgstr "Сделать _текущим" -#. Set widgets data. -#: ../data/ui/preferences.ui.h:26 -#: ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Системные настройки" - -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:15 msgid "T_humbnails in viewer:" msgstr "Миниатюры при просмотре:" -#: ../data/ui/preferences.ui.h:28 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Текст под значками" - -#: ../data/ui/preferences.ui.h:29 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Текст рядом со значками" - -#: ../data/ui/preferences.ui.h:30 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Только текст" - -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:16 msgid "Thumbnail _size:" msgstr "Размер _миниатюр:" -#: ../data/ui/preferences.ui.h:32 -#: ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Белым цветом" +#: ../data/ui/preferences.ui.h:17 +#| msgid "Resize the window to the size of the image" +msgid "_Reuse the active window to open files" +msgstr "_Повторно использовать текущее окно для открытия файлов" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:18 msgid "_Store metadata inside files if possible" msgstr "_Хранить метаданные внутри файлов, если это возможно" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:19 msgid "_Toolbar style:" msgstr "Стиль панели _инструментов:" -#: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "Параметры gThumb" - -#: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "внизу" - -#: ../data/ui/preferences.ui.h:37 -msgid "on the side" -msgstr "сбоку" +#: ../data/ui/preferences.ui.h:20 +#| msgid "View the folders" +msgid "below the folder list" +msgstr "под списком папок" + +#: ../data/ui/preferences.ui.h:21 +msgid "gThumb Preferences" +msgstr "Настройки gThumb" + +#: ../data/ui/preferences.ui.h:22 +#| msgid "Rotate Right" +msgid "on the right" +msgstr "справа" #: ../data/ui/sort-order.ui.h:1 msgid "Sort By" @@ -441,10 +394,26 @@ msgstr "В _обратном порядке" #: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 msgid "_Sort by:" msgstr "_Сортировать по:" +#: ../extensions/23hq/23hq.extension.in.in.h:1 +msgid "23" +msgstr "23" + +#: ../extensions/23hq/23hq.extension.in.in.h:2 +msgid "Upload images to 23hq.com" +msgstr "Загрузить изображения на 23hq.com" + +#: ../extensions/23hq/callbacks.c:68 +msgid "_23..." +msgstr "_23…" + +#: ../extensions/23hq/callbacks.c:69 +msgid "Upload photos to 23" +msgstr "Загрузить снимки на 23" + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 msgid "Add bookmarks support." msgstr "Добавить поддержку закладок." @@ -466,6 +435,7 @@ #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:3 #: ../extensions/file_manager/file_manager.extension.in.in.h:3 #: ../extensions/file_tools/file_tools.extension.in.in.h:3 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:3 #: ../extensions/gstreamer_tools/gstreamer_tools.extension.in.in.h:3 #: ../extensions/image_print/image_print.extension.in.in.h:3 #: ../extensions/image_rotation/image_rotation.extension.in.in.h:3 @@ -483,27 +453,27 @@ msgid "gthumb development team" msgstr "Команда разработчиков gthumb" -#: ../extensions/bookmarks/callbacks.c:52 +#: ../extensions/bookmarks/callbacks.c:54 msgid "_Bookmarks" msgstr "_Закладки" -#: ../extensions/bookmarks/callbacks.c:53 +#: ../extensions/bookmarks/callbacks.c:55 msgid "_System Bookmarks" msgstr "_Системные закладки" -#: ../extensions/bookmarks/callbacks.c:56 +#: ../extensions/bookmarks/callbacks.c:58 msgid "_Add Bookmark" msgstr "_Добавить закладку" -#: ../extensions/bookmarks/callbacks.c:57 +#: ../extensions/bookmarks/callbacks.c:59 msgid "Add current location to bookmarks" msgstr "Добавить текущее местоположение в закладки" -#: ../extensions/bookmarks/callbacks.c:61 +#: ../extensions/bookmarks/callbacks.c:63 msgid "_Edit Bookmarks..." msgstr "_Изменить закладки…" -#: ../extensions/bookmarks/callbacks.c:62 +#: ../extensions/bookmarks/callbacks.c:64 msgid "Edit bookmarks" msgstr "Изменить закладки" @@ -561,142 +531,166 @@ #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Записать на диск" -#: ../extensions/catalogs/actions.c:62 -msgid "Could not remove the files from the catalog" -msgstr "Не удалось удалить файлы из каталога" +#: ../extensions/cairo_io/cairo-io-jpeg.c:62 +#, c-format +msgid "Error interpreting JPEG image file: %s" +msgstr "Ошибка интерпретации изображения в формате JPEG: %s" -#: ../extensions/catalogs/actions.c:120 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:637 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:646 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 -#: ../extensions/search/gth-search.c:295 -msgid "Invalid file format" -msgstr "Неверный формат файла" +#: ../extensions/cairo_io/cairo-io-jpeg.c:482 +#, c-format +msgid "Unknown JPEG color space (%d)" +msgstr "Неизвестное цветовое пространство JPEG (%d)" + +#: ../extensions/catalogs/actions.c:92 +#: ../extensions/catalogs/actions.c:213 +#: ../extensions/catalogs/dlg-add-to-catalog.c:274 +#: ../extensions/catalogs/dlg-add-to-catalog.c:394 +#: ../extensions/file_manager/actions.c:65 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 +#, c-format +msgid "No name specified" +msgstr "Не указано имя" -#: ../extensions/catalogs/actions.c:189 -#: ../extensions/catalogs/dlg-add-to-catalog.c:265 -msgid "Enter the catalog name: " -msgstr "Введите имя каталога: " - -#: ../extensions/catalogs/actions.c:193 -#: ../extensions/catalogs/actions.c:259 -#: ../extensions/catalogs/dlg-add-to-catalog.c:269 -#: ../extensions/catalogs/dlg-add-to-catalog.c:335 -#: ../extensions/file_manager/actions.c:46 +#: ../extensions/catalogs/actions.c:99 +#: ../extensions/catalogs/actions.c:220 +#: ../extensions/catalogs/dlg-add-to-catalog.c:281 +#: ../extensions/catalogs/dlg-add-to-catalog.c:401 +#: ../extensions/file_manager/actions.c:72 +#, c-format +msgid "Invalid name. The following characters are not allowed: %s" +msgstr "Недопустимое имя. Следующие символы запрещены к использованию: %s." + +#: ../extensions/catalogs/actions.c:155 +#: ../extensions/catalogs/actions.c:267 +#: ../extensions/catalogs/dlg-add-to-catalog.c:338 +#: ../extensions/catalogs/dlg-add-to-catalog.c:448 +#: ../extensions/catalogs/gth-file-source-catalogs.c:503 +#: ../extensions/file_manager/actions.c:103 +msgid "Name already used" +msgstr "Это имя уже используется" + +#: ../extensions/catalogs/actions.c:178 +#: ../extensions/catalogs/dlg-add-to-catalog.c:359 +msgid "New catalog" +msgstr "Новый каталог" + +#: ../extensions/catalogs/actions.c:179 +#: ../extensions/catalogs/dlg-add-to-catalog.c:360 +msgid "Enter the catalog name:" +msgstr "Введите название каталога: " + +#: ../extensions/catalogs/actions.c:181 +#: ../extensions/catalogs/actions.c:293 +#: ../extensions/catalogs/dlg-add-to-catalog.c:362 +#: ../extensions/catalogs/dlg-add-to-catalog.c:474 +#: ../extensions/file_manager/actions.c:133 msgid "C_reate" msgstr "_Создать" -#: ../extensions/catalogs/actions.c:233 -#: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/catalogs/dlg-add-to-catalog.c:310 -#: ../extensions/search/gth-search-task.c:332 -msgid "Could not create the catalog" -msgstr "Не удалось создать каталог" - -#: ../extensions/catalogs/actions.c:255 -#: ../extensions/catalogs/dlg-add-to-catalog.c:331 -msgid "Enter the library name: " +#: ../extensions/catalogs/actions.c:290 +#: ../extensions/catalogs/dlg-add-to-catalog.c:471 +msgid "New library" +msgstr "Новая коллекция" + +#: ../extensions/catalogs/actions.c:291 +#: ../extensions/catalogs/dlg-add-to-catalog.c:472 +msgid "Enter the library name:" msgstr "Введите название коллекции: " -#: ../extensions/catalogs/actions.c:299 -#: ../extensions/catalogs/dlg-add-to-catalog.c:375 -msgid "Could not create the library" -msgstr "Не удалось создать коллекцию" - -#: ../extensions/catalogs/actions.c:331 +#: ../extensions/catalogs/actions.c:326 msgid "Could not remove the catalog" msgstr "Не удалось удалить каталог" -#: ../extensions/catalogs/actions.c:365 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" msgstr "Действительно удалить «%s»?" -#: ../extensions/catalogs/callbacks.c:99 +#: ../extensions/catalogs/callbacks.c:102 msgid "_Add to Catalog" msgstr "Добавить в к_аталог" -#: ../extensions/catalogs/callbacks.c:102 +#: ../extensions/catalogs/callbacks.c:105 msgid "Open _Folder" msgstr "Открыть _папку" -#: ../extensions/catalogs/callbacks.c:103 +#: ../extensions/catalogs/callbacks.c:106 msgid "Go to the folder that contains the selected file" msgstr "Перейти в каталог, который содержит выбранный файл" -#: ../extensions/catalogs/callbacks.c:107 -#: ../extensions/edit_metadata/callbacks.c:106 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:87 +#: ../extensions/catalogs/callbacks.c:110 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Другой…" -#: ../extensions/catalogs/callbacks.c:108 +#: ../extensions/catalogs/callbacks.c:111 msgid "Choose another catalog" msgstr "Выбрать другой каталог" -#: ../extensions/catalogs/callbacks.c:112 +#: ../extensions/catalogs/callbacks.c:115 msgid "_Add to Catalog..." msgstr "Добавить в к_аталог…" -#: ../extensions/catalogs/callbacks.c:113 +#: ../extensions/catalogs/callbacks.c:116 msgid "Add selected images to a catalog" msgstr "Добавить выделенные изображения в каталог" -#: ../extensions/catalogs/callbacks.c:117 +#: ../extensions/catalogs/callbacks.c:120 msgid "Remo_ve from Catalog" msgstr "Удалить из к_аталога" -#: ../extensions/catalogs/callbacks.c:118 +#: ../extensions/catalogs/callbacks.c:121 msgid "Remove selected images from the catalog" msgstr "Удалить выделенные изображения из каталога" -#: ../extensions/catalogs/callbacks.c:122 +#: ../extensions/catalogs/callbacks.c:125 msgid "Create _Catalog" msgstr "Создать к_аталог" -#: ../extensions/catalogs/callbacks.c:127 +#: ../extensions/catalogs/callbacks.c:130 msgid "Create _Library" msgstr "Создать _коллекцию" -#: ../extensions/catalogs/callbacks.c:137 +#: ../extensions/catalogs/callbacks.c:140 msgid "Rena_me" msgstr "Пере_именовать" -#: ../extensions/catalogs/callbacks.c:275 -#: ../extensions/catalogs/callbacks.c:278 +#: ../extensions/catalogs/callbacks.c:279 +#: ../extensions/catalogs/callbacks.c:282 msgid "Command Line" msgstr "Командная строка" -#: ../extensions/catalogs/callbacks.c:493 -#: ../extensions/catalogs/callbacks.c:498 -#: ../extensions/photo_importer/dlg-photo-importer.c:313 -#: ../extensions/photo_importer/dlg-photo-importer.c:353 -#: ../gthumb/gth-file-list.c:45 -#: ../gthumb/gth-folder-tree.c:874 +#: ../extensions/catalogs/callbacks.c:497 +#: ../extensions/catalogs/callbacks.c:502 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 +#: ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(Пусто)" -#: ../extensions/catalogs/callbacks.c:691 +#: ../extensions/catalogs/callbacks.c:697 msgid "Catalog Properties" msgstr "Свойства каталога" -#: ../extensions/catalogs/callbacks.c:705 +#: ../extensions/catalogs/callbacks.c:711 msgid "Organize" msgstr "Упорядочить" -#: ../extensions/catalogs/callbacks.c:706 +#: ../extensions/catalogs/callbacks.c:712 msgid "Automatically organize files by date" msgstr "Автоматически упорядочивать файлы по дате" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:660 +#: ../extensions/catalogs/gth-catalog.c:1017 +#: ../extensions/catalogs/gth-catalog.c:1018 msgid "Catalogs" msgstr "Каталоги" @@ -721,8 +715,8 @@ msgstr "Н_овый каталог" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:984 -#: ../extensions/webalbums/gth-web-exporter.c:1833 +#: ../extensions/file_manager/actions.c:929 +#: ../extensions/webalbums/gth-web-exporter.c:1842 msgid "_View the destination" msgstr "_Просмотреть место назначения" @@ -731,7 +725,7 @@ msgstr "Каталог" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:199 +#: ../gthumb/gth-file-properties.c:212 msgid "Properties" msgstr "Свойства" @@ -741,10 +735,10 @@ msgstr "_Дата:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:36 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 #: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 msgid "_Name:" @@ -776,7 +770,7 @@ msgstr "Ничего не выбирать" #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:451 +#: ../extensions/edit_metadata/gth-edit-general-page.c:480 #: ../gthumb/gth-main-default-tests.c:264 msgid "Date photo was taken" msgstr "Дата получения фотографии" @@ -799,7 +793,7 @@ msgstr "Одиночные" #: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:225 +#: ../extensions/comments/main.c:280 msgid "Tag" msgstr "Метка" @@ -813,6 +807,7 @@ msgstr "_Группировать файлы по:" #: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "_Включать вложенные каталоги" @@ -826,11 +821,16 @@ msgid "Could not add the files to the catalog" msgstr "Не удалось добавить файлы в каталог" +#: ../extensions/catalogs/dlg-add-to-catalog.c:217 +#: ../extensions/search/gth-search-task.c:356 +msgid "Could not create the catalog" +msgstr "Не удалось создать каталог" + #: ../extensions/catalogs/dlg-catalog-properties.c:80 msgid "Could not save the catalog" msgstr "Не удалось сохранить каталог" -#: ../extensions/catalogs/dlg-catalog-properties.c:166 +#: ../extensions/catalogs/dlg-catalog-properties.c:159 msgid "Could not load the catalog" msgstr "Не удалось загрузить каталог" @@ -838,17 +838,57 @@ msgid "Files will be organized in catalogs. No file will be moved on disk." msgstr "Файлы будут помещены в каталоги. Ни один файл не будет перемещён на диск." -#: ../extensions/catalogs/gth-catalog.c:1145 +#: ../extensions/catalogs/gth-catalog.c:1115 #: ../extensions/comments/main.c:43 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Метки" -#: ../extensions/catalogs/gth-file-source-catalogs.c:791 +#: ../extensions/catalogs/gth-file-source-catalogs.c:948 +#, c-format +msgid "The catalog '%s' already exists, do you want to overwrite it?" +msgstr "Каталог «%s» уже существует, хотите его перезаписать?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:950 +#, c-format +msgid "The library '%s' already exists, do you want to overwrite it?" +msgstr "Коллекция «%s» уже существует, хотите её перезаписать?" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:958 +msgid "Over_write" +msgstr "_Перезаписать" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1076 +msgid "Cannot move the files" +msgstr "Не удалось переместить файлы" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1078 +msgid "Cannot copy the files" +msgstr "Не удалось скопировать файлы" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 +msgid "Invalid destination." +msgstr "Неправильное место назначения." + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1130 #, c-format msgid "Copying files to '%s'" msgstr "Копирование файлов в «%s»" +#: ../extensions/catalogs/gth-file-source-catalogs.c:1383 +msgid "Could not remove the files from the catalog" +msgstr "Не удалось удалить файлы из каталога" + +#: ../extensions/catalogs/gth-file-source-catalogs.c:1441 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:683 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:712 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1215 +#: ../extensions/search/gth-search.c:265 +msgid "Invalid file format" +msgstr "Неверный формат файла" + #: ../extensions/catalogs/gth-organize-task.c:202 #, c-format msgid "Operation completed. Catalogs: %d. Images: %d." @@ -856,7 +896,7 @@ #: ../extensions/change_date/callbacks.c:44 msgid "Change _Date..." -msgstr "Изменить _дату..." +msgstr "Изменить _дату…" #: ../extensions/change_date/callbacks.c:45 msgid "Change images last modified date" @@ -927,7 +967,6 @@ msgstr "час." #: ../extensions/change_date/data/ui/change-date.ui.h:15 -#| msgid "The minutes" msgid "minutes" msgstr "мин." @@ -945,7 +984,7 @@ msgstr "Комментарии и метки" #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Параметры" @@ -954,7 +993,7 @@ msgstr "_Синхронизировать со встроенными метаданными" #: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:101 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Добавить комментарий" @@ -964,19 +1003,20 @@ msgstr "Заголовок" #: ../extensions/comments/main.c:40 -#: ../extensions/comments/main.c:209 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 +#: ../extensions/comments/main.c:264 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/image_print/data/ui/print-layout.ui.h:8 #: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:16 #: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Описание" #: ../extensions/comments/main.c:41 -#: ../extensions/comments/main.c:217 +#: ../extensions/comments/main.c:272 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Место" @@ -1004,7 +1044,6 @@ msgstr "Создать контактный лист" #: ../extensions/contact_sheet/callbacks.c:65 -#| msgid "Change _Date..." msgid "Image _Wall..." msgstr "_Галерея снимков…" @@ -1013,336 +1052,305 @@ msgstr "Создать галерею" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 msgid "Contact Sheet" msgstr "Контактный лист" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:2 -#| msgid "Edit the comment and other information of the selected files" msgid "Create an index image displaying the thumbnails of the selected files." msgstr "Создать изображение, показывающее миниатюры выбранных файлов." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid " " -msgstr " " - -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -#| msgid "Desktop background" msgid "Background" msgstr "Фон" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -#| msgid "_Footer:" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 msgid "C_olor:" msgstr "_Цвет:" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -#| msgid "Caption" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 msgid "Caption:" msgstr "Заголовок:" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 -#| msgid "Framerate" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 msgid "Frame" msgstr "Рамка" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 msgid "Inward Shadow" msgstr "Внутренняя тень" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-crop.c:454 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Отсутствует" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 msgid "Outward Shadow" msgstr "Внешняя тень" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -#| msgid "Select All" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 msgid "Select a color" msgstr "Выберите цвет" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -#| msgid "Select None" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 msgid "Select a font" msgstr "Выберите шрифт" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -#| msgid "Show version" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 msgid "Shadow only" msgstr "Только тень" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -#| msgid "Singles" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 msgid "Simple" msgstr "Простой" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 msgid "Simple with shadow" msgstr "Простой с тенью" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#| msgid "Slideshow" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 msgid "Slide" msgstr "Слайд" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#| msgid "Next" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 +#: ../extensions/rename_series/dlg-rename-series.c:57 msgid "Text" msgstr "Текст" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:37 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:42 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 msgid "_Footer:" msgstr "Ни_жний колонтитул:" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 msgid "_Gradient" msgstr "_Градиент" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:38 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:43 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 msgid "_Header:" msgstr "_Верхний колонтитул:" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 msgid "_Horizontal:" msgstr "По _горизонтали:" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 msgid "_Solid color" msgstr "_Сплошной цвет" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -#| msgid "_Title:" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 msgid "_Style:" msgstr "_Стиль:" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:23 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 msgid "_Vertical:" msgstr "По в_ертикали:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -msgid "#" -msgstr "#" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -msgid "###" -msgstr "###" - #. translate only the text in the curly brackets -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 #: ../extensions/rename_series/data/ui/rename-series.ui.h:6 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 #, no-c-format msgid "%D{ format }" msgstr "%D{ формат }" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#, no-c-format -#| msgid "%" -msgid "%n" -msgstr "%n" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -#, no-c-format -msgid "%p" -msgstr "%p" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 msgid "All images on a single page" msgstr "Все изображения на одной странице" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:6 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 #: ../extensions/convert_format/data/ui/convert-format.ui.h:1 #: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:10 msgid "Choose destination folder" msgstr "Выберите папку назначения" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 msgid "Columns:" msgstr "Столбцы:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 msgid "Create _HTML image map" msgstr "Создать _карту HTML с изображением" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 -#| msgid "Creating the new album" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 msgid "Create a new theme" msgstr "Создать новую тему" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 -#| msgid "Delete the selected files" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 msgid "Delete the selected theme" msgstr "Удалить выбранную тему" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#| msgid "Print the selected images" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 msgid "Edit the selected theme" msgstr "Изменить выбранную тему" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#| msgid "Filename:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 msgid "File_name:" msgstr "_Имя файла:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Images per page:" msgstr "Изображений на страницу:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/image_print/gth-image-print-job.c:1538 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 msgid "Layout" msgstr "Макет" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 msgid "New enumerator digit" msgstr "Новый цифровой счётчик" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 msgid "Re_verse order" msgstr "В _обратном порядке" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 msgid "S_ort:" msgstr "_Сортировать:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 #: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 msgid "Saving" msgstr "Сохранение" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 #: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:20 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 msgid "Special code" msgstr "Специальный код" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 -#| msgid "Square" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 msgid "Sq_uared" msgstr "_Квадрат" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 msgid "The current date" msgstr "Текущая дата" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 msgid "The current page number" msgstr "Номер текущей страницы" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 msgid "The total number of pages" msgstr "Всего страниц" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 msgid "Theme" msgstr "Тема" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:34 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -#| msgid "_Thumbnails" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 msgid "Thumbnails" msgstr "Миниатюры" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:35 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 msgid "_All pages with the same size" msgstr "_Все страницы с таким же размером" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:36 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:17 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:4 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:41 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 msgid "_Destination:" msgstr "_Назначение:" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:39 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:18 -#| msgid "Size:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 msgid "_Size:" msgstr "_Размер:" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:482 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:493 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:506 -#| msgid "Could not save the filter" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +msgid "Image Wall" +msgstr "Галерея изобржений" + +#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 msgid "Could not save the theme" msgstr "Не удалось сохранить тему" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:649 -#| msgid "Could not delete the files" +#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 msgid "Could not delete the theme" msgstr "Не удалось удалить тему" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 -#| msgid "Converting images" +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 msgid "Creating images" msgstr "Создание изображений" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:908 -#| msgid "Saving thumbnails" +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 msgid "Generating thumbnails" msgstr "Формирование миниатюр" #: ../extensions/contact_sheet/gth-contact-sheet-theme.c:32 -#| msgid "_Header:" msgid "Header" msgstr "Верхний колонтитул" #: ../extensions/contact_sheet/gth-contact-sheet-theme.c:33 -#| msgid "_Footer:" msgid "Footer" msgstr "Нижний колонтитул" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:197 -#| msgid "Properties" +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 msgid "Theme Properties" msgstr "Свойства темы" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:213 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 msgid "Copy _From" msgstr "Копировать _из" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:349 -#| msgid "New Name" +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 msgid "New theme" msgstr "Новая тема" @@ -1376,21 +1384,20 @@ msgstr "Новый формат" #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 -#| msgid "The original enumerator" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 msgid "_Use the original image folder" msgstr "_Использовать папку исходного изображения" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/dlg-convert-format.c:93 msgid "Converting images" msgstr "Преобразование изображений" -#: ../extensions/desktop_background/actions.c:139 +#: ../extensions/desktop_background/actions.c:162 msgid "Could not show the desktop background properties" msgstr "Не удалось показать свойства фона рабочего стола" -#: ../extensions/desktop_background/actions.c:203 -#: ../extensions/desktop_background/actions.c:221 +#: ../extensions/desktop_background/actions.c:228 +#: ../extensions/desktop_background/actions.c:246 msgid "Could not set the desktop background" msgstr "Не удалось установить фон рабочего стола" @@ -1407,17 +1414,34 @@ msgid "Desktop background" msgstr "Фон рабочего стола" -#: ../extensions/edit_metadata/callbacks.c:98 +#: ../extensions/edit_metadata/actions.c:66 +msgid "Are you sure you want to permanently delete the metadata of the selected files?" +msgstr "Действительно безвозвратно удалить метаданные выделенных файлов?" + +#: ../extensions/edit_metadata/actions.c:73 +msgid "If you delete the metadata, it will be permanently lost." +msgstr "Если удалить метаданные, они будут навсегда утеряны." + +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "_Метки" -#: ../extensions/edit_metadata/callbacks.c:102 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" msgstr "Изменить комментарий и другую информацию в выделенных файлах" #: ../extensions/edit_metadata/callbacks.c:107 -msgid "Choose another tag" -msgstr "Выбрать другую метку" +#| msgid "Delete the selected files" +msgid "Set the tags of the selected files" +msgstr "Установить метки выделенным файлам" + +#: ../extensions/edit_metadata/callbacks.c:112 +msgid "Delete Metadata" +msgstr "Удалить метаданные" + +#: ../extensions/edit_metadata/callbacks.c:113 +msgid "Delete the comment and the embedded metadata of the selected files" +msgstr "Удалить комментарий и встроенные метаданные выделенных файлов" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 @@ -1442,13 +1466,12 @@ msgid "_Title:" msgstr "_Заголовок:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:56 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "Не удалось сохранить метаданные" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:109 -#: ../extensions/rename_series/actions.c:37 -#: ../gthumb/gth-overwrite-dialog.c:162 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "Не удалось прочитать информацию о файле" @@ -1460,68 +1483,77 @@ msgid "Edit metadata" msgstr "Изменить метаданные" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:448 +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "Метаданные %s" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:97 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d файл" +msgstr[1] "%d файла" +msgstr[2] "%d файлов" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:263 +msgid "Sa_ve and Close" +msgstr "Со_хранить и закрыть" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Сохранить только _изменённые поля" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:477 msgid "No date" msgstr "Без даты" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:449 +#: ../extensions/edit_metadata/gth-edit-general-page.c:478 msgid "The following date" msgstr "Следующая дата" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:450 -#: ../extensions/importer/gth-import-preferences-dialog.c:328 +#: ../extensions/edit_metadata/gth-edit-general-page.c:479 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Текущая дата" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:452 +#: ../extensions/edit_metadata/gth-edit-general-page.c:481 msgid "Last modified date" msgstr "Дата последнего изменения" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:453 +#: ../extensions/edit_metadata/gth-edit-general-page.c:482 msgid "File creation date" msgstr "Дата создания файла" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:454 +#: ../extensions/edit_metadata/gth-edit-general-page.c:483 msgid "Do not modify" msgstr "Не изменять" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:106 -msgid "Save only cha_nged fields" -msgstr "Сохранить только _изменённые поля" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:162 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:94 #, c-format -msgid "%s Metadata" -msgstr "Метаданные %s" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:166 -#: ../extensions/flicker/dlg-import-from-flickr.c:331 -#, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d файл" -msgstr[1] "%d файла" -msgstr[2] "%d файлов" +#| msgid "Tags" +msgid "%s Tags" +msgstr "Метки %s" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Новая метка" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:255 msgid "Assign Tags" msgstr "Назначить метки" -#: ../extensions/edit_metadata/gth-tag-task.c:113 -#: ../extensions/edit_metadata/gth-tag-task.c:130 +#: ../extensions/edit_metadata/gth-tag-task.c:115 +#: ../extensions/edit_metadata/gth-tag-task.c:132 msgid "Assigning tags to the selected files" msgstr "Назначение меток для выделенных файлов" -#: ../extensions/edit_metadata/gth-tag-task.c:113 +#: ../extensions/edit_metadata/gth-tag-task.c:115 msgid "Writing files" msgstr "Запись файлов" -#: ../extensions/edit_metadata/gth-tag-task.c:130 +#: ../extensions/edit_metadata/gth-tag-task.c:132 msgid "Reading files" msgstr "Чтение файлов" @@ -1550,8 +1582,8 @@ msgstr "_Участник:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -msgid "State/Provence:" -msgstr "Область:" +msgid "State/Province:" +msgstr "Область/район:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 msgid "_Byline:" @@ -1574,8 +1606,7 @@ msgstr "_Название объекта:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -#| msgid "Source" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 msgid "_Source:" msgstr "_Источник:" @@ -1635,11 +1666,11 @@ msgid "XMP Attached" msgstr "Прикреплённый XMP" -#: ../extensions/exiv2_tools/main.c:245 +#: ../extensions/exiv2_tools/main.c:255 msgid "date photo was taken" msgstr "дата получения снимка" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" msgstr "Поделиться" @@ -1652,44 +1683,73 @@ msgstr "Отправить фотографии в Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 +msgid "1024 x 1024" +msgstr "1024 x 1024" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 +msgid "1280 x 1280" +msgstr "1280 x 1280" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 +msgid "1600 x 1600" +msgstr "1600 x 1600" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +msgid "2048 x 2048" +msgstr "2048 x 2048" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 +msgid "720 x 720" +msgstr "720 x 720" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 msgid "A_lbum:" msgstr "_Альбом:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 msgid "Add a new album" msgstr "Добавить новый альбом" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "Edit accounts" msgstr "_Изменить учётные записи" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 msgid "Export to Flickr" msgstr "Экспортировать на Flickr" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:13 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 +msgid "Resize the images if larger than this size" +msgstr "Масштабировать изображения, если их размер превышает" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "_Account:" msgstr "_Учётная запись:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:16 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 +msgid "_Resize to:" +msgstr "_Изменить размер на:" + +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 msgid "_Upload" msgstr "_Отправить" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 @@ -1698,7 +1758,7 @@ msgstr "_Учётная запись:" #: ../extensions/facebook/data/ui/facebook-account-manager.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-account-manager.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-account-manager.ui.h:1 #: ../extensions/oauth/data/ui/oauth-account-manager.ui.h:1 #: ../extensions/picasaweb/data/ui/picasa-web-account-manager.ui.h:1 msgid "A_ccounts:" @@ -1710,12 +1770,12 @@ msgstr "Личное" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:9 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 msgid "Private photos, visible to friends" msgstr "Личные фотографии, доступные друзьям" #: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:10 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Общедоступные фотографии" @@ -1729,97 +1789,99 @@ msgstr "_Видимость:" #: ../extensions/facebook/data/ui/facebook-ask-authorization.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-ask-authorization.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-ask-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-ask-authorization.ui.h:1 msgid "_Authorize..." msgstr "_Авторизовать…" #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-complete-authorization.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 msgid "C_ontinue" msgstr "Пр_одолжить" #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker/flickr-authentication.c:438 -#: ../extensions/oauth/oauth-authentication.c:450 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 msgid "Once you're done, click the 'Continue' button below." msgstr "По завершению нажмите кнопку «Продолжить»." #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 -#: ../extensions/flicker/data/ui/flicker-export-completed.ui.h:1 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:1 msgid "Files successfully uploaded to the server." msgstr "Файлы успешно загружены на сервер." #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:2 -#: ../extensions/flicker/data/ui/flicker-export-completed.ui.h:2 +#: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1832 +#: ../extensions/webalbums/gth-web-exporter.c:1841 msgid "_Open in the Browser" msgstr "_Открыть в веб-браузере" -#: ../extensions/facebook/dlg-export-to-facebook.c:121 -#: ../extensions/facebook/dlg-export-to-facebook.c:312 -#: ../extensions/facebook/facebook-authentication.c:219 -#: ../extensions/flicker/dlg-export-to-flickr.c:137 -#: ../extensions/flicker/dlg-export-to-flickr.c:395 -#: ../extensions/flicker/dlg-import-from-flickr.c:234 -#: ../extensions/flicker/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:374 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:376 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:421 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:363 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "Не удалось соединиться с сервером" -#: ../extensions/facebook/dlg-export-to-facebook.c:172 -#: ../extensions/flicker/dlg-export-to-flickr.c:242 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:181 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:191 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:182 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 msgid "Could not upload the files" msgstr "Не удалось отправить файлы" -#: ../extensions/facebook/dlg-export-to-facebook.c:388 -#: ../extensions/flicker/dlg-export-to-flickr.c:186 -#: ../extensions/flicker/dlg-export-to-flickr.c:220 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:459 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:713 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:462 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:717 msgid "Could not create the album" msgstr "Не удалось создать альбом" -#: ../extensions/facebook/dlg-export-to-facebook.c:456 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:530 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:778 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:534 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 msgid "New Album" msgstr "Новый альбом" -#: ../extensions/facebook/dlg-export-to-facebook.c:535 -#: ../extensions/flicker/dlg-export-to-flickr.c:521 -#: ../extensions/image_print/gth-image-print-job.c:1531 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:610 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:997 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 +#: ../extensions/image_print/gth-image-print-job.c:1789 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:614 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 msgid "No valid file selected." msgstr "Не выбрано ни одного допустимого файла." -#: ../extensions/facebook/dlg-export-to-facebook.c:536 -#: ../extensions/flicker/dlg-export-to-flickr.c:522 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:611 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:998 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:615 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 msgid "Could not export the files" msgstr "Не удалось экспортировать файлы" -#: ../extensions/facebook/dlg-export-to-facebook.c:543 -#: ../extensions/flicker/dlg-export-to-flickr.c:529 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:618 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1004 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:785 -#: ../gthumb/gth-browser.c:964 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:255 +#: ../extensions/find_duplicates/gth-find-duplicates.c:347 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:623 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:995 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" @@ -1827,71 +1889,71 @@ msgstr[1] "%d файла (%s)" msgstr[2] "%d файлов (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:565 -#: ../extensions/flicker/dlg-export-to-flickr.c:552 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:638 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 #, c-format msgid "Export to %s" msgstr "Экспортировать в %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:230 -#: ../extensions/flicker/flickr-account-chooser-dialog.c:230 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:230 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "Новая аутентификация…" -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." msgstr "Выбрать _учётную запись…" -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker/flickr-authentication.c:437 -#: ../extensions/oauth/oauth-authentication.c:449 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 #, c-format msgid "Return to this window when you have finished the authorization process on %s" msgstr "Вернуться к этому окну, когда завершится процесс авторизации для %s" -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker/flickr-authentication.c:517 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" msgstr "Для отправки фотографий на %s необходима авторизация" -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker/flickr-authentication.c:518 -#: ../extensions/oauth/oauth-authentication.c:530 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 #, c-format msgid "Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization." msgstr "Нжмите «Авторизовать», чтобы открыть веб-браузер и авторизовать gthumb для отправки фотографий в %s. По завершению вернитесь к этому окну, чтобы завершить авторизацию." -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker/flickr-authentication.c:618 -#: ../extensions/oauth/oauth-authentication.c:632 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:815 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:666 +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Выбрать учётную запись" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker/flickr-authentication.c:727 -#: ../extensions/oauth/oauth-authentication.c:741 -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:876 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:727 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Изменить учётные записи" -#: ../extensions/facebook/facebook-connection.c:294 -#: ../extensions/facebook/facebook-connection.c:454 -#: ../extensions/facebook/facebook-service.c:188 -#: ../extensions/facebook/facebook-service.c:291 -#: ../extensions/facebook/facebook-service.c:494 -#: ../extensions/flicker/flickr-connection.c:290 -#: ../extensions/flicker/flickr-connection.c:441 -#: ../extensions/flicker/flickr-service.c:220 -#: ../extensions/flicker/flickr-service.c:423 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:195 +#: ../extensions/flicker_utils/flickr-service.c:398 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -1899,17 +1961,17 @@ msgid "Unknown error" msgstr "Неизвестная ошибка" -#: ../extensions/facebook/facebook-connection.c:329 -#: ../extensions/facebook/facebook-connection.c:480 -#: ../extensions/facebook/facebook-service.c:214 -#: ../extensions/facebook/facebook-service.c:316 -#: ../extensions/flicker/flickr-connection.c:316 -#: ../extensions/flicker/flickr-connection.c:467 -#: ../extensions/flicker/flickr-service.c:244 -#: ../extensions/oauth/oauth-connection.c:375 -#: ../extensions/oauth/oauth-connection.c:450 -#: ../extensions/oauth/oauth-connection.c:554 -#: ../extensions/picasaweb/google-connection.c:363 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" msgstr "Соединение с сервером" @@ -1921,239 +1983,214 @@ msgid "Upload images to Facebook" msgstr "Отправить изображения в Facebook" -#: ../extensions/facebook/facebook-service.c:214 -#: ../extensions/facebook/facebook-service.c:316 -#: ../extensions/flicker/flickr-service.c:244 -#: ../extensions/oauth/oauth-connection.c:375 -#: ../extensions/oauth/oauth-connection.c:450 -#: ../extensions/oauth/oauth-connection.c:554 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "Получение сведений об учётной записи" -#: ../extensions/facebook/facebook-service.c:422 -#: ../extensions/flicker/flickr-service.c:348 -#: ../extensions/photobucket/photobucket-service.c:235 -#: ../extensions/picasaweb/picasa-web-service.c:237 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:209 msgid "Getting the album list" msgstr "Получение списка альбомов" -#: ../extensions/facebook/facebook-service.c:551 -#: ../extensions/flicker/flickr-service.c:451 -#: ../extensions/flicker/flickr-service.c:571 -#: ../extensions/flicker/flickr-service.c:609 -#: ../extensions/photobucket/photobucket-service.c:344 -#: ../extensions/picasaweb/picasa-web-service.c:328 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:426 +#: ../extensions/flicker_utils/flickr-service.c:546 +#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:300 msgid "Creating the new album" msgstr "Создание нового альбома" -#: ../extensions/facebook/facebook-service.c:610 -#: ../extensions/flicker/flickr-service.c:659 -#: ../extensions/photobucket/photobucket-service.c:401 -#: ../extensions/picasaweb/picasa-web-service.c:385 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:357 #, c-format msgid "Could not upload '%s': %s" msgstr "Не удалось отправить «%s»: %s" #. Translators: %s is a filename -#. send the file -#. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:810 -#: ../extensions/flicker/flickr-service.c:837 -#: ../extensions/photobucket/photobucket-service.c:524 -#: ../extensions/picasaweb/picasa-web-service.c:520 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:412 #, c-format msgid "Uploading '%s'" msgstr "Отправка «%s»" #: ../extensions/facebook/facebook-service.c:886 -#: ../extensions/flicker/flickr-service.c:915 -#: ../extensions/photobucket/photobucket-service.c:605 -#: ../extensions/picasaweb/picasa-web-service.c:594 +#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:605 msgid "Uploading the files to the server" msgstr "Отправка файлов на сервер" -#: ../extensions/facebook/facebook-service.c:1002 -#: ../extensions/flicker/flickr-service.c:1031 -#: ../extensions/picasaweb/picasa-web-service.c:715 +#: ../extensions/facebook/facebook-service.c:1003 +#: ../extensions/flicker_utils/flickr-service.c:1077 +#: ../extensions/picasaweb/picasa-web-service.c:718 msgid "Getting the photo list" msgstr "Получение списка фотографий" -#: ../extensions/file_manager/actions.c:42 -msgid "Enter the folder name: " +#: ../extensions/file_manager/actions.c:130 +msgid "New folder" +msgstr "Новая папка" + +#: ../extensions/file_manager/actions.c:131 +msgid "Enter the folder name:" msgstr "Введите имя папки: " -#: ../extensions/file_manager/actions.c:70 -msgid "Could not create the folder" -msgstr "Не удалось создать папку" - -#: ../extensions/file_manager/actions.c:329 -#: ../extensions/file_manager/callbacks.c:329 -#: ../extensions/file_manager/callbacks.c:733 +#: ../extensions/file_manager/actions.c:397 +#: ../extensions/file_manager/callbacks.c:380 +#: ../extensions/file_manager/callbacks.c:842 msgid "Could not move the files" msgstr "Не удалось переместить файлы" -#: ../extensions/file_manager/actions.c:330 -#: ../extensions/file_manager/callbacks.c:330 -#: ../extensions/file_manager/callbacks.c:734 +#: ../extensions/file_manager/actions.c:398 +#: ../extensions/file_manager/callbacks.c:381 +#: ../extensions/file_manager/callbacks.c:843 msgid "Files cannot be moved to the current location, as alternative you can choose to copy them." msgstr "Файлы не могут быть перемещены в текущее местоположение, можно попробовать скопировать их." -#: ../extensions/file_manager/actions.c:422 -#: ../extensions/importer/gth-import-task.c:615 -msgid "Could not delete the files" -msgstr "Не удалось удалить файлы" - -#: ../extensions/file_manager/actions.c:465 -msgid "The files cannot be moved to the Trash. Do you want to delete them permanently?" -msgstr "Файлы не могут быть перемещены в корзину. Удалить их навсегда?" - -#: ../extensions/file_manager/actions.c:476 -msgid "Could not move the files to the Trash" -msgstr "Не удалось переместить файлы в корзину" - -#: ../extensions/file_manager/actions.c:525 -#, c-format -msgid "Are you sure you want to move \"%s\" to trash?" -msgstr "Действительно переместить «%s» в корзину?" - -#: ../extensions/file_manager/actions.c:528 -#, c-format -msgid "Are you sure you want to move to trash the %'d selected file?" -msgid_plural "Are you sure you want to move to trash the %'d selected files?" -msgstr[0] "Действительно переместить в корзину %'d выбранный файл?" -msgstr[1] "Действительно переместить в корзину %'d выбранных файла?" -msgstr[2] "Действительно переместить в корзину %'d выбранных файлов?" - -#: ../extensions/file_manager/actions.c:540 -#: ../extensions/file_manager/callbacks.c:174 -#: ../extensions/file_manager/callbacks.c:206 -msgid "Mo_ve to Trash" -msgstr "_Переместить в корзину" - -#: ../extensions/file_manager/actions.c:572 -#: ../extensions/file_manager/actions.c:863 -#, c-format -msgid "Are you sure you want to permanently delete \"%s\"?" -msgstr "Действительно окончательно удалить «%s»?" - -#: ../extensions/file_manager/actions.c:575 -#, c-format -msgid "Are you sure you want to permanently delete the %'d selected file?" -msgid_plural "Are you sure you want to permanently delete the %'d selected files?" -msgstr[0] "Действительно окончательно удалить %'d выбранный файл?" -msgstr[1] "Действительно окончательно удалить %'d выбранных файла?" -msgstr[2] "Действительно окончательно удалить %'d выбранных файлов?" - -#: ../extensions/file_manager/actions.c:585 -#: ../extensions/file_manager/actions.c:873 -msgid "If you delete a file, it will be permanently lost." -msgstr "Если удалить файл, он будет навсегда потерян." - -#: ../extensions/file_manager/actions.c:615 +#: ../extensions/file_manager/actions.c:555 msgid "Could not open the location" msgstr "Не удалось открыть местоположение" -#: ../extensions/file_manager/actions.c:747 +#: ../extensions/file_manager/actions.c:688 msgid "The folder is not empty, do you want to delete the folder and its content permanently?" msgstr "Папка не пуста. Удалить эту папку вместе со всем содержимым навсегда?" -#: ../extensions/file_manager/actions.c:763 +#: ../extensions/file_manager/actions.c:704 msgid "Could not delete the folder" msgstr "Не удалось удалить папку" -#: ../extensions/file_manager/actions.c:822 +#: ../extensions/file_manager/actions.c:765 msgid "The folder cannot be moved to the Trash. Do you want to delete it permanently?" msgstr "Папка не может быть перемещена в корзину. Удалить её навсегда?" -#: ../extensions/file_manager/actions.c:829 +#: ../extensions/file_manager/actions.c:772 msgid "Could not move the folder to the Trash" msgstr "Не удалось переместить папку в корзину" -#: ../extensions/file_manager/actions.c:969 +#: ../extensions/file_manager/actions.c:808 +#: ../gthumb/gth-file-source-vfs.c:837 +#, c-format +msgid "Are you sure you want to permanently delete \"%s\"?" +msgstr "Действительно окончательно удалить «%s»?" + +#: ../extensions/file_manager/actions.c:818 +#: ../gthumb/gth-file-source-vfs.c:850 +msgid "If you delete a file, it will be permanently lost." +msgstr "Если удалить файл, он будет навсегда потерян." + +#: ../extensions/file_manager/actions.c:910 msgid "Move To" msgstr "Переместить в" -#: ../extensions/file_manager/actions.c:969 +#: ../extensions/file_manager/actions.c:910 msgid "Copy To" msgstr "Копировать в" -#: ../extensions/file_manager/actions.c:973 +#: ../extensions/file_manager/actions.c:914 msgid "Move" msgstr "Переместить" -#: ../extensions/file_manager/actions.c:973 -#| msgid "Crop" +#: ../extensions/file_manager/actions.c:914 msgid "Copy" msgstr "Копировать" -#: ../extensions/file_manager/callbacks.c:154 -#: ../extensions/file_manager/callbacks.c:186 +#: ../extensions/file_manager/callbacks.c:163 +#: ../extensions/file_manager/callbacks.c:199 msgid "Create _Folder" msgstr "Создать _папку" -#: ../extensions/file_manager/callbacks.c:155 -#: ../extensions/file_manager/callbacks.c:187 +#: ../extensions/file_manager/callbacks.c:164 +#: ../extensions/file_manager/callbacks.c:200 msgid "Create a new empty folder inside this folder" msgstr "Создать новую пустую папку внутри этой папки" -#: ../extensions/file_manager/callbacks.c:170 +#: ../extensions/file_manager/callbacks.c:179 msgid "D_uplicate" msgstr "_Дублировать" -#: ../extensions/file_manager/callbacks.c:171 +#: ../extensions/file_manager/callbacks.c:180 msgid "Duplicate the selected files" msgstr "Дублировать выбранные файлы" -#: ../extensions/file_manager/callbacks.c:175 +#: ../extensions/file_manager/callbacks.c:183 +#: ../extensions/file_manager/callbacks.c:219 +#: ../gthumb/gth-file-source-vfs.c:809 +msgid "Mo_ve to Trash" +msgstr "_Переместить в корзину" + +#: ../extensions/file_manager/callbacks.c:184 msgid "Move the selected files to the Trash" msgstr "Переместить выбранные файлы в корзину" -#: ../extensions/file_manager/callbacks.c:178 -#: ../extensions/file_manager/callbacks.c:210 +#: ../extensions/file_manager/callbacks.c:187 +#: ../extensions/file_manager/callbacks.c:223 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:5 msgid "_Delete" msgstr "_Удалить" -#: ../extensions/file_manager/callbacks.c:179 +#: ../extensions/file_manager/callbacks.c:188 msgid "Delete the selected files" msgstr "Удалить выбранные файлы" -#: ../extensions/file_manager/callbacks.c:182 -msgid "Open with the _File Manager" -msgstr "Открыть в менеджере _файлов" - -#: ../extensions/file_manager/callbacks.c:190 -#: ../extensions/rename_series/callbacks.c:47 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +#: ../extensions/file_manager/callbacks.c:191 +#: ../extensions/file_manager/callbacks.c:203 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 msgid "_Rename" msgstr "_Переименовать" -#: ../extensions/file_manager/callbacks.c:202 +#: ../extensions/file_manager/callbacks.c:192 +msgid "Rename the selected files" +msgstr "Переименовать выделенные файлы" + +#: ../extensions/file_manager/callbacks.c:195 +msgid "Open with the _File Manager" +msgstr "Открыть в менеджере _файлов" + +#: ../extensions/file_manager/callbacks.c:215 msgid "_Paste Into Folder" msgstr "_Вставить в папку" -#: ../extensions/file_manager/callbacks.c:214 -#| msgid "Crop..." +#: ../extensions/file_manager/callbacks.c:227 +#: ../extensions/file_manager/callbacks.c:236 msgid "Copy to..." msgstr "Копировать в…" -#: ../extensions/file_manager/callbacks.c:215 -#| msgid "Move the selected files to the Trash" -msgid "Copy the selected files to another folder" -msgstr "Копировать выделенные файлы в другую папку" +#: ../extensions/file_manager/callbacks.c:228 +msgid "Copy the selected folder to another folder" +msgstr "Копировать выделенную папку в другую папку" -#: ../extensions/file_manager/callbacks.c:218 -#| msgid "More extensions..." +#: ../extensions/file_manager/callbacks.c:231 +#: ../extensions/file_manager/callbacks.c:240 msgid "Move to..." msgstr "Переместить в…" -#: ../extensions/file_manager/callbacks.c:219 -#| msgid "Move the selected files to the Trash" +#: ../extensions/file_manager/callbacks.c:232 +msgid "Move the selected folder to another folder" +msgstr "Переместить выделенную папку в другую папку" + +#: ../extensions/file_manager/callbacks.c:237 +msgid "Copy the selected files to another folder" +msgstr "Копировать выделенные файлы в другую папку" + +#: ../extensions/file_manager/callbacks.c:241 msgid "Move the selected files to another folder" msgstr "Переместить выделенные файлы в другую папку" -#: ../extensions/file_manager/callbacks.c:880 -#: ../gthumb/gth-browser.c:4683 -#: ../gthumb/gth-browser.c:4720 +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:581 +#: ../gthumb/gth-browser.c:4916 +#: ../gthumb/gth-browser.c:4950 msgid "Could not perform the operation" msgstr "Не удалось выполнить операцию" @@ -2194,41 +2231,49 @@ msgstr "_Малиновый-Зелёный:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 +msgid "_Preview" +msgstr "_Просмотр" + +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 msgid "_Reset" msgstr "_Сброс" -#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 msgid "_Saturation:" msgstr "_Насыщенность:" -#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 +#: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 msgid "_Yellow-Blue:" msgstr "_Жёлтый-Синий:" -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 #: ../extensions/file_tools/data/ui/resize-options.ui.h:3 msgid "Aspect ratio" msgstr "Соотношение сторон" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 msgid "C_rop" msgstr "_Кадрировать" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +msgid "Center" +msgstr "По центру" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 #: ../extensions/file_tools/data/ui/resize-options.ui.h:7 msgid "I_nvert aspect ratio" msgstr "_Инвертировать соотношение сторон" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "M_ultiple of:" msgstr "_Несколько:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +msgid "Maximize" +msgstr "Максимизировать" + #: ../extensions/file_tools/data/ui/crop-options.ui.h:8 #: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 msgid "Selection" @@ -2247,6 +2292,11 @@ msgid "px" msgstr "пиксел" +#. this is used to separate the dimensions, for example: 120 × 250 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "×" +msgstr "×" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:2 #: ../extensions/resize_images/data/ui/resize-images.ui.h:2 #, no-c-format @@ -2267,35 +2317,129 @@ msgstr "_Высокое качество" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "Information" -msgstr "Информация" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "New dimensions:" msgstr "Новые размеры:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "Options" msgstr "Параметры" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Original dimensions:" msgstr "Исходные размеры:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 msgid "Scale factor:" msgstr "_Масштаб:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +msgid "Set the image size to this value" +msgstr "Привести размер изображения к этому значению" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 msgid "_Width:" msgstr "_Ширина:" #: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:21 +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 msgid "pixels" msgstr "пикселы" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 +msgid "Align" +msgstr "Выровнять" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 +msgid "Alignment" +msgstr "Выравнивание" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Angle" +msgstr "Угол" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 +msgid "Bounding box" +msgstr "Ограничивающая рамка" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 +msgid "Crop borders" +msgstr "Убирать границы" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Нарисуйте линию на изображении\n" +"чтобы установить выравнивание." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Grid:" +msgstr "Сетка:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 +msgid "Image size" +msgstr "Размер изображения" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 +msgid "Keep aspect ratio" +msgstr "Сохранять соотношение сторон" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 +msgid "Original size" +msgstr "Исходный размер" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "Parallel" +msgstr "Параллельное" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 +msgid "Perpendicular" +msgstr "Перпендикулярное" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 +msgid "Pick a background color" +msgstr "Взять цвет фона" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 +msgid "Point 1:" +msgstr "Точка 1:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 +msgid "Point 2:" +msgstr "Точка 2:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 +msgid "Reset" +msgstr "Сброс" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 +msgid "_Background:" +msgstr "_Фон:" + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 +msgid "_Transparent" +msgstr "_Прозрачность" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 +msgid "Amount:" +msgstr "Величина:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 +msgid "Radius:" +msgstr "Радиус:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Threshold:" +msgstr "Порог:" + +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "_Preview:" +msgstr "_Предварительный просмотр:" + #: ../extensions/file_tools/file_tools.extension.in.in.h:1 msgid "Basic tools to modify images." msgstr "Основные инструменты для изменения изображений." @@ -2304,182 +2448,342 @@ msgid "Image tools" msgstr "Инструменты для изображений" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:310 -#: ../extensions/file_tools/gth-file-tool-negative.c:83 -msgid "Applying changes" -msgstr "Применение изменений" - -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:520 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 msgid "Adjust Colors..." msgstr "Изменение цветов…" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:520 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 msgid "Adjust Colors" msgstr "Изменение цветов" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:521 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:528 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Изменить яркость, контраст, насыщенность и уровень гамма коррекции изображения" -#: ../extensions/file_tools/gth-file-tool-crop.c:399 -#: ../extensions/file_tools/gth-file-tool-resize.c:422 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 msgid "Square" msgstr "Квадрат" -#: ../extensions/file_tools/gth-file-tool-crop.c:400 -#: ../extensions/file_tools/gth-file-tool-resize.c:423 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:499 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (Изображение)" -#: ../extensions/file_tools/gth-file-tool-crop.c:403 -#: ../extensions/file_tools/gth-file-tool-resize.c:426 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:503 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (Экран)" -#: ../extensions/file_tools/gth-file-tool-crop.c:407 -#: ../extensions/file_tools/gth-file-tool-resize.c:430 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:508 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:408 -#: ../extensions/file_tools/gth-file-tool-resize.c:431 +#: ../extensions/file_tools/gth-file-tool-crop.c:433 +#: ../extensions/file_tools/gth-file-tool-resize.c:509 msgid "4:3 (DVD, Book)" msgstr "4:3 (DVD, книга)" -#: ../extensions/file_tools/gth-file-tool-crop.c:409 -#: ../extensions/file_tools/gth-file-tool-resize.c:432 +#: ../extensions/file_tools/gth-file-tool-crop.c:434 +#: ../extensions/file_tools/gth-file-tool-resize.c:510 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:410 -#: ../extensions/file_tools/gth-file-tool-resize.c:433 +#: ../extensions/file_tools/gth-file-tool-crop.c:435 +#: ../extensions/file_tools/gth-file-tool-resize.c:511 msgid "3:2 (Postcard)" msgstr "4:2 (Открытка)" -#: ../extensions/file_tools/gth-file-tool-crop.c:411 -#: ../extensions/file_tools/gth-file-tool-resize.c:434 +#: ../extensions/file_tools/gth-file-tool-crop.c:436 +#: ../extensions/file_tools/gth-file-tool-resize.c:512 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:412 -#: ../extensions/file_tools/gth-file-tool-resize.c:435 +#: ../extensions/file_tools/gth-file-tool-crop.c:437 +#: ../extensions/file_tools/gth-file-tool-resize.c:513 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:413 -#: ../extensions/file_tools/gth-file-tool-resize.c:436 +#: ../extensions/file_tools/gth-file-tool-crop.c:438 +#: ../extensions/file_tools/gth-file-tool-resize.c:514 msgid "1.85:1" msgstr "1:85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:414 -#: ../extensions/file_tools/gth-file-tool-resize.c:437 +#: ../extensions/file_tools/gth-file-tool-crop.c:439 +#: ../extensions/file_tools/gth-file-tool-resize.c:515 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:415 -#: ../extensions/file_tools/gth-file-tool-resize.c:438 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/file_tools/gth-file-tool-crop.c:440 +#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/rename_series/gth-template-selector.c:232 msgid "Custom" msgstr "Другое" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-crop.c:455 +#: ../extensions/file_tools/gth-file-tool-rotate.c:416 msgid "Rule of Thirds" msgstr "Правило третей" -#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-crop.c:456 +#: ../extensions/file_tools/gth-file-tool-rotate.c:417 msgid "Golden Sections" msgstr "Золотые сечения" -#: ../extensions/file_tools/gth-file-tool-crop.c:553 +#: ../extensions/file_tools/gth-file-tool-crop.c:457 +#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +msgid "Center Lines" +msgstr "Центральные линии" + +#: ../extensions/file_tools/gth-file-tool-crop.c:458 +#: ../extensions/file_tools/gth-file-tool-rotate.c:419 +msgid "Uniform" +msgstr "Единообразие" + +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop..." msgstr "Кадрировать…" -#: ../extensions/file_tools/gth-file-tool-crop.c:553 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop" msgstr "Кадрировать" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:100 -msgid "Desaturating image" -msgstr "Обесцвечивание изображения" +#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 +msgid "Applying changes" +msgstr "Применение изменений" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:118 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 msgid "Desaturate" msgstr "Обесцветить" -#: ../extensions/file_tools/gth-file-tool-enhance.c:248 +#: ../extensions/file_tools/gth-file-tool-enhance.c:119 msgid "White balance correction" msgstr "Коррекция баланса белого" -#: ../extensions/file_tools/gth-file-tool-enhance.c:280 +#: ../extensions/file_tools/gth-file-tool-enhance.c:342 msgid "Enhance Colors" msgstr "Улучшить цветопередачу" -#: ../extensions/file_tools/gth-file-tool-enhance.c:281 +#: ../extensions/file_tools/gth-file-tool-enhance.c:343 msgid "Automatic white balance correction" msgstr "Автоматическая коррекция баланса белого" -#: ../extensions/file_tools/gth-file-tool-equalize.c:168 +#: ../extensions/file_tools/gth-file-tool-equalize.c:86 msgid "Equalizing image histogram" msgstr "Выравнивание гистограммы изображения" -#: ../extensions/file_tools/gth-file-tool-equalize.c:200 +#: ../extensions/file_tools/gth-file-tool-equalize.c:275 msgid "Equalize" msgstr "Выровнить" -#: ../extensions/file_tools/gth-file-tool-equalize.c:201 +#: ../extensions/file_tools/gth-file-tool-equalize.c:276 msgid "Equalize image histogram" msgstr "Выровнить гистограмму изображения" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Перевернуть" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 +msgid "Flip the image vertically" +msgstr "Перевернуть изображение по вертикали" + +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Зеркальное отображение" -#: ../extensions/file_tools/gth-file-tool-negative.c:100 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 +msgid "Mirror the image horizontally" +msgstr "Отобразить изображение по горизонтали" + +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Негатив" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Повторить" -#: ../extensions/file_tools/gth-file-tool-resize.c:549 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize..." msgstr "Изменить размер…" -#: ../extensions/file_tools/gth-file-tool-resize.c:549 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize" msgstr "Изменить размер" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +msgid "Rotate..." +msgstr "Повернуть…" + +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 +msgid "Rotate" +msgstr "Повернуть" + +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 +msgid "Freely rotate the image" +msgstr "Произвольный поворот изображения" + +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Повернуть влево" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 +msgid "Rotate the image by 90 degrees counterclockwise" +msgstr "Повернуть изображение на 90° против часовой стрелки" + +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Повернуть вправо" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 +msgid "Rotate the image by 90 degrees clockwise" +msgstr "Повернуть изображение на 90° по часовой стрелке" + +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Сохранить как" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Сохранить" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:100 +msgid "Sharpening image" +msgstr "Увеличение резкости" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +msgid "Enhance Focus..." +msgstr "Усилить фокус…" + +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 +msgid "Enhance Focus" +msgstr "Усилить фокус" + +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Отменить" +#: ../extensions/find_duplicates/callbacks.c:48 +msgid "Find _Duplicates..." +msgstr "Найти _дубликаты…" + +#: ../extensions/find_duplicates/callbacks.c:49 +msgid "Find duplicated files in the current location" +msgstr "Найти дублирующиеся файлы в текущем каталоге" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-choose-folders.ui.h:1 +msgid "_Folders:" +msgstr "_Папки:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Duplicates:" +msgstr "Дубликаты:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +msgid "Files:" +msgstr "Файлы:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 +msgid "No duplicates found." +msgstr "Дубликаты не найдены." + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 +msgid "Search for Duplicates" +msgstr "Поиск дубликатов" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +#: ../gthumb/gth-browser-actions-entries.h:33 +msgid "_View" +msgstr "_Вид" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 +msgid "Find Duplicates" +msgstr "Найти дубликаты" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/search/data/ui/search-editor.ui.h:1 +msgid "Start _at:" +msgstr "_Начиная с:" + +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +msgid "_Filter:" +msgstr "_Фильтр:" + +#: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:2 +msgid "Find duplicated files." +msgstr "Найти дублирующиеся файлы." + +#: ../extensions/find_duplicates/gth-find-duplicates.c:53 +msgid "leave the newest duplicates" +msgstr "оставить новейшие дубликаты" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:54 +msgid "leave the oldest duplicates" +msgstr "оставить старейшие дубликаты" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:55 +msgid "by folder..." +msgstr "по папке…" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:56 +msgid "all files" +msgstr "все файлы" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:57 +msgid "no file" +msgstr "ни одного файла" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:397 +#: ../extensions/find_duplicates/gth-find-duplicates.c:492 +#, c-format +msgid "%d duplicate" +msgid_plural "%d duplicates" +msgstr[0] "%d дубликат" +msgstr[1] "%d дубликата" +msgstr[2] "%d дубликатов" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:536 +msgid "Search completed" +msgstr "Поиск завершён" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:548 +msgid "Searching for duplicates" +msgstr "Поиск дубликатов" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:551 +#: ../gthumb/gth-load-file-data-task.c:106 +#: ../gthumb/gth-save-file-data-task.c:100 +#, c-format +msgid "%d file remaining" +msgid_plural "%d files remaining" +msgstr[0] "Остался %d файл" +msgstr[1] "Осталось %d файла" +msgstr[2] "Осталось %d файлов" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:634 +msgid "Getting the file list" +msgstr "Получение списка файлов" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:740 +msgid "Duplicates" +msgstr "Дубликаты" + +#: ../extensions/find_duplicates/gth-find-duplicates.c:997 +msgid "Select" +msgstr "Выбрать" + #: ../extensions/flicker/callbacks.c:59 -#: ../extensions/flicker/callbacks.c:63 +#: ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr…" @@ -2487,146 +2791,140 @@ msgid "Download photos from Flickr" msgstr "Получить фотографии с Flickr" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "Отправить фотографии на Flickr" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/flicker/flicker.extension.in.in.h:1 +msgid "Flicker" +msgstr "Flickr" + +#: ../extensions/flicker/flicker.extension.in.in.h:2 +msgid "Upload images to Flickr" +msgstr "Отправить изображения на Flickr" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 #: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 msgid "Free space:" msgstr "Доступно:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 msgid "Hi_de from public searches" msgstr "_Сделать невидимым для поиска" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 msgid "Moderate content" msgstr "Модерировать содержимое" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 msgid "Ph_otoset:" msgstr "_Набор снимков:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:6 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 msgid "Private photos" msgstr "Личные фотографии" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:7 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 msgid "Private photos, visible to family" msgstr "Личные фотографии, доступные для членов семьи" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:8 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 msgid "Private photos, visible to family and friends" msgstr "Личные фотографии, доступные для членов семьи и друзьям" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:11 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 msgid "Restricted content" msgstr "Содержимое с ограниченным доступом" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:12 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 msgid "Safe content" msgstr "Безопасное содежимое" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:14 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 msgid "_Privacy:" msgstr "_Личное:" -#: ../extensions/flicker/data/ui/export-to-flickr.ui.h:15 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 msgid "_Safety:" msgstr "_Безопасное:" -#: ../extensions/flicker/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 #: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 msgid "_Import" msgstr "_Импортировать" -#: ../extensions/flicker/dlg-import-from-flickr.c:356 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:812 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "Не удалось получить список фотографий" -#: ../extensions/flicker/dlg-import-from-flickr.c:404 -#: ../extensions/flicker/dlg-import-from-flickr.c:571 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:845 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1008 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 msgid "No album selected" msgstr "Не выбран альбом" -#: ../extensions/flicker/dlg-import-from-flickr.c:589 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 #, c-format msgid "Import from %s" msgstr "Импортировать из %s" -#: ../extensions/flicker/flicker.extension.in.in.h:1 -msgid "Flicker" -msgstr "Flickr" - -#: ../extensions/flicker/flicker.extension.in.in.h:2 -msgid "Upload images to Flickr" -msgstr "Отправить изображения на Flickr" - -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:986 -#: ../gthumb/gth-browser.c:1875 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1075 +#: ../gthumb/gth-browser.c:1998 msgid "Could not save the file" msgstr "Не удалось сохранить файл" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "Не удалось сделать снимок экрана" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1130 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1223 msgid "Save Image" msgstr "Сохранить изображение" -#: ../extensions/gstreamer_tools/actions.c:150 -#| msgid "Screenshot" +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Снимок экрана" -#. this is an empty time -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 msgid "--:--" msgstr "--:--" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 msgid "Change volume level" msgstr "Изменить уровень громкости" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 msgid "Faster" msgstr "Быстрее" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:624 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 msgid "Play" msgstr "Воспроизвести" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 msgid "Slower" msgstr "Медленнее" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Time:" msgstr "Время:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 msgid "Toggle volume" msgstr "Вкл/выкл громкость звука" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 -msgctxt "time" -msgid "/" -msgstr "/" - #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/photo_importer/actions.c:67 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Выберите папку" @@ -2638,15 +2936,19 @@ msgid "Play audio and video files." msgstr "Воспроизвести звуковые и видео файлы." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:92 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Снимок экрана" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:93 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Сделать снимок экрана" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:614 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 +msgid "Playing video" +msgstr "Воспроизведение видео" + +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Pause" msgstr "Пауза" @@ -2665,7 +2967,7 @@ msgstr "Исполнитель" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 msgid "Album" msgstr "Альбом" @@ -2687,13 +2989,13 @@ msgstr "Кадр/с" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Ширина" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:9 msgid "Height" msgstr "Высота" @@ -2715,15 +3017,15 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1182 -#: ../extensions/image_viewer/gth-metadata-provider-image.c:77 -#: ../extensions/webalbums/dlg-web-exporter.c:432 -#: ../extensions/webalbums/gth-web-exporter.c:2435 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1278 +#: ../extensions/image_viewer/gth-metadata-provider-image.c:190 +#: ../extensions/webalbums/dlg-web-exporter.c:442 +#: ../extensions/webalbums/gth-web-exporter.c:2446 #, c-format msgid "%d × %d" msgstr "%d x %d" -#: ../extensions/image_print/actions.c:67 +#: ../extensions/image_print/actions.c:69 msgid "Could not print the selected files" msgstr "Не удалось вывести на печать выделенные файлы" @@ -2731,79 +3033,106 @@ msgid "Print the selected images" msgstr "Печать выделенных изображений" -#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 msgid "Centered" msgstr "По центру" -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:10 msgid "Image" msgstr "Изображение" -#: ../extensions/image_print/data/ui/print-layout.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 msgid "Left" msgstr "Слева" -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:13 msgid "Position:" msgstr "Положение:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:14 msgid "Preview" msgstr "Предварительный просмотр" -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 msgid "Rotation:" msgstr "Поворот:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Select Caption Font" -msgstr "Выбрать шрифт заголовка" +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +#: ../extensions/importer/data/ui/import-preferences.ui.h:4 +msgid "The event description" +msgstr "Описание события" -#: ../extensions/image_print/data/ui/print-layout.ui.h:14 +#: ../extensions/image_print/data/ui/print-layout.ui.h:21 +msgid "The total number of files" +msgstr "Общее число файлов" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 msgid "Top" msgstr "Верх" -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 msgid "Unit:" msgstr "Единица:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -msgid "_Font:" -msgstr "_Шрифт:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#| msgid "S_how:" +#: ../extensions/image_print/data/ui/print-layout.ui.h:28 msgid "_Rows:" msgstr "С_троки:" -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "inches" msgstr "дюймы" -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +#: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "миллиметры" -#: ../extensions/image_print/gth-image-print-job.c:782 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +msgid "Fonts" +msgstr "Шрифты" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +msgid "Select Caption Font" +msgstr "Выбрать шрифт заголовка" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 +msgid "Select Footer Font" +msgstr "Выберите шрифт нижнего колонтитула" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:5 +msgid "Select Header Font" +msgstr "Выберите шрифт верхнего колонтитула" + +#: ../extensions/image_print/gth-image-print-job.c:971 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Страница %d из %d" -#: ../extensions/image_print/gth-image-print-job.c:1480 -#: ../extensions/image_print/gth-image-print-job.c:1582 -#: ../extensions/image_print/gth-image-print-job.c:1603 +#: ../extensions/image_print/gth-image-print-job.c:1734 +#: ../extensions/image_print/gth-image-print-job.c:1861 +#: ../extensions/image_print/gth-image-print-job.c:1898 msgid "Could not print" msgstr "Не удалось вывести на печать" +#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../gthumb/gth-main-default-tests.c:204 +msgid "Images" +msgstr "Изображения" + +#: ../extensions/image_print/gth-image-print-job.c:1863 +#: ../gthumb/gth-image-loader.c:204 +#: ../gthumb/gth-image-loader.c:277 +msgid "No suitable loader available for this file type" +msgstr "Для этого типа файла подходящий загрузчик отсутствует" + #. translators: %s is a filename -#: ../extensions/image_print/gth-load-image-info-task.c:154 +#: ../extensions/image_print/gth-load-image-info-task.c:164 #, c-format msgid "Loading \"%s\"" msgstr "Загрузка «%s»" -#: ../extensions/image_print/gth-load-image-info-task.c:156 -#: ../extensions/webalbums/gth-web-exporter.c:2684 +#: ../extensions/image_print/gth-load-image-info-task.c:166 +#: ../extensions/webalbums/gth-web-exporter.c:2685 msgid "Loading images" msgstr "Загрузка изображений" @@ -2815,30 +3144,41 @@ msgid "Image print" msgstr "Печать изображений" +#: ../extensions/image_print/preferences.c:79 +msgid "Print" +msgstr "Печать" + #: ../extensions/image_rotation/callbacks.c:50 msgid "Rotate the selected images 90° to the right" msgstr "Повернуть выбранные изображения на 90° по часовой стрелке" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" msgstr "Повернуть выбранные изображения на 90° против часовой стрелки" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Повернуть физически" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" msgstr "Повернуть выбранные изображения в соответствии со встроенной ориентации" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" msgstr "Сбросить ориентацию EXIF" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" msgstr "Сбросить встроенную ориентацию без поворота изрбражений" +#: ../extensions/image_rotation/gth-reset-orientation-task.c:111 +#: ../extensions/image_rotation/gth-transform-task.c:141 +#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2423 +msgid "Saving images" +msgstr "Сохранение изображений" + #: ../extensions/image_rotation/image_rotation.extension.in.in.h:1 msgid "Image rotation" msgstr "Поворот изображения" @@ -2847,12 +3187,12 @@ msgid "Rotate images without data loss." msgstr "Повернуть изображения без потери данных." -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "При преобразовании изображения возникла проблема: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" "This transformation may introduce small image distortions along one or more edges, because the image dimensions are not multiples of 8.\n" "\n" @@ -2866,90 +3206,86 @@ "\n" "Можно также отбросить (или обрезать) все точки по краям, которые не поддаются преобразованию. На практике этот режим даёт лучшие результаты, но преобразование при этом перестаёт быть обратимым без последствий." -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" msgstr "_Обрезать" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "_Допустить помехи" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -msgid "Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, fit-width, fit-width-if-larger." -msgstr "Возможные значения: actual-size, keep-prev, fit-size, fit-size-if-larger, fit-width, fit-width-if-larger." - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -msgid "Whether to resize the window to fit the size of the image" -msgstr "Изменять ли размер окна, чтобы подогнать размер изображения" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 msgid "After loading an image:" msgstr "После загрузки изображения:" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Высокое" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Низкое" - -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 msgid "Reset scrollbar positions" msgstr "Сбросить позиции полос прокрутки" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 msgid "Transparency _type:" msgstr "Тип _прозрачности:" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 msgid "_Zoom quality:" msgstr "_Качество масштабирования:" -#: ../extensions/image_viewer/gth-image-viewer-page.c:172 +#: ../extensions/image_viewer/gth-image-histogram.c:84 +msgid "Histogram" +msgstr "Гистограмма" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 +msgid "Copy Image" +msgstr "Копировать изображение" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 +msgid "Copy the image to the clipboard" +msgstr "Не удалось скопировать изображение в буфер обмена" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 +msgid "Paste Image" +msgstr "Вставить изображение" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 +msgid "Paste the image from the clipboard" +msgstr "Вставить изображение из буфера обмена" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "Увеличить" -#: ../extensions/image_viewer/gth-image-viewer-page.c:173 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Увеличить" -#: ../extensions/image_viewer/gth-image-viewer-page.c:177 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Уменьшить" -#: ../extensions/image_viewer/gth-image-viewer-page.c:178 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Уменьшить" -#: ../extensions/image_viewer/gth-image-viewer-page.c:182 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:183 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Показать без масштабирования" -#: ../extensions/image_viewer/gth-image-viewer-page.c:187 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Подогнать" -#: ../extensions/image_viewer/gth-image-viewer-page.c:188 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Масшабировать, чтобы подогнать к размеру окна" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Масштабировать, чтобы подогнать по ширине" -#: ../extensions/image_viewer/gth-image-viewer-page.c:200 -msgid "_Fit Window to Image" -msgstr "_Подогнать окно по изображению" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:201 -msgid "Resize the window to the size of the image" -msgstr "Изменить размер окна в соответствии с размером изображения" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 msgid "Basic image viewing." msgstr "Базовый просмотр изображения." @@ -2958,34 +3294,14 @@ msgid "Image viewer" msgstr "Просмотр изображений" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Установить фактический размер" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Подогнать по ширине" - -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Просмотрщик" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "Возможные значения: none, file_date, current_date" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "Возможные значения: ггггммдд, ггггмм, гггг" - #: ../extensions/importer/data/ui/import-preferences.ui.h:3 msgid "The day of the month" msgstr "День месяца" -#: ../extensions/importer/data/ui/import-preferences.ui.h:4 -msgid "The event description" -msgstr "Описание события" - #: ../extensions/importer/data/ui/import-preferences.ui.h:5 msgid "The hour" msgstr "Час" @@ -3018,72 +3334,89 @@ msgid "as _single subfolder" msgstr "как _одиночная подпапка" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "Неправильное место назначения" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "пример: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Дата файла" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "год-месяц-день" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "год-месяц" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "год" -#: ../extensions/importer/gth-import-preferences-dialog.c:340 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "другой формат" -#: ../extensions/importer/gth-import-task.c:438 -#: ../extensions/importer/gth-import-task.c:473 -#: ../extensions/importer/gth-import-task.c:639 +#: ../extensions/importer/gth-import-task.c:442 +#: ../extensions/importer/gth-import-task.c:477 +#: ../extensions/importer/gth-import-task.c:648 msgid "Importing files" msgstr "Импортирование файлов" -#: ../extensions/importer/gth-import-task.c:594 +#: ../extensions/importer/gth-import-task.c:598 msgid "No file imported" msgstr "Файлы не импортированы" -#: ../extensions/importer/gth-import-task.c:595 +#: ../extensions/importer/gth-import-task.c:599 msgid "The selected files are already present in the destination." msgstr "Выделенные файлы уже присутствуют в указанном месте." -#: ../extensions/importer/gth-import-task.c:616 +#: ../extensions/importer/gth-import-task.c:622 +#: ../gthumb/gth-file-source-vfs.c:690 +msgid "Could not delete the files" +msgstr "Не удалось удалить файлы" + +#: ../extensions/importer/gth-import-task.c:623 msgid "Delete operation not supported." msgstr "Операция удаления не поддерживается." -#: ../extensions/importer/gth-import-task.c:700 +#: ../extensions/importer/gth-import-task.c:709 msgid "Last imported" msgstr "Импортировано в последний раз" -#: ../extensions/list_tools/callbacks.c:64 +#: ../extensions/importer/gth-import-task.c:815 +msgid "No file specified." +msgstr "Не указан файл." + +#. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. +#: ../extensions/importer/gth-import-task.c:852 +#, c-format +msgid "" +"Not enough free space in '%s'.\n" +"%s of space is required but only %s is available." +msgstr "" +"Недостаточно свободного места в «%s».\n" +"Необходимо %s, но доступно только %s" + +#: ../extensions/list_tools/callbacks.c:75 #: ../gthumb/gth-filterbar.c:303 msgid "Personalize..." msgstr "Персонализировать…" -#: ../extensions/list_tools/callbacks.c:237 -#: ../extensions/list_tools/callbacks.c:248 +#: ../extensions/list_tools/callbacks.c:319 msgid "Tools" msgstr "Инструменты" -#: ../extensions/list_tools/callbacks.c:239 -#: ../extensions/list_tools/callbacks.c:250 +#: ../extensions/list_tools/callbacks.c:320 msgid "Batch tools for multiple files" msgstr "Инструменты для массовой обработки файлов" @@ -3101,107 +3434,86 @@ #: ../extensions/list_tools/data/ui/script-editor.ui.h:2 #, no-c-format -msgid "%B" -msgstr "%B" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format msgid "%E" msgstr "%E" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 -#, no-c-format -msgid "%F" -msgstr "%F" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:4 #, no-c-format msgid "%N" msgstr "%N" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 -#, no-c-format -msgid "%P" -msgstr "%P" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:12 -#, no-c-format -msgid "%U" -msgstr "%U" - #. Translate only 'message' and 'default_value'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:7 #, no-c-format msgid "%ask{ message }{ default value }" msgstr "%ask{ сообщение }{ значение по умолчанию }" #. Translate only 'attribute name' -#: ../extensions/list_tools/data/ui/script-editor.ui.h:18 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 #, no-c-format msgid "%attr{ attribute name }" msgstr "%attr{ имя атрибута }" #. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:13 #, no-c-format msgid "%quote{ text }" msgstr "%quote{ текст }" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:14 #: ../extensions/rename_series/data/ui/rename-series.ui.h:10 msgid "A file attribute" msgstr "Атрибут файла" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 msgid "Ask an input value" msgstr "Запросить вводимое значение" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:17 msgid "E_xecute command once for every file" msgstr "В_ыполнить одну команду для каждого файла" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:18 msgid "Quote the text " msgstr "Цитировать текст " -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 msgid "Sh_ortcut:" msgstr "_Горячая клавиша:" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 msgid "The file basename" msgstr "Базовое имя файла" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 msgid "The file basename without extension" msgstr "Базовое имя файла без расширения" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:31 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 msgid "The file extension" msgstr "Расширение файла" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:32 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 msgid "The file path" msgstr "Путь к файлу" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:33 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 msgid "The file uri" msgstr "Адрес (URI) файла" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:34 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 msgid "The parent folder path" msgstr "Путь к родительской папке" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:35 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 msgid "_Command:" msgstr "_Команда:" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:37 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 msgid "_Terminal command (shell script)" msgstr "_Терминальная команда (сценарий оболочки)" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:38 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 msgid "_Wait for the command to finish" msgstr "_Ожидать завершения команды" @@ -3214,7 +3526,7 @@ msgstr "Горячая клавиша" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "Показать" @@ -3222,46 +3534,44 @@ msgid "Could not save the script" msgstr "Не удалось сохранить сценарий" -#: ../extensions/list_tools/dlg-personalize-scripts.c:405 +#: ../extensions/list_tools/dlg-personalize-scripts.c:406 msgid "New Command" msgstr "Новая команда" -#: ../extensions/list_tools/dlg-personalize-scripts.c:432 +#: ../extensions/list_tools/dlg-personalize-scripts.c:433 msgid "Edit Command" msgstr "Изменить команду" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/dlg-personalize-scripts.c:461 +msgid "Are you sure you want to delete the selected command?" +msgstr "Действительно удалить выделенные команды?" + +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" msgstr "Введите значение:" -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:571 -#: ../extensions/webalbums/gth-web-exporter.c:583 -#: ../extensions/webalbums/gth-web-exporter.c:591 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:560 +#: ../extensions/webalbums/gth-web-exporter.c:572 +#: ../extensions/webalbums/gth-web-exporter.c:580 msgid "Malformed command" msgstr "Неправильная команда" -#: ../extensions/list_tools/gth-script-editor-dialog.c:177 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "нет" -#: ../extensions/list_tools/gth-script-editor-dialog.c:183 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "клавиша %d на цифровой клавиатуре" -#: ../extensions/list_tools/gth-script-editor-dialog.c:320 -#: ../gthumb/gth-filter-editor-dialog.c:492 -#, c-format -msgid "No name specified" -msgstr "Не указано имя" - -#: ../extensions/list_tools/gth-script-editor-dialog.c:326 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "Не указана команда" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "Команда завершилась ненормально с кодом %d" @@ -3274,6 +3584,40 @@ msgid "Scripting and batch manipulation of files." msgstr "Выполнение сценариев для массовой обработки файлов." +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "S" +msgstr "Ю" + +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "N" +msgstr "С" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "W" +msgstr "З" + +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "E" +msgstr "В" + +#: ../extensions/map_view/gth-map-view.c:205 +#: ../extensions/map_view/map_view.extension.in.in.h:1 +msgid "Map" +msgstr "Карта" + +#. No GPS label +#: ../extensions/map_view/gth-map-view.c:273 +msgid "The geographical position information is not available for this image." +msgstr "Информация о географическом положении недоступна для этого изображения." + +#: ../extensions/map_view/map_view.extension.in.in.h:2 +msgid "View the photo position on the map" +msgstr "Показать место снимка на карте" + #: ../extensions/photobucket/callbacks.c:54 msgid "Photobucket..." msgstr "Photobucket…" @@ -3283,7 +3627,7 @@ msgstr "Отправить фотографии в Photobucket" #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 msgid "1 megabyte file size" msgstr "1 мегабайтный размер файла" @@ -3311,10 +3655,6 @@ msgid "Tiny ( 100 x 75 )" msgstr "Крошечный ( 100 x 75 )" -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "_Изменить размер на:" - #: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 msgid "_Scramble filenames" msgstr "_Шифровать имена файлов" @@ -3323,31 +3663,31 @@ msgid "_Container:" msgstr "_Контейнер:" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:289 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 msgid "Tiny ( 100 × 75 )" msgstr "Крошечный ( 100 x 75 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:290 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 msgid "Small ( 160 × 120 )" msgstr "Маленький ( 160 x 120 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 msgid "Medium ( 320 × 240 )" msgstr "Средний ( 320 x 240 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 msgid "Large ( 640 × 480 )" msgstr "Большой 640 x 480" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 msgid "15ʺ screen ( 800 × 600 )" msgstr "15ʺ экран ( 800 x 600 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 msgid "17ʺ screen ( 1024 × 768 )" msgstr "17ʺ экран ( 1024 x 768 )" -#: ../extensions/photobucket/dlg-export-to-photobucket.c:302 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 msgid "2 megabyte file size" msgstr "2-х мегабайтный размер файла" @@ -3359,13 +3699,25 @@ msgid "Upload images to PhotoBucket" msgstr "Отправить изображения на PhotoBucket" -#: ../extensions/photo_importer/callbacks.c:51 -msgid "_Removable Device..." -msgstr "Подключаемое устройство..." +#: ../extensions/photo_importer/actions.c:71 +msgid "Import" +msgstr "Импортировать" #: ../extensions/photo_importer/callbacks.c:52 +msgid "_Removable Device..." +msgstr "_Съёмное устройство…" + +#: ../extensions/photo_importer/callbacks.c:53 msgid "Import photos and other files from a removable device" -msgstr "Импортировать фотографии и другие файлы с подключаемого устройства" +msgstr "Импортировать фотографии и другие файлы со съёмного устройства" + +#: ../extensions/photo_importer/callbacks.c:56 +msgid "F_older..." +msgstr "_Папка…" + +#: ../extensions/photo_importer/callbacks.c:57 +msgid "Import photos and other files from a folder" +msgstr "Импортировать фотографии и другие файлы из папки" #: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 msgid "After importing from a device:" @@ -3375,57 +3727,66 @@ msgid "_Rotate the images physically" msgstr "_Повернуть изображения физически" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -msgid "Import from Removable Device" -msgstr "Импортировать с подключаемого устройства" - #. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 #: ../gthumb/gth-filterbar.c:413 msgid "S_how:" msgstr "По_казать:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 msgid "_Delete the imported files from the source" msgstr "_Удалить импортированные файлы из источника импортирования" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 msgid "_Event:" msgstr "_Событие:" -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:8 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 msgid "_Tags:" msgstr "_Метки:" +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +msgid "Could not import the files" +msgstr "Не удалось импортировать файлы" + #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:248 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "Файлы для импортирования: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:288 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" msgstr "Не удалось загрузить папку" -#: ../extensions/photo_importer/dlg-photo-importer.c:318 -#: ../gthumb/gth-browser.c:1788 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:1911 msgid "Getting folder listing..." msgstr "Получение списка папок…" -#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "Пусто" +#: ../extensions/photo_importer/dlg-photo-importer.c:586 +msgid "Import from Removable Device" +msgstr "Импортировать со съёмного устройства" + +#: ../extensions/photo_importer/dlg-photo-importer.c:618 +msgid "Import from Folder" +msgstr "Импортировать из папки" + #: ../extensions/photo_importer/photo_importer.extension.in.in.h:1 msgid "Import photos" msgstr "Импортировать фотографии" #: ../extensions/photo_importer/photo_importer.extension.in.in.h:2 msgid "Import photos from removable devices." -msgstr "Импортировать фотографии с подключаемых устройств." +msgstr "Импортировать фотографии со съёмных устройств." #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." msgstr "Веб-альбом _Picasa…" @@ -3433,7 +3794,7 @@ msgid "Download photos from Picasa Web Album" msgstr "Получить фотографии из веб-альбома Picasa" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" msgstr "Отправить фотографии в веб-альбом Picasa" @@ -3469,22 +3830,22 @@ msgid "Public" msgstr "Открытый" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:352 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:294 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "Не удалось получить список альбомов" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:434 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:376 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" msgstr "Веб-альбом Picasa" -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:521 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:463 +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "Учётная запись" -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:134 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 msgid "Could not load the file" msgstr "Не удалось загрузить файл" @@ -3496,23 +3857,24 @@ msgid "Upload images to Picasa Web Albums" msgstr "Отправить изображения в веб-альбомы Picasa" -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Возможные значения: none, deflate, jpeg." - #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 msgid "Opti_mize" msgstr "_Оптимизировать" #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 +msgid "_Default extension:" +msgstr "_Расширение по умолчанию:" + +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 msgid "_Progressive" msgstr "_Постепенная прорисовка" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 msgid "_Quality:" msgstr "_Качество:" -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 msgid "_Smoothing:" msgstr "С_глаживание:" @@ -3540,36 +3902,36 @@ msgid "Resolution" msgstr "Разрешение" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 msgid "_Loss compression (JPEG)" msgstr "Сжатие с по_терями (JPEG)" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 msgid "_No compression" msgstr "_Без сжатия" -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 msgid "dpi" msgstr "точек/дюйм" -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:478 +#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 msgid "JPEG" msgstr "JPEG" -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 +#: ../extensions/pixbuf_savers/gth-png-saver.c:140 msgid "PNG" msgstr "PNG" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 #: ../gthumb/gth-buffer-data.c:84 msgid "Insufficient memory" msgstr "Недостаточно памяти" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 msgid "TGA" msgstr "TGA" -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:497 +#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 msgid "TIFF" msgstr "TIFF" @@ -3597,15 +3959,15 @@ msgid "_Y:" msgstr "_Y:" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:437 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." msgstr "_Убрать эффект «красных глаз»…" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:437 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "Убрать эффект «красных глаз»" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:438 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" msgstr "Удалить эффект «красных глаз», возникающий из-за вспышки" @@ -3617,17 +3979,21 @@ msgid "Tool to remove the red-eye effect from a photo." msgstr "Инструмент для удаления эффекта «красных глаз»." -#: ../extensions/rename_series/callbacks.c:48 -msgid "Rename the selected files" -msgstr "Переименовать выделенные файлы" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" -msgstr "Возможные значения: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "Возможные значения: 0 (отсутствует), 1 (нижний), 2 (верхний)" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:1 +msgid "add" +msgstr "добавить" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 +msgid "digits" +msgstr "цифры" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +msgid "format:" +msgstr "формат:" + +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "remove" +msgstr "удалить" #. translate only the text in the curly brackets #: ../extensions/rename_series/data/ui/rename-series.ui.h:3 @@ -3646,68 +4012,101 @@ msgid "Cas_e:" msgstr "Рег_истр:" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 +msgid "Edit template" +msgstr "Изменить шаблон" + +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 msgid "Re_verse Order" msgstr "В _обратном порядке" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 msgid "Rename" msgstr "Переименовать" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/search/data/ui/search-editor.ui.h:1 -msgid "Start _at:" -msgstr "_Начиная с:" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 msgid "The digitalization date" msgstr "Дата оцифровки" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 msgid "The modification date" msgstr "Дата изменения" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 msgid "The original enumerator" msgstr "Исходный счётчик" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 msgid "The original extension" msgstr "Исходное расширение" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:24 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 msgid "The original filename" msgstr "Исходное имя файла" -#: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -msgid "_Preview:" -msgstr "_Предварительный просмотр:" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 msgid "_Template:" msgstr "_Шаблон:" -#: ../extensions/rename_series/dlg-rename-series.c:380 +#: ../extensions/rename_series/dlg-rename-series.c:58 +msgid "Enumerator" +msgstr "Счётчик" + +#: ../extensions/rename_series/dlg-rename-series.c:59 +msgid "Original filename" +msgstr "Исходное имя файла" + +#: ../extensions/rename_series/dlg-rename-series.c:60 +msgid "Original extension" +msgstr "Исходное расширение" + +#: ../extensions/rename_series/dlg-rename-series.c:61 +msgid "Original enumerator" +msgstr "Исходный счётчик" + +#: ../extensions/rename_series/dlg-rename-series.c:62 +msgid "Modification date" +msgstr "Дата изменения" + +#: ../extensions/rename_series/dlg-rename-series.c:63 +msgid "Digitalization date" +msgstr "Дата оцифровки" + +#: ../extensions/rename_series/dlg-rename-series.c:64 +msgid "File attribute" +msgstr "Атрибут файла" + +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 msgid "Could not rename the files" msgstr "Не удалось переименовать файлы" -#: ../extensions/rename_series/dlg-rename-series.c:469 +#: ../extensions/rename_series/dlg-rename-series.c:780 +msgid "Could not save the template" +msgstr "Не удалось сохранить шаблон" + +#: ../extensions/rename_series/dlg-rename-series.c:798 +msgid "Edit Template" +msgstr "Изменить шаблон" + +#: ../extensions/rename_series/dlg-rename-series.c:856 msgid "Old Name" msgstr "Старое имя" -#: ../extensions/rename_series/dlg-rename-series.c:477 +#: ../extensions/rename_series/dlg-rename-series.c:867 msgid "New Name" msgstr "Новое имя" -#: ../extensions/rename_series/dlg-rename-series.c:554 +#: ../extensions/rename_series/dlg-rename-series.c:944 msgid "Keep original case" msgstr "Сохранять исходный регистр букв" -#: ../extensions/rename_series/dlg-rename-series.c:555 +#: ../extensions/rename_series/dlg-rename-series.c:945 msgid "Convert to lower-case" msgstr "Преобразовать в нижний регистр" -#: ../extensions/rename_series/dlg-rename-series.c:556 +#: ../extensions/rename_series/dlg-rename-series.c:946 msgid "Convert to upper-case" msgstr "Преобразовать в верхний регистр" @@ -3731,34 +4130,39 @@ msgid "Resize the selected images" msgstr "Изменить размер выделенных изображений" -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "Возможные значения: пикселы, процент" - #: ../extensions/resize_images/data/ui/resize-images.ui.h:5 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Формат" + +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "New dimensions" msgstr "Новый размер" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 msgid "Resize Images" msgstr "Изменить размер изображений" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Height:" msgstr "_Высота:" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 msgid "_Preserve original aspect ratios" msgstr "Сохранить соотношение сторон" -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 msgid "pixel" msgstr "пиксел" -#: ../extensions/resize_images/dlg-resize-images.c:140 +#: ../extensions/resize_images/dlg-resize-images.c:168 msgid "Resizing images" msgstr "Изменение размера изображений" +#: ../extensions/resize_images/dlg-resize-images.c:412 +msgid "Keep the original format" +msgstr "Сохранять исходный формат" + #: ../extensions/resize_images/resize_images.extension.in.in.h:1 msgid "Resize images" msgstr "Изменить размер изображений" @@ -3768,16 +4172,16 @@ msgstr "Изменить размер группы изображений." #: ../extensions/search/actions.c:49 -#: ../extensions/search/actions.c:116 -#: ../extensions/search/actions.c:122 +#: ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:123 msgid "Could not perform the search" msgstr "Не удалось выполнить поиск" -#: ../extensions/search/actions.c:53 +#: ../extensions/search/actions.c:54 msgid "Search Result" msgstr "Результат поиска" -#: ../extensions/search/actions.c:75 +#: ../extensions/search/actions.c:76 msgid "Find" msgstr "Искать" @@ -3785,35 +4189,36 @@ msgid "Find files" msgstr "Искать файлы" -#: ../extensions/search/callbacks.c:133 +#: ../extensions/search/callbacks.c:132 msgid "Search again" msgstr "Искать снова" #. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 +#: ../extensions/search/callbacks.c:174 #: ../extensions/search/search.extension.in.in.h:2 msgid "Search" msgstr "Поиск" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:196 +#: ../extensions/search/gth-search-editor.c:108 +#: ../gthumb/gth-filter-editor-dialog.c:165 msgid "all the following rules" msgstr "все следующие правила" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:197 +#: ../extensions/search/gth-search-editor.c:109 +#: ../gthumb/gth-filter-editor-dialog.c:166 msgid "any of the following rules" msgstr "любое из следующих правил" -#: ../extensions/search/gth-search-task.c:178 -msgid "Files found untill now: %" -msgstr "Найденные файлы: %" +#: ../extensions/search/gth-search-task.c:181 +#, c-format +msgid "Files found until now: %s" +msgstr "Найденные к этому моменту файлы: %s" -#: ../extensions/search/gth-search-task.c:251 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "Поиск…" -#: ../extensions/search/gth-search-task.c:257 +#: ../extensions/search/gth-search-task.c:277 msgid "Cancel the operation" msgstr "Отменить операцию" @@ -3829,9 +4234,9 @@ msgid "View as a slideshow" msgstr "Просмотр в режиме слайд-шоу" -#: ../extensions/slideshow/callbacks.c:406 +#: ../extensions/slideshow/callbacks.c:410 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "Слайд-шоу" @@ -3869,47 +4274,51 @@ msgid "_Transition effect:" msgstr "_Эффект перехода:" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow.c:229 +msgid "Playing slideshow" +msgstr "Воспроизведение слайд-шоу" + +#: ../extensions/slideshow/gth-slideshow-preferences.c:183 msgid "Choose the files to play" msgstr "Выберите файлы для воспроизведения" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:192 msgid "Audio files" msgstr "Звуковые файлы" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:258 msgid "Random" msgstr "Случайно" -#: ../extensions/slideshow/main.c:284 +#: ../extensions/slideshow/main.c:283 msgid "Push from right" msgstr "Вытолкнуть справа" -#: ../extensions/slideshow/main.c:290 +#: ../extensions/slideshow/main.c:289 msgid "Push from bottom" msgstr "Вытолкнуть снизу" -#: ../extensions/slideshow/main.c:296 +#: ../extensions/slideshow/main.c:295 msgid "Slide from right" msgstr "Скольжение справа" -#: ../extensions/slideshow/main.c:302 +#: ../extensions/slideshow/main.c:301 msgid "Slide from bottom" msgstr "Скольжение снизу" -#: ../extensions/slideshow/main.c:308 +#: ../extensions/slideshow/main.c:307 msgid "Fade in" msgstr "Плавное затухание" -#: ../extensions/slideshow/main.c:314 +#: ../extensions/slideshow/main.c:313 msgid "Flip page" msgstr "Перевернуть страницу" -#: ../extensions/slideshow/main.c:320 +#: ../extensions/slideshow/main.c:319 msgid "Cube from right" msgstr "Куб справа" -#: ../extensions/slideshow/main.c:326 +#: ../extensions/slideshow/main.c:325 msgid "Cube from bottom" msgstr "Куб снизу" @@ -3943,12 +4352,12 @@ msgstr "Индекс" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:115 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "Следующее" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "Предыдущее" @@ -3975,109 +4384,99 @@ #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 #, no-c-format -msgid "%I" -msgstr "%I" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -#, no-c-format -msgid "%i" -msgstr "%i" +msgid "%P" +msgstr "%P" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 msgid "Adapts to the window width" msgstr "Изменяет размер под ширину окна" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 msgid "All images on a single image" msgstr "Все изображения в одном изображении" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 msgid "Image Attributes" msgstr "Атрибуты изображения" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 msgid "Image Page" msgstr "Страница изображений" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 msgid "Index Page" msgstr "Индексная страница" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 msgid "Show the description, if available" msgstr "Показать описание, если оно есть" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 msgid "Show the following attributes:" msgstr "Показать следующие атрибуты:" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 msgid "The current image number" msgstr "Номер текущего изображения" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "The file comment" +msgstr "Комментарий к файлу" + +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 msgid "The total number of images" msgstr "Общее количество изображений" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 msgid "Thumbnail Caption" msgstr "Подпись миниатюры" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "Use subfolders to organize files" -msgstr "Использовать подпапки для упорядочивания файлов" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 msgid "Web Album" msgstr "Веб-альбом" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 msgid "_Adapt to the window width " msgstr "_Масштабировать под ширину окна" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:40 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 msgid "_Copy originals to destination" msgstr "_Копировать исходные изображения в место назначения" -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:44 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 msgid "_Resize if larger than:" msgstr "Мас_штабировать, если больше, чем:" -#: ../extensions/webalbums/gth-web-exporter.c:1795 +#: ../extensions/webalbums/gth-web-exporter.c:1802 msgid "Could not show the destination" msgstr "Не удалось показать место назначения" -#: ../extensions/webalbums/gth-web-exporter.c:1829 +#: ../extensions/webalbums/gth-web-exporter.c:1838 msgid "The album has been created successfully." msgstr "Альбом успешно создан." -#: ../extensions/webalbums/gth-web-exporter.c:2095 -#: ../extensions/webalbums/gth-web-exporter.c:2122 +#: ../extensions/webalbums/gth-web-exporter.c:2106 +#: ../extensions/webalbums/gth-web-exporter.c:2133 msgid "Saving thumbnails" msgstr "Сохранение миниатюр" -#: ../extensions/webalbums/gth-web-exporter.c:2150 +#: ../extensions/webalbums/gth-web-exporter.c:2161 msgid "Saving HTML pages: Images" msgstr "Сохранение страниц HTML: изображения" -#: ../extensions/webalbums/gth-web-exporter.c:2208 +#: ../extensions/webalbums/gth-web-exporter.c:2219 msgid "Saving HTML pages: Indexes" msgstr "Сохранение страниц HTML: индексы" -#: ../extensions/webalbums/gth-web-exporter.c:2328 -#: ../extensions/webalbums/gth-web-exporter.c:2412 -msgid "Saving images" -msgstr "Сохранение изображений" - -#: ../extensions/webalbums/gth-web-exporter.c:2491 +#: ../extensions/webalbums/gth-web-exporter.c:2502 msgid "Copying original images" msgstr "Копирование исходных изображений" -#: ../extensions/webalbums/gth-web-exporter.c:2927 +#: ../extensions/webalbums/gth-web-exporter.c:2929 msgid "Could not find the style folder" msgstr "Не удалось найти папку со стилями" -#: ../extensions/webalbums/gth-web-exporter.c:2960 +#: ../extensions/webalbums/gth-web-exporter.c:2967 msgid "Could not create a temporary folder" msgstr "Не удалось создать временную папку" @@ -4089,91 +4488,88 @@ msgid "Web Albums" msgstr "Веб-альбомы" -#: ../gthumb/dlg-extensions.c:65 +#: ../gthumb/dlg-personalize-filters.c:237 +msgid "Filter" +msgstr "Фильтр" + +#: ../gthumb/dlg-personalize-filters.c:315 +msgid "Could not save the filter" +msgstr "Не удалось сохранить фильтр" + +#: ../gthumb/dlg-personalize-filters.c:358 +msgid "New Filter" +msgstr "Новый фильтр" + +#: ../gthumb/dlg-personalize-filters.c:387 +msgid "Edit Filter" +msgstr "Изменить фильтр" + +#: ../gthumb/dlg-preferences-extensions.c:67 #: ../gthumb/gth-filterbar.c:269 msgid "All" msgstr "Все" -#: ../gthumb/dlg-extensions.c:66 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" msgstr "Включено" -#: ../gthumb/dlg-extensions.c:67 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" msgstr "Выключено" -#: ../gthumb/dlg-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" msgstr "Просмотрщики" -#: ../gthumb/dlg-extensions.c:71 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "Метаданные" -#: ../gthumb/dlg-extensions.c:72 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "Инструменты работы с файлами" -#: ../gthumb/dlg-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "Инструменты работы со списками" -#: ../gthumb/dlg-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "Инструменты импортирования" -#: ../gthumb/dlg-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" msgstr "Инструменты экспортирования" -#: ../gthumb/dlg-extensions.c:154 +#: ../gthumb/dlg-preferences-extensions.c:216 +msgid "Could not activate the extension" +msgstr "Не удалось включить данное расширение" + +#: ../gthumb/dlg-preferences-extensions.c:226 +msgid "Could not deactivate the extension" +msgstr "Не удалось отключить данное расширение" + +#. add the page to the preferences dialog +#: ../gthumb/dlg-preferences-extensions.c:772 +msgid "Extensions" +msgstr "Расширения" + +#: ../gthumb/dlg-preferences-extensions.c:819 msgid "Restart required" msgstr "Требуется перезапуск" -#: ../gthumb/dlg-extensions.c:155 +#: ../gthumb/dlg-preferences-extensions.c:820 msgid "You need to restart gthumb for these changes to take effect" msgstr "Необходимо перезапустить gthumb, чтобы изменения вступили в силу" -#: ../gthumb/dlg-extensions.c:156 +#: ../gthumb/dlg-preferences-extensions.c:821 msgid "_Continue" msgstr "Про_должить" -#: ../gthumb/dlg-extensions.c:157 +#: ../gthumb/dlg-preferences-extensions.c:822 msgid "_Restart" msgstr "_Перезапустить" -#: ../gthumb/dlg-extensions.c:258 -msgid "Could not activate the extension" -msgstr "Не удалось включить данное расширение" - -#: ../gthumb/dlg-extensions.c:264 -msgid "Could not deactivate the extension" -msgstr "Не удалось отключить данное расширение" - -#: ../gthumb/dlg-extensions.c:286 -msgid "Use" -msgstr "Использовать" - -#: ../gthumb/dlg-extensions.c:302 -msgid "Extension" -msgstr "Расширение" - -#: ../gthumb/dlg-personalize-filters.c:236 -msgid "Filter" -msgstr "Фильтр" - -#: ../gthumb/dlg-personalize-filters.c:314 -msgid "Could not save the filter" -msgstr "Не удалось сохранить фильтр" - -#: ../gthumb/dlg-personalize-filters.c:356 -msgid "New Filter" -msgstr "Новый фильтр" - -#: ../gthumb/dlg-personalize-filters.c:385 -msgid "Edit Filter" -msgstr "Изменить фильтр" - #: ../gthumb/eggfileformatchooser.c:236 #, c-format msgid "File _Format: %s" @@ -4210,30 +4606,30 @@ msgstr "Неизвестный формат файла" #. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1364 +#: ../gthumb/gio-utils.c:1355 #, c-format msgid "%s of %s" msgstr "%s из %s" -#: ../gthumb/gio-utils.c:1399 +#: ../gthumb/gio-utils.c:1390 #, c-format msgid "Moving \"%s\" to \"%s\"" msgstr "Перемещение «%s» в «%s»" -#: ../gthumb/gio-utils.c:1401 +#: ../gthumb/gio-utils.c:1392 #, c-format msgid "Copying \"%s\" to \"%s\"" msgstr "Копирование «%s» в «%s»" -#: ../gthumb/gio-utils.c:1740 +#: ../gthumb/gio-utils.c:1733 msgid "Moving files" msgstr "Перемещение файлов" -#: ../gthumb/gio-utils.c:1740 +#: ../gthumb/gio-utils.c:1733 msgid "Copying files" msgstr "Копирование файлов" -#: ../gthumb/gio-utils.c:1741 +#: ../gthumb/gio-utils.c:1734 msgid "Getting file information" msgstr "Получение информации о файлах" @@ -4243,7 +4639,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2678 +#: ../gthumb/glib-utils.c:2845 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4255,29 +4651,29 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2687 +#: ../gthumb/glib-utils.c:2854 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d:%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:370 +#: ../gthumb/gth-browser-actions-callbacks.c:391 msgid "gthumb is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." msgstr "gthumb это свободное ПО: вы можете распространять и/или изменять его согласно условиям лицензии GNU Public License версии 2 или более поздней, опубликованной Фондом Свободного Программного Обеспечения." -#: ../gthumb/gth-browser-actions-callbacks.c:374 +#: ../gthumb/gth-browser-actions-callbacks.c:395 msgid "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." msgstr "gthumb распространяется в надежде, что это ПО будет вам полезным, но БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, даже неявных гарантий ТОВАРНОСТИ или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Подробности см. в лицензии GNU General Public License." -#: ../gthumb/gth-browser-actions-callbacks.c:378 +#: ../gthumb/gth-browser-actions-callbacks.c:399 msgid "You should have received a copy of the GNU General Public License along with gthumb. If not, see http://www.gnu.org/licenses/." msgstr "Вы должны были получить копии лицензии GNU General Public License, вместе с gthumb. Если это не так, см. http://www.gnu.org/licenses/." -#: ../gthumb/gth-browser-actions-callbacks.c:397 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "An image viewer and browser for GNOME." msgstr "Программа просмотра изображений для GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:400 +#: ../gthumb/gth-browser-actions-callbacks.c:421 msgid "translator_credits" msgstr "" "Виктор Вислобоков \n" @@ -4286,376 +4682,421 @@ "Юрий Мясоедов \n" "Anton Shestakov " -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_Файл" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "_Правка" -#: ../gthumb/gth-browser-actions-entries.h:32 -msgid "_View" -msgstr "_Вид" - -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "Пере_ход" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "_Справка" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" msgstr "Открыть с _помощью" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" msgstr "_Импортировать из" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" msgstr "_Экспортировать в" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" msgstr "_Новое окно" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" msgstr "Открыть другое окно" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Открыть" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "Открыть в новом окне" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "Изменить различные настройки" -#: ../gthumb/gth-browser-actions-entries.h:80 -msgid "Extensions" -msgstr "Расширения" - -#: ../gthumb/gth-browser-actions-entries.h:81 -msgid "Activate, deactivate and configure the gthumb extensions" -msgstr "Включить, выключить и настроить расширения gthumb" - -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." msgstr "_Сортировать по…" -#: ../gthumb/gth-browser-actions-entries.h:95 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." msgstr "_Фильтр…" -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:108 msgid "Stop loading the current location" msgstr "Остановить загрузку текущего местоположения" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:114 msgid "Reload the current location" msgstr "Перезагрузить текущее местоположение" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" msgstr "Просмотреть предыдущее изображение" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "Просмотреть следующее изображение" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "Переключться в полноэкранный режим" -#: ../gthumb/gth-browser-actions-entries.h:126 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" msgstr "Выйти из полноэкранного режима" -#: ../gthumb/gth-browser-actions-entries.h:131 -#: ../gthumb/gth-browser.c:3405 +#: ../gthumb/gth-browser-actions-entries.h:144 +#: ../gthumb/gth-browser.c:3567 msgid "Go to the previous visited location" msgstr "Перейти к предыдущему посещённому местоположению" -#: ../gthumb/gth-browser-actions-entries.h:136 -#: ../gthumb/gth-browser.c:3426 +#: ../gthumb/gth-browser-actions-entries.h:150 +#: ../gthumb/gth-browser.c:3585 msgid "Go to the next visited location" msgstr "Перейти к следующему посещённому местоположению" -#: ../gthumb/gth-browser-actions-entries.h:141 -#: ../gthumb/gth-browser.c:3447 +#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser.c:3603 msgid "Go up one level" msgstr "Перейти на уровень выше" -#: ../gthumb/gth-browser-actions-entries.h:150 -#: ../gthumb/gth-browser.c:658 +#: ../gthumb/gth-browser-actions-entries.h:167 +#: ../gthumb/gth-browser.c:672 msgid "_Delete History" msgstr "_Удалить историю" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:168 msgid "Delete the list of visited locations" msgstr "Удалить список посещённых местоположений" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "View the folders" msgstr "Просмотр папок" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "Show information about gthumb" msgstr "Показать информацию о gThumb" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:185 msgid "Contents" msgstr "Содержание" -#: ../gthumb/gth-browser-actions-entries.h:166 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Display the gthumb Manual" msgstr "Показать руководство по gthumb" -#: ../gthumb/gth-browser-actions-entries.h:170 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "_Keyboard Shortcuts" msgstr "_Горячие клавиши" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:200 msgid "_Toolbar" msgstr "Панель _инструментов" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:201 msgid "View or hide the toolbar of this window" msgstr "Показать или спрятать панель инструментов данного окна" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:205 msgid "_Statusbar" msgstr "Строка _состояния" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:206 msgid "View or hide the statusbar of this window" msgstr "Показать или спряать строку состояния данного окна" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:210 msgid "_Filterbar" msgstr "Панель _фильтров" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:211 msgid "View or hide the filterbar of this window" msgstr "Показать или спрятать панель фильтров данного окна" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:215 msgid "_Sidebar" msgstr "_Боковая панель" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:216 msgid "View or hide the sidebar of this window" msgstr "Показать или спрятать боковую панель данного окна" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:220 msgid "_Thumbnail Pane" msgstr "Панель миниат_юр" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:221 msgid "View or hide the thumbnail pane in viewer mode" msgstr "Показать или спрятать панель миниатюр в режиме просмотра" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:225 msgid "_Thumbnails" msgstr "Миниат_юры" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:226 msgid "View thumbnails" msgstr "Просмотреть миниатюры" -#: ../gthumb/gth-browser-actions-entries.h:209 +#: ../gthumb/gth-browser-actions-entries.h:230 msgid "_Hidden Files" msgstr "С_крытые файлы" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:231 msgid "Show hidden files and folders" msgstr "Показывать скрытые файлы и папки" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:241 msgid "View file properties" msgstr "Просмотреть свойства файла" -#: ../gthumb/gth-browser-actions-entries.h:219 +#: ../gthumb/gth-browser-actions-entries.h:245 msgid "Edit" msgstr "Изменить" -#: ../gthumb/gth-browser-actions-entries.h:220 +#: ../gthumb/gth-browser-actions-entries.h:246 msgid "Edit file" msgstr "Изменить файл" -#: ../gthumb/gth-browser.c:357 +#: ../gthumb/gth-browser-actions-entries.h:250 +msgid "_Fit Window to Image" +msgstr "_Подогнать окно по изображению" + +#: ../gthumb/gth-browser-actions-entries.h:251 +msgid "Resize the window to the size of the image" +msgstr "Изменить размер окна в соответствии с размером изображения" + +#: ../gthumb/gth-browser.c:369 #, c-format msgid "Open %s" msgstr "Открыть %s" -#: ../gthumb/gth-browser.c:497 +#: ../gthumb/gth-browser.c:509 msgid "[modified]" msgstr "[изменён]" -#. manually set name and icon -#: ../gthumb/gth-browser.c:501 -#: ../gthumb/gth-main.c:269 -msgid "gthumb" -msgstr "gThumb" - -#: ../gthumb/gth-browser.c:965 +#: ../gthumb/gth-browser.c:996 #, c-format -#| msgid "%d file (%s)" -#| msgid_plural "%d files (%s)" msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d файл выделен (%s)" msgstr[1] "%d файла выделено (%s)" msgstr[2] "%d файлов выделено (%s)" -#: ../gthumb/gth-browser.c:1146 -#: ../gthumb/gth-browser.c:1679 -#: ../gthumb/gth-browser.c:5534 -#: ../gthumb/gth-browser.c:5553 -#: ../gthumb/gth-browser.c:5578 +#: ../gthumb/gth-browser.c:1031 +#, c-format +msgid "%s of free space" +msgstr "%s свободного маста" + +#: ../gthumb/gth-browser.c:1240 +#: ../gthumb/gth-browser.c:1799 +#: ../gthumb/gth-browser.c:5874 +#: ../gthumb/gth-browser.c:5893 +#: ../gthumb/gth-browser.c:5918 #, c-format msgid "Could not load the position \"%s\"" msgstr "Не удалось загрузить положение «%s»" -#: ../gthumb/gth-browser.c:1772 -#: ../gthumb/gth-browser.c:1799 +#: ../gthumb/gth-browser.c:1895 +#: ../gthumb/gth-browser.c:1922 #, c-format msgid "No suitable module found for %s" msgstr "Подходящий модуль для %s не найден" -#: ../gthumb/gth-browser.c:1919 +#: ../gthumb/gth-browser.c:2042 #, c-format msgid "Save changes to file '%s'?" msgstr "Сохранить изменения в файл «%s»?" -#: ../gthumb/gth-browser.c:1924 +#: ../gthumb/gth-browser.c:2047 msgid "If you don't save, changes to the file will be permanently lost." msgstr "Если не сохранить изменения, они будут безвозвратно потеряны." -#: ../gthumb/gth-browser.c:1925 +#: ../gthumb/gth-browser.c:2048 msgid "Do _Not Save" msgstr "_Не сохранять" -#: ../gthumb/gth-browser.c:2669 -#: ../gthumb/gth-browser.c:2691 -#: ../gthumb/gth-source-tree.c:178 -#: ../gthumb/gth-source-tree.c:200 +#: ../gthumb/gth-browser.c:2818 +#: ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Не удалось изменить имя" -#: ../gthumb/gth-browser.c:3090 +#: ../gthumb/gth-browser.c:3247 #: ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Изменено" -#: ../gthumb/gth-browser.c:3406 -#: ../gthumb/gth-browser.c:3427 +#: ../gthumb/gth-browser.c:3568 +#: ../gthumb/gth-browser.c:3586 msgid "View the list of visited locations" msgstr "Просмотреть список посещённых местоположений" -#: ../gthumb/gth-browser.c:3448 +#: ../gthumb/gth-browser.c:3604 msgid "View the list of upper locations" msgstr "Просмотреть список местоположений верхнего уровня" -#: ../gthumb/gth-browser.c:5535 +#: ../gthumb/gth-browser.c:5875 #, c-format msgid "File type not supported" msgstr "Тип файла не поддерживается" -#: ../gthumb/gth-browser.c:5579 +#: ../gthumb/gth-browser.c:5919 #, c-format msgid "No suitable module found" msgstr "Подходящий модуль не найден" -#: ../gthumb/gth-extensions.c:228 +#: ../gthumb/gth-extensions.c:203 #, c-format msgid "Could not open the module `%s`: %s" msgstr "Не удалось открыть модуль «%s»: %s" -#: ../gthumb/gth-extensions.c:827 +#: ../gthumb/gth-extensions.c:733 #, c-format -#| msgid "The extension '%s' is required by the extension '%s'" msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Расширение «%1$s» требуется для расширения «%2$s»" -#: ../gthumb/gth-file-source-vfs.c:82 +#: ../gthumb/gth-file-source-vfs.c:117 msgid "Home Folder" msgstr "Домашняя папка" -#: ../gthumb/gth-file-source-vfs.c:89 +#: ../gthumb/gth-file-source-vfs.c:122 msgid "File System" msgstr "Файловая система" +#: ../gthumb/gth-file-source-vfs.c:735 +msgid "The files cannot be moved to the Trash. Do you want to delete them permanently?" +msgstr "Файлы не могут быть перемещены в корзину. Удалить их навсегда?" + +#: ../gthumb/gth-file-source-vfs.c:746 +msgid "Could not move the files to the Trash" +msgstr "Не удалось переместить файлы в корзину" + +#: ../gthumb/gth-file-source-vfs.c:793 +#, c-format +msgid "Are you sure you want to move \"%s\" to trash?" +msgstr "Действительно переместить «%s» в корзину?" + +#: ../gthumb/gth-file-source-vfs.c:797 +#, c-format +msgid "Are you sure you want to move to trash the %'d selected file?" +msgid_plural "Are you sure you want to move to trash the %'d selected files?" +msgstr[0] "Действительно переместить в корзину %'d выбранный файл?" +msgstr[1] "Действительно переместить в корзину %'d выбранных файла?" +msgstr[2] "Действительно переместить в корзину %'d выбранных файлов?" + +#: ../gthumb/gth-file-source-vfs.c:840 +#, c-format +msgid "Are you sure you want to permanently delete the %'d selected file?" +msgid_plural "Are you sure you want to permanently delete the %'d selected files?" +msgstr[0] "Действительно окончательно удалить %'d выбранный файл?" +msgstr[1] "Действительно окончательно удалить %'d выбранных файла?" +msgstr[2] "Действительно окончательно удалить %'d выбранных файлов?" + #: ../gthumb/gth-filterbar.c:405 msgid "Hide the filterbar" msgstr "Скрыть панель фильтров" #: ../gthumb/gth-filter.c:43 -#: ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "КБ" #: ../gthumb/gth-filter.c:44 -#: ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "МБ" #: ../gthumb/gth-filter.c:45 -#: ../gthumb/gth-filter-editor-dialog.c:211 +#: ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "ГБ" #. "files" label -#: ../gthumb/gth-filter.c:279 -#: ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter.c:289 +#: ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "файлы" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" msgstr "восходящий" -#: ../gthumb/gth-filter-editor-dialog.c:256 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" msgstr "нисходящий" -#: ../gthumb/gth-filter-editor-dialog.c:546 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "Не указано ограничение" -#: ../gthumb/gth-folder-tree.c:848 +#: ../gthumb/gth-folder-tree.c:857 msgid "Loading..." msgstr "Загрузка…" -#: ../gthumb/gth-folder-tree.c:1119 +#: ../gthumb/gth-folder-tree.c:1100 msgid "(Open Parent)" msgstr "(Открыть родителя)" -#: ../gthumb/gth-image-loader.c:222 -#: ../gthumb/gth-image-loader.c:294 -msgid "No suitable loader available for this file type" -msgstr "Для этого типа файла подходящий загрузчик отсутствует" - -#: ../gthumb/gth-main.c:228 -#, c-format -msgid "Unable to show '%s'" -msgstr "Не удалось показать «%s»" - -#: ../gthumb/gth-main.c:248 -#, c-format -msgid "Unable to open '%s'" -msgstr "Не удалось открыть «%s»" +#: ../gthumb/gth-histogram-view.c:826 +msgid "Linear scale" +msgstr "Линейная шкала" + +#: ../gthumb/gth-histogram-view.c:838 +msgid "Logarithmic scale" +msgstr "Логарифмическая шкала" + +#: ../gthumb/gth-histogram-view.c:858 +msgid "Channel:" +msgstr "Канал:" + +#: ../gthumb/gth-histogram-view.c:890 +msgid "Value" +msgstr "Значение" + +#: ../gthumb/gth-histogram-view.c:896 +msgid "Red" +msgstr "Красный" + +#: ../gthumb/gth-histogram-view.c:902 +msgid "Green" +msgstr "Зелёный" + +#: ../gthumb/gth-histogram-view.c:908 +msgid "Blue" +msgstr "Синий" + +#: ../gthumb/gth-histogram-view.c:914 +msgid "Alpha" +msgstr "Альфа" + +#: ../gthumb/gth-histogram-view.c:921 +msgid "RGB" +msgstr "RGB" + +#: ../gthumb/gth-load-file-data-task.c:108 +msgid "Reading file information" +msgstr "Чтение информации из файла" #: ../gthumb/gth-main-default-metadata.c:32 msgid "File" @@ -4682,10 +5123,6 @@ msgid "Duration" msgstr "Продолжительность" -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Формат" - #: ../gthumb/gth-main-default-sort-types.c:131 msgid "file name" msgstr "имя файла" @@ -4710,10 +5147,6 @@ msgid "dimensions" msgstr "размеры" -#: ../gthumb/gth-main-default-tests.c:204 -msgid "Images" -msgstr "Изображения" - #: ../gthumb/gth-main-default-tests.c:225 msgid "Media" msgstr "Носитель" @@ -4742,16 +5175,20 @@ msgid "No options available for this file type" msgstr "Для файлов данного типа доступные параметры отсутствуют" -#: ../gthumb/gth-progress-dialog.c:136 +#: ../gthumb/gth-progress-dialog.c:142 msgid "Cancel operation" msgstr "Отменить операцию" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-save-file-data-task.c:102 +msgid "Saving file information" +msgstr "Сохранение информации в файле" + +#: ../gthumb/gth-tags-entry.c:388 #, c-format msgid "Create tag «%s»" msgstr "Создать метку «%s»" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:743 msgid "Show all the tags" msgstr "Показать все метки" @@ -4810,25 +5247,29 @@ msgstr "равно" #: ../gthumb/gth-test-category.c:47 +msgid "is only" +msgstr "только" + +#: ../gthumb/gth-test-category.c:48 #: ../gthumb/gth-test-simple.c:50 #: ../gthumb/gth-test-simple.c:65 msgid "is not" msgstr "не равно" -#: ../gthumb/gth-test-category.c:361 -#: ../gthumb/gth-test-simple.c:796 -#: ../gthumb/gth-test-simple.c:822 -#: ../gthumb/gth-test-simple.c:843 -#: ../gthumb/gth-test-simple.c:869 +#: ../gthumb/gth-test-category.c:386 +#: ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 +#: ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "Тестовое определение неполно" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:251 msgid "Add a new rule" msgstr "Добавить новое правило" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:262 msgid "Remove this rule" msgstr "Удалить это правило" @@ -4872,11 +5313,11 @@ msgid "is after" msgstr "после" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:474 msgid "Today" msgstr "Сегодня" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:482 msgid "Now" msgstr "Теперь" @@ -4884,37 +5325,56 @@ msgid "Close this window" msgstr "Закрыть это окно" -#: ../gthumb/gtk-utils.c:802 +#: ../gthumb/gth-window-actions-entries.h:36 +msgid "Close _All Windows" +msgstr "Закрыть _все окна" + +#: ../gthumb/gtk-utils.c:551 msgid "Could not display help" msgstr "Не удалось показать справку" -#: ../gthumb/gtk-utils.c:1089 -#: ../gthumb/gtk-utils.c:1097 +#: ../gthumb/gtk-utils.c:868 +#: ../gthumb/gtk-utils.c:875 msgid "Could not launch the application" msgstr "Не удалось запустить приложение" -#: ../gthumb/main.c:67 +#: ../gthumb/gtk-utils.c:978 +msgid "_Copy Here" +msgstr "_Копировать сюда" + +#: ../gthumb/gtk-utils.c:983 +msgid "_Move Here" +msgstr "_Переместить сюда" + +#: ../gthumb/gtk-utils.c:988 +msgid "_Link Here" +msgstr "_Создать ссылку сюда" + +#: ../gthumb/gtk-utils.c:997 +msgid "Cancel" +msgstr "Отмена" + +#: ../gthumb/main.c:59 msgid "Open a new window" msgstr "Открыть новое окно" -#: ../gthumb/main.c:71 +#: ../gthumb/main.c:63 msgid "Start in fullscreen mode" msgstr "Запускать в полноэкранном режиме" -#: ../gthumb/main.c:75 +#: ../gthumb/main.c:67 msgid "Automatically start a slideshow" msgstr "Автоматически запускать слайд-шоу" -#: ../gthumb/main.c:79 +#: ../gthumb/main.c:71 msgid "Automatically import digital camera photos" msgstr "Автоматически импортировать снимки с цифровой камеры" -#: ../gthumb/main.c:83 +#: ../gthumb/main.c:75 msgid "Show version" msgstr "Показать версию" -#. command line options -#: ../gthumb/main.c:501 +#: ../gthumb/main.c:344 msgid "- Image browser and viewer" msgstr "— программа просмотра изображений" @@ -4923,3 +5383,56 @@ msgid "Could not find a suitable module to save the image as \"%s\"" msgstr "Не удалось найти подходящий модуль для сохранения изображения как «%s»" +#~ msgid "" +#~ "Possible values are: actual_size, fit, keep_prev, fit_if_larger, " +#~ "fit_width_if_larger." +#~ msgstr "" +#~ "Возможные значения: actual_size, fit, keep_prev, fit_if_larger, " +#~ "fit_width_if_larger." + +#~ msgid "Possible values are: high, low." +#~ msgstr "Возможные значения: high, low." + +#~ msgid "Possible values are: light, midtone, dark." +#~ msgstr "Возможные значения: light, midtone, dark." + +#~ msgid "Possible values are: list, thumbnails." +#~ msgstr "Возможные значения: list, thumbnails." + +#~ msgid "Possible values are: small, medium, large." +#~ msgstr "Возможные значения: small, medium, large." + +#~ msgid "" +#~ "Possible values are: system, text_below, text_beside, text_only, " +#~ "icons_only." +#~ msgstr "" +#~ "Возможные значения: system, text_below, text_beside, text_only, " +#~ "icons_only." + +#~ msgid "Possible values: pixels, percentage" +#~ msgstr "Возможные значения: пикселы, процент" + +#~ msgid "Choose another tag" +#~ msgstr "Выбрать другую метку" + +#~ msgid "New tag" +#~ msgstr "Новая метка" + +#~ msgid "" +#~ "Possible values are: actual-size, keep-prev, fit-size, fit-size-if-" +#~ "larger, fit-width, fit-width-if-larger." +#~ msgstr "" +#~ "Возможные значения: actual-size, keep-prev, fit-size, fit-size-if-larger, " +#~ "fit-width, fit-width-if-larger." + +#~ msgid "Possible values are: none, file_date, current_date" +#~ msgstr "Возможные значения: none, file_date, current_date" + +#~ msgid "Possible values are: yyyymmdd, yyyymm, yyyy" +#~ msgstr "Возможные значения: ггггммдд, ггггмм, гггг" + +#~ msgid "Possible values are: none, deflate, jpeg." +#~ msgstr "Возможные значения: none, deflate, jpeg." + +#~ msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" +#~ msgstr "Возможные значения: 0 (отсутствует), 1 (нижний), 2 (верхний)" diff -Nru gthumb-2.14.3/po/sl.po gthumb-3.0.0/po/sl.po --- gthumb-2.14.3/po/sl.po 2011-11-03 20:36:36.000000000 +0000 +++ gthumb-3.0.0/po/sl.po 2012-03-25 21:09:45.000000000 +0000 @@ -9,10 +9,11 @@ msgstr "" "Project-Id-Version: gthumb master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gthumb&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-10-20 07:06+0000\n" -"PO-Revision-Date: 2011-10-22 13:16+0100\n" +"POT-Creation-Date: 2012-03-25 20:13+0000\n" +"PO-Revision-Date: 2012-03-25 22:16+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,176 +22,174 @@ "X-Poedit-Language: Slovenian\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "Datoteka ni veljavna datoteka .desktop" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "Neznana različica datoteke namizja '%s'" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "Zaganjanje %s" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "Program ne sprejme dokumentov preko ukazne vrstice" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "Nepoznana možnost zagona: %d" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "Ni mogoče poslati URI-ja dokumenta na vnos predmeta namizja 'Vrsta=Povezava'" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "Ni izvedljiv predmet" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "Onemogoči povezavo z upravljalnikom seje" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "Navedite datoteko s shranjenimi nastavitvami" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "DATOTEKA" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "Navedite ID upravljalnika seje" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "ID" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "Možnosti upravljanja seje:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "Prikaži možnosti upravljanja seje" +#. manually set name and icon #: ../data/gthumb.desktop.in.in.h:1 -msgid "Image Viewer" -msgstr "Pregledovalnik slik" +#: ../gthumb/gth-browser.c:529 +#: ../gthumb/gth-progress-dialog.c:388 +#: ../gthumb/main.c:313 +msgid "gThumb" +msgstr "gThumb" #: ../data/gthumb.desktop.in.in.h:2 -msgid "View and organize your images" -msgstr "Oglejte in uredite svoje slike" +msgid "Image Viewer" +msgstr "Pregledovalnik slik" -#. manually set name and icon #: ../data/gthumb.desktop.in.in.h:3 -#: ../data/gthumb-import.desktop.in.in.h:3 -#: ../gthumb/gth-browser.c:523 -#: ../gthumb/gth-main.c:229 -#: ../gthumb/gth-progress-dialog.c:443 -msgid "gThumb" -msgstr "gThumb" - -#: ../data/gthumb.desktop.in.in.h:4 msgid "gThumb Image Viewer" msgstr "gThumb pregledovalnik slik" +#: ../data/gthumb.desktop.in.in.h:4 +msgid "View and organize your images" +msgstr "Oglejte in uredite svoje slike" + #: ../data/gthumb-import.desktop.in.in.h:1 -msgid "Import the photos on your camera card" -msgstr "Uvozi fotografij s kartice digitalnega fotoaparata" +msgid "Import with gThumb" +msgstr "Uvozi s programom gThumb" #: ../data/gthumb-import.desktop.in.in.h:2 msgid "Photo Import Tool" msgstr "Orodje za uvoz fotografij" -#: ../data/gthumb-import.desktop.in.in.h:4 +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "gThumb Photo Import Tool" msgstr "gThumb orodje za uvoz fotografij" -#: ../data/gthumb.schemas.in.h:1 +#: ../data/gthumb-import.desktop.in.in.h:4 +msgid "Import the photos on your camera card" +msgstr "Uvozi fotografij s kartice digitalnega fotoaparata" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want to generate thumbnails for all images." msgstr "Slike nad to velikostjo (v bajtih) bodo bile brez sličic. V primeru, da želite ustvariti sličice za vse slike, uporabite vrednost 0." -#: ../data/gthumb.schemas.in.h:2 -msgid "Possible values are: actual_size, fit, keep_prev, fit_if_larger, fit_width_if_larger." -msgstr "Mogoče vrednosti so: dejanska_velikost, prilagodi, obdrži_prejšnje, prilagodi_če_večje, prilagodi_širino_če_večje." - -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "Mogoči vrednosti sta: visoko, nizko." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "Mogoče vrednosti so: svetlo, srednje, temno." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "Mogoči vrednosti sta: seznam, sličice." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "Mogoče vrednosti so: majhno, srednje, veliko." - -#: ../data/gthumb.schemas.in.h:7 -msgid "Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "Mogoče vrednosti so: sistem, besedilo_spodaj, besedilo_poleg, samo_besedilo, samo_ikone." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +msgid "Whether to resize the window to fit the size of the image" +msgstr "Ali naj bo velikost okna spremenjena do prilagajanja velikosti slike" + +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +msgid "Open files in the active window" +msgstr "Odpri datoteke v dejavnem oknu" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "Mogoče vrednosti so: bela, črna, šahovnica, brez." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 +msgid "Whether to reset the scrollbars position after changing image" +msgstr "Ali naj se položaji drsnika po spremembi slike ponastavi" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 msgid "Whether to always use a black background." msgstr "Ali naj bo vedno uporabljeno črno ozadje." -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" -msgstr "Ali naj bodo položaji drsnika po spremembi slike ponastavljeni" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Mogoči vrednosti sta jpg in jpeg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Mogoči vrednosti sta tif in tiff." + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" +msgstr "Mogoče vrednosti vključujejo: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" #: ../data/ui/extensions-preferences.ui.h:1 +msgid "_Extensions:" +msgstr "_Razširitve:" + +#: ../data/ui/extensions-preferences.ui.h:2 msgid "More extensions..." msgstr "Več razširitev ..." -#: ../data/ui/extensions-preferences.ui.h:2 +#: ../data/ui/extensions-preferences.ui.h:3 msgid "Some extensions are configurable." msgstr "Nekatere nastavitve so nastavljive." -#: ../data/ui/extensions-preferences.ui.h:3 -msgid "_Extensions:" -msgstr "_Razširitve:" - #: ../data/ui/filter-editor.ui.h:1 msgid "Filter _Name:" msgstr "Ime _filtra:" -#. limit label #: ../data/ui/filter-editor.ui.h:2 -#: ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 -msgid "_Limit to" -msgstr "_Omeji na" - -#: ../data/ui/filter-editor.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:3 msgid "_Match" msgstr "_Skladanje" +#. limit label +#: ../data/ui/filter-editor.ui.h:3 +#: ../gthumb/gth-filter.c:270 +#: ../gthumb/gth-filter.c:342 +msgid "_Limit to" +msgstr "_Omeji na" + #: ../data/ui/filter-editor.ui.h:4 msgid "selected by" msgstr "izbrano po" @@ -199,69 +198,74 @@ msgid "Mean:" msgstr "Povprečje:" -#: ../data/ui/histogram-info.ui.h:2 +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. +#: ../data/ui/histogram-info.ui.h:3 +msgid "Std dev:" +msgstr "Odklon:" + +#: ../data/ui/histogram-info.ui.h:4 msgid "Median:" msgstr "Mediana:" +#. After the colon there is the total number of pixels +#: ../data/ui/histogram-info.ui.h:6 +msgid "Pixels:" +msgstr "Točke:" + #. After the colon there is a percentile. -#: ../data/ui/histogram-info.ui.h:4 +#: ../data/ui/histogram-info.ui.h:8 msgctxt "Pixels" msgid "Max:" msgstr "Največ:" #. After the colon there is the percentile of selected pixels. -#: ../data/ui/histogram-info.ui.h:6 +#: ../data/ui/histogram-info.ui.h:10 msgctxt "Pixels" msgid "Selected:" msgstr "Izbrano:" -#. After the colon there is the total number of pixels -#: ../data/ui/histogram-info.ui.h:8 -msgid "Pixels:" -msgstr "Točke:" - -#. Short for "Standard deviation". Try to keep it short in the translation. -#: ../data/ui/histogram-info.ui.h:10 -msgid "Std dev:" -msgstr "Odklon:" +#: ../data/ui/location.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +msgid "_Location:" +msgstr "_Mesto:" #: ../data/ui/overwrite-dialog.ui.h:1 -msgid "Do not overwrite _the old file" -msgstr "Ne prepiši _stare datoteke" +msgid "Overwrite the old file with the new one?" +msgstr "Ali naj bo stara datoteka prepisana z novo?" #: ../data/ui/overwrite-dialog.ui.h:2 +msgid "Old File:" +msgstr "Stara datoteka:" + +#: ../data/ui/overwrite-dialog.ui.h:3 msgid "Filename:" msgstr "Ime datoteke:" -#: ../data/ui/overwrite-dialog.ui.h:3 +#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +msgid "Size:" +msgstr "Velikost:" + +#: ../data/ui/overwrite-dialog.ui.h:5 msgid "Modified:" msgstr "Spremenjeno:" -#: ../data/ui/overwrite-dialog.ui.h:4 +#: ../data/ui/overwrite-dialog.ui.h:6 msgid "New File:" msgstr "Nova datoteka:" -#: ../data/ui/overwrite-dialog.ui.h:5 -msgid "Old File:" -msgstr "Stara datoteka:" - -#: ../data/ui/overwrite-dialog.ui.h:6 +#: ../data/ui/overwrite-dialog.ui.h:7 msgid "Over_write the old file" msgstr "P_repiši starejšo datoteko" -#: ../data/ui/overwrite-dialog.ui.h:7 -msgid "Overwrite _all files" -msgstr "Prepiši _vse datoteke" - #: ../data/ui/overwrite-dialog.ui.h:8 -msgid "Overwrite the old file with the new one?" -msgstr "Ali naj bo stara datoteka prepisana z novo?" +msgid "Do not overwrite _the old file" +msgstr "Ne prepiši _stare datoteke" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 -#: ../extensions/image_print/data/ui/print-layout.ui.h:16 -msgid "Size:" -msgstr "Velikost:" +msgid "Overwrite _all files" +msgstr "Prepiši _vse datoteke" #: ../data/ui/overwrite-dialog.ui.h:10 msgid "_Do not overwrite any file" @@ -284,198 +288,182 @@ msgstr "_Drugi filtri:" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Zaženi predmete z dvojnim klikom miške" +msgid "below the folder list" +msgstr "pod seznamom map" #: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Zaženi predmete z enojnim klikom miške" +msgid "on the right" +msgstr "na desni strani" #: ../data/ui/preferences.ui.h:3 -msgid "Appearance" -msgstr "Videz" +msgid "gThumb Preferences" +msgstr "Možnosti gThumb " #: ../data/ui/preferences.ui.h:4 -msgid "As_k confirmation before deleting files or catalogs" -msgstr "Pred izbrisom slik ali katalogov _vprašaj za potrditev" +msgid "_Toolbar style:" +msgstr "_Slog orodne vrstice:" #: ../data/ui/preferences.ui.h:5 -msgid "Ask whether to save _modified files" -msgstr "Vprašaj ali naj bodo _spremenjene datoteke shranjene" +msgid "T_humbnails in viewer:" +msgstr "S_ličice v pregledovalniku:" #: ../data/ui/preferences.ui.h:6 -#: ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Črna" +msgid "System settings" +msgstr "Sistemske nastavitve" #: ../data/ui/preferences.ui.h:7 -#: ../gthumb/dlg-preferences-extensions.c:72 -#: ../gthumb/gth-browser-actions-entries.h:150 -msgid "Browser" -msgstr "Brskalnik" +msgid "Text below icons" +msgstr "Besedilo pod ikonami" #: ../data/ui/preferences.ui.h:8 -#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 -#: ../extensions/image_print/data/ui/print-layout.ui.h:4 -msgid "Caption" -msgstr "Naslov" +msgid "Text beside icons" +msgstr "Besedilo ob ikonah" #: ../data/ui/preferences.ui.h:9 -#: ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "Preverjeno" +msgid "Icons only" +msgstr "Le ikone" #: ../data/ui/preferences.ui.h:10 -msgid "Choose startup folder" -msgstr "Izbor zagonske mape" +msgid "Text only" +msgstr "Le besedilo" #: ../data/ui/preferences.ui.h:11 -msgid "D_etermine image type from content (slower)" -msgstr "_Določi vrsto slike iz vsebine (počasneje) " +msgid "on the bottom" +msgstr "na dnu" #: ../data/ui/preferences.ui.h:12 -#: ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Prilagodi velikost širini, če je večja" +msgid "on the side" +msgstr "ob strani" #: ../data/ui/preferences.ui.h:13 -#: ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Prilagodi oknu" +msgid "File _properties in browser:" +msgstr "Lastnosti _datoteke v brskalniku:" #: ../data/ui/preferences.ui.h:14 -#: ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Prilagodi velikost oknu, če je večja" +msgid "Appearance" +msgstr "Videz" #: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "Sledi obnašanju Nautilusa" +msgid "Go to last _visited location" +msgstr "Pojdi na _zadnje obiskano mesto" #: ../data/ui/preferences.ui.h:16 -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:393 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 -#: ../gthumb/gth-main-default-metadata.c:33 -msgid "General" -msgstr "Splošno" +msgid "Go to this _folder:" +msgstr "Pojdi v to _mapo:" #: ../data/ui/preferences.ui.h:17 -msgid "Go to last _visited location" -msgstr "Pojdi na _zadnje obiskano mesto" +msgid "Choose startup folder" +msgstr "Izbor zagonske mape" #: ../data/ui/preferences.ui.h:18 -msgid "Go to this _folder:" -msgstr "Pojdi v to _mapo:" +msgid "Set to C_urrent" +msgstr "Nastavi na t_retnuno" #: ../data/ui/preferences.ui.h:19 -#: ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Le ikone" +msgid "_Reuse the active window to open files" +msgstr "_Uporabi dejavno okno za odpiranje datotek" #: ../data/ui/preferences.ui.h:20 -#: ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Ohrani predhodno približanje" +msgid "On startup:" +msgstr "Ob zagonu:" #: ../data/ui/preferences.ui.h:21 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-crop.c:448 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 -#: ../extensions/file_tools/gth-file-tool-rotate.c:414 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "Brez" +msgid "As_k confirmation before deleting files or catalogs" +msgstr "Pred izbrisom slik ali katalogov _vprašaj za potrditev" #: ../data/ui/preferences.ui.h:22 -msgid "On startup:" -msgstr "Ob zagonu:" +msgid "Ask whether to save _modified files" +msgstr "Vprašaj ali naj bodo _spremenjene datoteke shranjene" #: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:192 +msgid "_Store metadata inside files if possible" +msgstr "_Shrani metapodatke znotraj datotek, če je mogoče" + +#: ../data/ui/preferences.ui.h:24 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:17 msgid "Other" msgstr "Ostalo" -#: ../data/ui/preferences.ui.h:24 -msgid "Set image to actual size" -msgstr "Nastavi sliko na dejansko velikost" - #: ../data/ui/preferences.ui.h:25 -msgid "Set to C_urrent" -msgstr "Nastavi na t_retnuno" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 +#: ../extensions/edit_metadata/gth-edit-general-page.c:473 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 +#: ../gthumb/gth-main-default-metadata.c:33 +msgid "General" +msgstr "Splošno" -#. Set widgets data. #: ../data/ui/preferences.ui.h:26 -#: ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Sistemske nastavitve" +#: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 +#: ../extensions/image_print/data/ui/print-layout.ui.h:18 +msgid "Caption" +msgstr "Naslov" #: ../data/ui/preferences.ui.h:27 -msgid "T_humbnails in viewer:" -msgstr "S_ličice v pregledovalniku:" +msgid "Thumbnail _size:" +msgstr "_Velikost sličic:" #: ../data/ui/preferences.ui.h:28 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Besedilo pod ikonami" +msgid "48" +msgstr "48" #: ../data/ui/preferences.ui.h:29 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Besedilo ob ikonah" +msgid "64" +msgstr "64" #: ../data/ui/preferences.ui.h:30 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Le besedilo" +msgid "85" +msgstr "85" #: ../data/ui/preferences.ui.h:31 -msgid "Thumbnail _size:" -msgstr "_Velikost sličic:" +msgid "95" +msgstr "95" #: ../data/ui/preferences.ui.h:32 -#: ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Bela" +msgid "112" +msgstr "112" #: ../data/ui/preferences.ui.h:33 -msgid "_Store metadata inside files if possible" -msgstr "_Shrani metapodatke znotraj datotek, če je mogoče" +msgid "128" +msgstr "128" #: ../data/ui/preferences.ui.h:34 -msgid "_Toolbar style:" -msgstr "_Slog orodne vrstice:" +msgid "164" +msgstr "164" #: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "Možnosti gThumb " +msgid "200" +msgstr "200" #: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "na dnu" +msgid "256" +msgstr "256" #: ../data/ui/preferences.ui.h:37 -msgid "on the side" -msgstr "na strani" +msgid "D_etermine image type from content (slower)" +msgstr "_Določi vrsto slike iz vsebine (počasneje) " -#: ../data/ui/sort-order.ui.h:1 -msgid "Sort By" -msgstr "Razvrsti po" +#: ../data/ui/preferences.ui.h:38 +#: ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:179 +msgid "Browser" +msgstr "Brskalnik" -#: ../data/ui/sort-order.ui.h:2 -msgid "_Inverse order" -msgstr "_Obratni vrstni red" +#: ../data/ui/sort-order.ui.h:1 +msgid "Sort By" +msgstr "Razvrsti po" -#: ../data/ui/sort-order.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +#: ../data/ui/sort-order.ui.h:2 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:4 msgid "_Sort by:" msgstr "_Razvrsti po:" +#: ../data/ui/sort-order.ui.h:3 +msgid "_Inverse order" +msgstr "_Obratni vrstni red" + #: ../extensions/23hq/23hq.extension.in.in.h:1 msgid "23" msgstr "23" @@ -484,23 +472,23 @@ msgid "Upload images to 23hq.com" msgstr "Pošlje slike na spletni album 23hq.com" -#: ../extensions/23hq/callbacks.c:67 +#: ../extensions/23hq/callbacks.c:68 msgid "_23..." msgstr "_23..." -#: ../extensions/23hq/callbacks.c:68 +#: ../extensions/23hq/callbacks.c:69 msgid "Upload photos to 23" msgstr "Pošiljanje fotografij na 23" #: ../extensions/bookmarks/bookmarks.extension.in.in.h:1 -msgid "Add bookmarks support." -msgstr "Doda podporo zaznamkom." - -#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:1 msgid "Bookmarks" msgstr "Zaznamki" +#: ../extensions/bookmarks/bookmarks.extension.in.in.h:2 +msgid "Add bookmarks support." +msgstr "Doda podporo zaznamkom." + #: ../extensions/bookmarks/bookmarks.extension.in.in.h:3 #: ../extensions/burn_disc/burn_disc.extension.in.in.h:3 #: ../extensions/catalogs/catalogs.extension.in.in.h:3 @@ -526,6 +514,7 @@ #: ../extensions/rename_series/rename_series.extension.in.in.h:3 #: ../extensions/resize_images/resize_images.extension.in.in.h:3 #: ../extensions/search/search.extension.in.in.h:3 +#: ../extensions/selections/selections.extension.in.in.h:3 #: ../extensions/slideshow/slideshow.extension.in.in.h:3 #: ../extensions/webalbums/webalbums.extension.in.in.h:3 msgid "gthumb development team" @@ -560,13 +549,13 @@ msgstr "_Zaznamki:" #: ../extensions/bookmarks/data/ui/bookmarks.ui.h:3 -msgid "_Location" -msgstr "_Mesto" - -#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 msgid "_Name" msgstr "_Ime" +#: ../extensions/bookmarks/data/ui/bookmarks.ui.h:4 +msgid "_Location" +msgstr "_Mesto" + #: ../extensions/bookmarks/dlg-bookmarks.c:70 msgid "Could not remove the bookmark" msgstr "Zaznamka ni mogoče odstraniti" @@ -600,16 +589,16 @@ msgstr "Trenutna mapa in njene _podmape" #: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:3 -msgid "Source" -msgstr "Vir" - -#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 msgid "_Selected files" msgstr "_Izbrane datoteke" +#: ../extensions/burn_disc/data/ui/burn-source-selector.ui.h:4 +msgid "Source" +msgstr "Vir" + #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Zapiši na disk" @@ -627,9 +616,9 @@ #: ../extensions/catalogs/actions.c:213 #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 -#: ../extensions/file_manager/actions.c:65 -#: ../extensions/list_tools/gth-script-editor-dialog.c:319 -#: ../gthumb/gth-filter-editor-dialog.c:491 +#: ../extensions/file_manager/actions.c:68 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format msgid "No name specified" msgstr "Ime ni določeno" @@ -638,7 +627,7 @@ #: ../extensions/catalogs/actions.c:220 #: ../extensions/catalogs/dlg-add-to-catalog.c:281 #: ../extensions/catalogs/dlg-add-to-catalog.c:401 -#: ../extensions/file_manager/actions.c:72 +#: ../extensions/file_manager/actions.c:75 #, c-format msgid "Invalid name. The following characters are not allowed: %s" msgstr "Neveljavno ime. V imenu so nedovoljeni znaki: %s" @@ -647,7 +636,8 @@ #: ../extensions/catalogs/actions.c:267 #: ../extensions/catalogs/dlg-add-to-catalog.c:338 #: ../extensions/catalogs/dlg-add-to-catalog.c:448 -#: ../extensions/file_manager/actions.c:103 +#: ../extensions/catalogs/gth-file-source-catalogs.c:508 +#: ../extensions/file_manager/actions.c:106 msgid "Name already used" msgstr "Ime že obstaja" @@ -665,7 +655,7 @@ #: ../extensions/catalogs/actions.c:293 #: ../extensions/catalogs/dlg-add-to-catalog.c:362 #: ../extensions/catalogs/dlg-add-to-catalog.c:474 -#: ../extensions/file_manager/actions.c:133 +#: ../extensions/file_manager/actions.c:136 msgid "C_reate" msgstr "Ustva_ri" @@ -683,7 +673,7 @@ msgid "Could not remove the catalog" msgstr "Kataloga ni mogoče odstraniti" -#: ../extensions/catalogs/actions.c:361 +#: ../extensions/catalogs/actions.c:363 #, c-format msgid "Are you sure you want to remove \"%s\"?" msgstr "Ali ste prepričani, da želite odstraniti \"%s\"?" @@ -701,8 +691,7 @@ msgstr "Gre v mapo, ki vsebuje izbrano datoteko" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/edit_metadata/callbacks.c:116 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:86 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Ostalo ..." @@ -745,30 +734,30 @@ #: ../extensions/catalogs/callbacks.c:497 #: ../extensions/catalogs/callbacks.c:502 -#: ../extensions/photo_importer/dlg-photo-importer.c:359 -#: ../extensions/photo_importer/dlg-photo-importer.c:399 -#: ../gthumb/gth-file-list.c:45 -#: ../gthumb/gth-folder-tree.c:874 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 +#: ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(Prazno)" -#: ../extensions/catalogs/callbacks.c:695 +#: ../extensions/catalogs/callbacks.c:697 msgid "Catalog Properties" msgstr "Lastnosti kataloga" -#: ../extensions/catalogs/callbacks.c:709 +#: ../extensions/catalogs/callbacks.c:711 msgid "Organize" msgstr "Organiziraj" -#: ../extensions/catalogs/callbacks.c:710 +#: ../extensions/catalogs/callbacks.c:712 msgid "Automatically organize files by date" msgstr "Samodejno organiziraj datoteke po datumu" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:662 +#: ../extensions/catalogs/gth-catalog.c:1024 +#: ../extensions/catalogs/gth-catalog.c:1025 msgid "Catalogs" msgstr "Katalogi" @@ -785,114 +774,114 @@ msgstr "_Katalogi:" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:3 -msgid "New _Library" -msgstr "Nova _knjižnica" - -#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 msgid "_New Catalog" msgstr "_Nov katalog" +#: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:4 +msgid "New _Library" +msgstr "Nova _knjižnica" + #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:922 -#: ../extensions/webalbums/gth-web-exporter.c:1852 +#: ../extensions/file_manager/actions.c:945 +#: ../extensions/webalbums/gth-web-exporter.c:1842 msgid "_View the destination" msgstr "_Pogled cilja" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:1 -msgid "Catalog" -msgstr "Katalog" - -#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:201 +#: ../gthumb/gth-file-properties.c:212 msgid "Properties" msgstr "Lastnosti" +#: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:1 +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +msgid "_Name:" +msgstr "_Ime:" + #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:4 -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 msgid "_Date:" msgstr "_Datum:" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:5 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 -msgid "_Name:" -msgstr "_Ime:" +msgid "Catalog" +msgstr "Katalog" #: ../extensions/catalogs/data/ui/organize-files-task.ui.h:1 -msgid "Catalog _Preview:" -msgstr "_Predogled kataloga:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 -msgid "Organization:" -msgstr "Organizacija:" - -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 -#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 msgid "Organize Files" msgstr "Organiziraj datoteke" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:2 msgid "Organizing files" msgstr "Organiziranje datotek" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:3 +msgid "Organization:" +msgstr "Organizacija:" + +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:4 msgid "Select All" msgstr "Izberi vse" -#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:5 msgid "Select None" msgstr "Brez izbora" +#: ../extensions/catalogs/data/ui/organize-files-task.ui.h:6 +msgid "Catalog _Preview:" +msgstr "_Predogled kataloga:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:470 -#: ../gthumb/gth-main-default-tests.c:264 +#: ../extensions/edit_metadata/gth-edit-general-page.c:550 +#: ../gthumb/gth-main-default-tests.c:300 msgid "Date photo was taken" msgstr "Datum zajema fotografije" #: ../extensions/catalogs/data/ui/organize-files.ui.h:2 -#: ../gthumb/gth-main-default-tests.c:256 +#: ../gthumb/gth-main-default-tests.c:292 msgid "File modified date" msgstr "Datum spremembe datoteke" #: ../extensions/catalogs/data/ui/organize-files.ui.h:3 -msgid "Ignore catalogs with a single file" -msgstr "Prezri kataloge z eno datoteko" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 -msgid "Put single files in the catalog:" -msgstr "Postavi posamezne datoteke v katalog:" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:6 -msgid "Singles" -msgstr "Posamezne" - -#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:261 +#: ../extensions/comments/main.c:159 msgid "Tag" msgstr "Oznaka" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 -#: ../gthumb/gth-main-default-tests.c:284 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:4 +msgid "tag" +msgstr "oznaka" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:5 +#: ../gthumb/gth-main-default-tests.c:324 msgid "Tag (embedded)" msgstr "Oznaka (vključena)" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:7 msgid "_Group files by:" msgstr "_Združi datoteke po:" -#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 +#: ../extensions/catalogs/data/ui/organize-files.ui.h:8 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:2 msgid "_Include sub-folders" msgstr "_Vključi podmape" +#: ../extensions/catalogs/data/ui/organize-files.ui.h:9 +msgid "Ignore catalogs with a single file" +msgstr "Prezri kataloge z eno datoteko" + +#: ../extensions/catalogs/data/ui/organize-files.ui.h:10 +msgid "Put single files in the catalog:" +msgstr "Postavi posamezne datoteke v katalog:" + #: ../extensions/catalogs/data/ui/organize-files.ui.h:11 -msgid "tag" -msgstr "oznaka" +msgid "Singles" +msgstr "Posamezne" #: ../extensions/catalogs/dlg-add-to-catalog.c:105 #: ../extensions/catalogs/dlg-add-to-catalog.c:136 @@ -900,7 +889,7 @@ msgstr "Datotek ni mogoče dodati v katalog" #: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/search/gth-search-task.c:352 +#: ../extensions/search/gth-search-task.c:356 msgid "Could not create the catalog" msgstr "Kataloga ni mogoče ustvariti" @@ -908,7 +897,7 @@ msgid "Could not save the catalog" msgstr "Kataloga ni mogoče shraniti" -#: ../extensions/catalogs/dlg-catalog-properties.c:166 +#: ../extensions/catalogs/dlg-catalog-properties.c:159 msgid "Could not load the catalog" msgstr "Kataloga ni mogoče naložiti" @@ -916,53 +905,54 @@ msgid "Files will be organized in catalogs. No file will be moved on disk." msgstr "Datoteke bodo organizirane v kataloge. Nobena datoteka ne bo premaknjena na disku." -#: ../extensions/catalogs/gth-catalog.c:1145 -#: ../extensions/comments/main.c:43 +#: ../extensions/catalogs/gth-catalog.c:1122 +#: ../extensions/comments/main.c:44 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Oznake" -#: ../extensions/catalogs/gth-file-source-catalogs.c:848 +#: ../extensions/catalogs/gth-file-source-catalogs.c:953 #, c-format msgid "The catalog '%s' already exists, do you want to overwrite it?" msgstr "Katalog z imenom '%s' že obstaja. Ali ga želite prepisati?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:850 +#: ../extensions/catalogs/gth-file-source-catalogs.c:955 #, c-format msgid "The library '%s' already exists, do you want to overwrite it?" msgstr "Knjižnica z imenom '%s' že obstaja. Ali jo želite prepisati?" -#: ../extensions/catalogs/gth-file-source-catalogs.c:858 +#: ../extensions/catalogs/gth-file-source-catalogs.c:963 msgid "Over_write" msgstr "_Prepiši" -#: ../extensions/catalogs/gth-file-source-catalogs.c:976 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1081 msgid "Cannot move the files" msgstr "Datotek ni mogoče premakniti" -#: ../extensions/catalogs/gth-file-source-catalogs.c:978 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1083 msgid "Cannot copy the files" msgstr "Datotek ni mogoče kopirati" -#: ../extensions/catalogs/gth-file-source-catalogs.c:983 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1088 msgid "Invalid destination." msgstr "Neveljaven cilj." -#: ../extensions/catalogs/gth-file-source-catalogs.c:1030 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1135 #, c-format msgid "Copying files to '%s'" msgstr "Kopiranje datotek v '%s'" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1283 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1388 msgid "Could not remove the files from the catalog" msgstr "Ni mogoče odstraniti datotek iz kataloga" -#: ../extensions/catalogs/gth-file-source-catalogs.c:1341 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:674 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:683 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:711 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1214 -#: ../extensions/search/gth-search.c:295 +#: ../extensions/catalogs/gth-file-source-catalogs.c:1446 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:685 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:694 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:723 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1228 +#: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Neveljavna vrsta datoteke" @@ -987,86 +977,89 @@ msgid "Change the files date" msgstr "Spremeni datum datotek" -#: ../extensions/change_date/data/gthumb_change_date.schemas.in.h:1 -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "Mogoči vrednosti sta: točke, odstotek" - #: ../extensions/change_date/data/ui/change-date.ui.h:1 -msgid "+" -msgstr "+" +msgid "Change Date" +msgstr "Spremeni datum" #: ../extensions/change_date/data/ui/change-date.ui.h:2 -msgid "-" -msgstr "-" +msgid "Change the following values:" +msgstr "Spremeni naslednje vrednosti:" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -msgid "A_djust by" -msgstr "Prilago_di za" +msgid "_Last modified date" +msgstr "Datum z_adnje spremembe" #: ../extensions/change_date/data/ui/change-date.ui.h:4 -msgid "Change Date" -msgstr "Spremeni datum" +msgid "Co_mment date" +msgstr "Datum o_pombe" #: ../extensions/change_date/data/ui/change-date.ui.h:5 -msgid "Change the following values:" -msgstr "Spremeni naslednje vrednosti:" +msgid "Exif DateTimeOriginal tag" +msgstr "Exif oznaka IzvorniDatumČas" #: ../extensions/change_date/data/ui/change-date.ui.h:6 msgid "Change to:" msgstr "Spremeni v:" #: ../extensions/change_date/data/ui/change-date.ui.h:7 -msgid "Co_mment date" -msgstr "Datum o_pombe" +msgid "The _following date:" +msgstr "_Naslednji datum:" #: ../extensions/change_date/data/ui/change-date.ui.h:8 -msgid "Date p_hoto was taken" -msgstr "Datum zajema _fotografije" - -#: ../extensions/change_date/data/ui/change-date.ui.h:9 -msgid "Exif DateTimeOriginal tag" -msgstr "Exif oznaka IzvorniDatumČas" - -#: ../extensions/change_date/data/ui/change-date.ui.h:10 msgid "File _modified date" msgstr "Datum _spremembe datoteke" -#: ../extensions/change_date/data/ui/change-date.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:9 msgid "File c_reation date" msgstr "Datum _ustvarjanja datoteke" -#: ../extensions/change_date/data/ui/change-date.ui.h:12 -msgid "The _following date:" -msgstr "_Naslednji datum:" +#: ../extensions/change_date/data/ui/change-date.ui.h:10 +msgid "Date p_hoto was taken" +msgstr "Datum zajema _fotografije" -#: ../extensions/change_date/data/ui/change-date.ui.h:13 -msgid "_Last modified date" -msgstr "Datum z_adnje spremembe" +#: ../extensions/change_date/data/ui/change-date.ui.h:11 +msgid "A_djust by" +msgstr "Prilago_di za" -#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/change_date/data/ui/change-date.ui.h:12 msgid "hours" msgstr "ure" -#: ../extensions/change_date/data/ui/change-date.ui.h:15 +#: ../extensions/change_date/data/ui/change-date.ui.h:13 msgid "minutes" msgstr "minute" -#: ../extensions/change_date/data/ui/change-date.ui.h:16 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +#: ../extensions/change_date/data/ui/change-date.ui.h:14 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:6 msgid "seconds" msgstr "sekund" -#: ../extensions/comments/comments.extension.in.in.h:1 -msgid "Add comments and tags to any file type." -msgstr "Doda opombe in oznake katerikoli vrsti datoteke" +#: ../extensions/change_date/data/ui/change-date.ui.h:15 +msgid "+" +msgstr "+" -#: ../extensions/comments/comments.extension.in.in.h:2 +#: ../extensions/change_date/data/ui/change-date.ui.h:16 +msgid "-" +msgstr "-" + +#: ../extensions/comments/callbacks.c:46 +msgid "Import Embedded Metadata" +msgstr "Uvozi vstavljene metapodatke" + +#: ../extensions/comments/callbacks.c:47 +msgid "Import the metadata stored inside files into the gThumb comment system" +msgstr "Uvozi metapodatke, ki so shranjeni v datotekah v sistem opomb programa gThumb" + +#: ../extensions/comments/comments.extension.in.in.h:1 msgid "Comments and tags" msgstr "Opombe in oznake" +#: ../extensions/comments/comments.extension.in.in.h:2 +msgid "Add comments and tags to any file type." +msgstr "Doda opombe in oznake katerikoli vrsti datoteke" + #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Možnosti" @@ -1074,41 +1067,41 @@ msgid "_Synchronize with the embedded metadata" msgstr "_Uskladi z vloženimi metapodatki" -#: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:111 +#: ../extensions/comments/main.c:34 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Opomba" -#: ../extensions/comments/main.c:39 +#: ../extensions/comments/main.c:40 #: ../gthumb/gth-main-default-metadata.c:46 msgid "Title" msgstr "Naslov" -#: ../extensions/comments/main.c:40 -#: ../extensions/comments/main.c:245 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 +#: ../extensions/comments/main.c:41 +#: ../extensions/comments/main.c:143 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 -#: ../extensions/importer/data/ui/import-preferences.ui.h:1 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:16 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#: ../extensions/importer/data/ui/import-preferences.ui.h:6 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 #: ../gthumb/gth-main-default-metadata.c:52 msgid "Description" msgstr "Opis" -#: ../extensions/comments/main.c:41 -#: ../extensions/comments/main.c:253 +#: ../extensions/comments/main.c:42 +#: ../extensions/comments/main.c:151 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Mesto" -#: ../extensions/comments/main.c:42 +#: ../extensions/comments/main.c:43 #: ../gthumb/gth-main-default-metadata.c:51 msgid "Date" msgstr "Datum" -#: ../extensions/comments/main.c:44 +#: ../extensions/comments/main.c:45 #: ../gthumb/gth-main-default-metadata.c:54 msgid "Rating" msgstr "Ocena" @@ -1134,7 +1127,7 @@ msgstr "Ustvari steno slike" #: ../extensions/contact_sheet/contact_sheet.extension.in.in.h:1 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:1 msgid "Contact Sheet" msgstr "Fotokazalo" @@ -1143,24 +1136,32 @@ msgstr "Ustvari sliko kazala s sličicami izbranih datotek." #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:1 -msgid "Background" -msgstr "Ozadje" +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-crop.c:454 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:14 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Brez" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:2 -msgid "C_olor:" -msgstr "Ba_rva:" +msgid "Simple" +msgstr "Enostavno" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:3 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:5 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 -msgid "Caption:" -msgstr "Naslov:" +msgid "Simple with shadow" +msgstr "Preprosto s senco" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:4 -msgid "Frame" -msgstr "Okvir" +msgid "Shadow only" +msgstr "Samo senca" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:5 +msgid "Slide" +msgstr "Prosojnica" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 msgid "Inward Shadow" msgstr "Notranja senca" @@ -1168,242 +1169,244 @@ msgid "Outward Shadow" msgstr "Zunanja senca" -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:8 -msgid "Select a color" -msgstr "Izbor barve" - #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:9 -msgid "Select a font" -msgstr "Izbor pisave" +msgid "Background" +msgstr "Ozadje" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:10 -msgid "Shadow only" -msgstr "Samo senca" +msgid "_Solid color" +msgstr "_Enobarvno" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:11 -msgid "Simple" -msgstr "Enostavno" +msgid "_Gradient" +msgstr "_Preliv" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:12 -msgid "Simple with shadow" -msgstr "Preprosto s senco" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 +msgid "_Horizontal:" +msgstr "_Vodoravno:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:13 -msgid "Slide" -msgstr "Prosojnica" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 +msgid "_Vertical:" +msgstr "_Navpično:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#: ../extensions/rename_series/dlg-rename-series.c:63 -msgid "Text" -msgstr "Besedilo" +msgid "Select a color" +msgstr "Izbor barve" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:15 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 -#: ../extensions/image_print/data/ui/print-layout.ui.h:26 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 -msgid "_Footer:" -msgstr "_Noga:" +msgid "Frame" +msgstr "Okvir" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:16 -msgid "_Gradient" -msgstr "_Preliv" +msgid "_Style:" +msgstr "_Slog:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:17 -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 -#: ../extensions/image_print/data/ui/print-layout.ui.h:27 -#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 -msgid "_Header:" -msgstr "_Glava:" +msgid "C_olor:" +msgstr "Ba_rva:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:18 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 -msgid "_Horizontal:" -msgstr "_Vodoravno:" +#: ../extensions/rename_series/dlg-rename-series.c:57 +msgid "Text" +msgstr "Besedilo" + +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:19 +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 +#: ../extensions/image_print/data/ui/print-layout.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 +msgid "_Header:" +msgstr "_Glava:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:20 -msgid "_Solid color" -msgstr "_Enobarvno" +msgid "Select a font" +msgstr "Izbor pisave" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:21 -msgid "_Style:" -msgstr "_Slog:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 +#: ../extensions/image_print/data/ui/print-layout.ui.h:4 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 +msgid "_Footer:" +msgstr "_Noga:" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:22 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 -msgid "_Vertical:" -msgstr "_Navpično:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:32 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:1 +msgid "Caption:" +msgstr "Naslov:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:2 +#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 +msgid "The current page number" +msgstr "Številka trenutne strani" -#. translate only the text in the curly brackets #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:3 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 -#, no-c-format -msgid "%D{ format }" -msgstr "%D{ oblika }" +#: ../extensions/image_print/data/ui/print-layout.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +msgid "The total number of pages" +msgstr "Skupno število strani" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:4 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:9 -msgid "All images on a single page" -msgstr "Vse slike na eni strani" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:6 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 -#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:10 -msgid "Choose destination folder" -msgstr "Izbor ciljne mape" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/image_print/data/ui/print-layout.ui.h:7 +#: ../extensions/importer/data/ui/import-preferences.ui.h:5 +#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 +msgid "Special code" +msgstr "Posebna koda" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:7 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 -#: ../extensions/image_print/data/ui/print-layout.ui.h:6 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:11 -msgid "Columns:" -msgstr "Stolpci:" +#. translate only the text in the curly brackets +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:8 +#: ../extensions/image_print/data/ui/print-layout.ui.h:11 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:12 +#, no-c-format +msgid "%D{ format }" +msgstr "%D{ oblika }" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:9 -msgid "Create _HTML image map" -msgstr "Ustvari _HTML zemljevid slik" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:10 -msgid "Create a new theme" -msgstr "Ustvari novo temo" +#: ../extensions/image_print/data/ui/print-layout.ui.h:12 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 +msgid "The current date" +msgstr "Trenutni datum" -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:11 -msgid "Delete the selected theme" -msgstr "Izbriši izbrano temo" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:2 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 +msgid "_Destination:" +msgstr "_Cilj:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:13 -msgid "Edit the selected theme" -msgstr "Uredi izbrano temo" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:3 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 +msgid "Choose destination folder" +msgstr "Izbor ciljne mape" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:14 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 msgid "File_name:" msgstr "Ime _datoteke:" +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:5 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:8 +msgid "New enumerator digit" +msgstr "Novo število števca" + #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:16 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:7 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 -msgid "Images per page:" -msgstr "Slik na stran:" +msgid "Create _HTML image map" +msgstr "Ustvari _HTML zemljevid slik" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:17 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:8 -#: ../extensions/image_print/data/ui/print-layout.ui.h:11 -msgid "Layout" -msgstr "Razporeditev" +#: ../extensions/pixbuf_savers/preferences.c:134 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 +msgid "Saving" +msgstr "Shranjevanje" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:18 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:15 -msgid "New enumerator digit" -msgstr "Novo število števca" +msgid "Create a new theme" +msgstr "Ustvari novo temo" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:19 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:18 -msgid "Re_verse order" -msgstr "_Obrnjen vrstni red" +msgid "Edit the selected theme" +msgstr "Uredi izbrano temo" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:20 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 -msgid "S_ort:" -msgstr "_Razvrsti:" +msgid "Delete the selected theme" +msgstr "Izbriši izbrano temo" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:21 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 -#: ../extensions/pixbuf_savers/preferences.c:134 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 -msgid "Saving" -msgstr "Shranjevanje" - -#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:22 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 -#: ../extensions/image_print/data/ui/print-layout.ui.h:17 -#: ../extensions/importer/data/ui/import-preferences.ui.h:2 -#: ../extensions/list_tools/data/ui/script-editor.ui.h:20 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:23 -msgid "Special code" -msgstr "Posebna koda" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 +msgid "Theme" +msgstr "Tema" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:23 -msgid "Sq_uared" -msgstr "K_vadratno" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:16 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 +msgid "Columns:" +msgstr "Stolpci:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:24 -#: ../extensions/image_print/data/ui/print-layout.ui.h:18 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 -msgid "The current date" -msgstr "Trenutni datum" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:10 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 +msgid "Images per page:" +msgstr "Slik na stran:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:25 -#: ../extensions/image_print/data/ui/print-layout.ui.h:19 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:26 -msgid "The current page number" -msgstr "Številka trenutne strani" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:11 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 +msgid "All images on a single page" +msgstr "Vse slike na eni strani" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:26 -#: ../extensions/image_print/data/ui/print-layout.ui.h:22 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 -msgid "The total number of pages" -msgstr "Skupno število strani" +msgid "_All pages with the same size" +msgstr "Vs_e strani enake velikosti" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:27 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 -msgid "Theme" -msgstr "Tema" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:15 +msgid "Layout" +msgstr "Razporeditev" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:28 -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 -msgid "Thumbnails" -msgstr "Sličice" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:13 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:24 +msgid "S_ort:" +msgstr "_Razvrsti:" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:29 -msgid "_All pages with the same size" -msgstr "Vs_e strani enake velikosti" +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:14 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 +msgid "Re_verse order" +msgstr "_Obrnjen vrstni red" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:30 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:15 -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:2 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 -msgid "_Destination:" -msgstr "_Cilj:" +msgid "_Size:" +msgstr "_Velikost:" + +#: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:31 +msgid "Sq_uared" +msgstr "K_vadratno" #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:33 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:16 -msgid "_Size:" -msgstr "_Velikost:" +msgid "Thumbnails" +msgstr "Sličice" -#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:6 +#: ../extensions/contact_sheet/data/ui/image-wall.ui.h:1 msgid "Image Wall" msgstr "Stena slike" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:483 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:495 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:509 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 msgid "Could not save the theme" msgstr "Teme ni mogoče shraniti" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:654 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 msgid "Could not delete the theme" msgstr "Teme ni mogoče izbrisati" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 msgid "Creating images" msgstr "Ustvarjanje slik" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 msgid "Generating thumbnails" msgstr "Ustvarjanje sličic" @@ -1415,15 +1418,15 @@ msgid "Footer" msgstr "Noga" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:197 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 msgid "Theme Properties" msgstr "Lastnosti teme" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:212 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 msgid "Copy _From" msgstr "Kopiraj _iz" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:348 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 msgid "New theme" msgstr "Nova tema" @@ -1443,34 +1446,34 @@ msgid "Save images in a different format" msgstr "Shranjevanje slike v drugem zapisu slikovnih datotek" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +#: ../extensions/convert_format/data/ui/convert-format.ui.h:1 msgid "Convert Format" msgstr "Zapisa slike" +#: ../extensions/convert_format/data/ui/convert-format.ui.h:2 +msgid "New format" +msgstr "Nova vrsta datoteke" + #: ../extensions/convert_format/data/ui/convert-format.ui.h:3 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 msgid "Destination" msgstr "Ciljno mesto" -#: ../extensions/convert_format/data/ui/convert-format.ui.h:4 -msgid "New format" -msgstr "Nova vrsta datoteke" - #: ../extensions/convert_format/data/ui/convert-format.ui.h:5 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 msgid "_Use the original image folder" msgstr "Uporabi _privzeto mapo slik" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/dlg-convert-format.c:93 msgid "Converting images" msgstr "Pretvarjanje slik" -#: ../extensions/desktop_background/actions.c:203 +#: ../extensions/desktop_background/actions.c:162 msgid "Could not show the desktop background properties" msgstr "Lastnosti ozadja namizja ni mogoče pokazati" -#: ../extensions/desktop_background/actions.c:269 -#: ../extensions/desktop_background/actions.c:287 +#: ../extensions/desktop_background/actions.c:228 +#: ../extensions/desktop_background/actions.c:246 msgid "Could not set the desktop background" msgstr "Ozadja namizja ni mogoče nastaviti" @@ -1487,49 +1490,49 @@ msgid "Desktop background" msgstr "Ozadje namizja" -#: ../extensions/edit_metadata/actions.c:129 +#: ../extensions/edit_metadata/actions.c:66 msgid "Are you sure you want to permanently delete the metadata of the selected files?" msgstr "Ali ste prepričani, da želite trajno izbrisati metapodatke izbranih datotek?" -#: ../extensions/edit_metadata/actions.c:136 +#: ../extensions/edit_metadata/actions.c:73 msgid "If you delete the metadata, it will be permanently lost." msgstr "V primeru, da metapodatke izbrišete, bo ti trajno izgubljeni." -#: ../extensions/edit_metadata/callbacks.c:108 +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "Ozn_ake" -#: ../extensions/edit_metadata/callbacks.c:112 +#: ../extensions/edit_metadata/callbacks.c:101 msgid "Edit the comment and other information of the selected files" msgstr "Uredi opombe in druge podatke izbranih datotek" -#: ../extensions/edit_metadata/callbacks.c:117 -msgid "Choose another tag" -msgstr "Izberite drugo oznako" +#: ../extensions/edit_metadata/callbacks.c:107 +msgid "Set the tags of the selected files" +msgstr "Dodeljevanje oznak izbranim datotekam" -#: ../extensions/edit_metadata/callbacks.c:121 +#: ../extensions/edit_metadata/callbacks.c:112 msgid "Delete Metadata" msgstr "Izbriši metapodatke" -#: ../extensions/edit_metadata/callbacks.c:122 +#: ../extensions/edit_metadata/callbacks.c:113 msgid "Delete the comment and the embedded metadata of the selected files" msgstr "Izbriši opombe in druge vstavljene metapodatke izbranih datotek" #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:1 -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:1 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:6 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 msgid "D_escription:" msgstr "Op_is:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:2 +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:3 +msgid "_Place:" +msgstr "_Mesto:" + +#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 #: ../extensions/edit_metadata/data/ui/tag-chooser.ui.h:1 msgid "T_ags:" msgstr "Ozn_ake:" -#: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:4 -msgid "_Place:" -msgstr "_Mesto:" - #: ../extensions/edit_metadata/data/ui/edit-comment-page.ui.h:5 msgid "_Rating:" msgstr "_Ocena:" @@ -1538,73 +1541,81 @@ msgid "_Title:" msgstr "_Naslov:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:63 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "Metapodatkov datoteke ni mogoče shraniti" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:150 -#: ../gthumb/gth-overwrite-dialog.c:166 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "Ni mogoče prebrati podatkov o datoteki" #: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:1 +msgid "Edit metadata" +msgstr "Urejanje metapodatkov" + +#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 msgid "Allow to edit files metadata." msgstr "Dovoli urejanje metapodatkov datotek." -#: ../extensions/edit_metadata/edit_metadata.extension.in.in.h:2 -msgid "Edit metadata" -msgstr "Urejanje metapodatkov" +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "Metapodatki %s" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d datotek" +msgstr[1] "%d datoteka" +msgstr[2] "%d datoteki" +msgstr[3] "%d datoteke" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +msgid "Sa_ve and Close" +msgstr "S_hrani in zapri" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Shrani le spre_menjena polja" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:467 +#: ../extensions/edit_metadata/gth-edit-general-page.c:547 msgid "No date" msgstr "Brez datuma" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:468 +#: ../extensions/edit_metadata/gth-edit-general-page.c:548 msgid "The following date" msgstr "Naslednji datum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:469 -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/edit_metadata/gth-edit-general-page.c:549 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Trenutni datum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:471 +#: ../extensions/edit_metadata/gth-edit-general-page.c:551 msgid "Last modified date" msgstr "Datum zadnje spremembe" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:472 +#: ../extensions/edit_metadata/gth-edit-general-page.c:552 msgid "File creation date" msgstr "Datum ustvaritve datoteke" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:553 msgid "Do not modify" msgstr "Ne spreminjaj" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:105 -msgid "Save only cha_nged fields" -msgstr "Shrani le spre_menjena polja" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:161 -#, c-format -msgid "%s Metadata" -msgstr "Metapodatki %s" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:165 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:332 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 #, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d datotek" -msgstr[1] "%d datoteka" -msgstr[2] "%d datoteki" -msgstr[3] "%d datoteke" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Nova oznaka" +msgid "%s Tags" +msgstr "Oznake %s" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 msgid "Assign Tags" msgstr "Dodeli oznake" @@ -1630,54 +1641,53 @@ msgstr "Primer razširitve." #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:1 -msgid "Byline _Title:" -msgstr "_Naslov vrstice zaslug:" - -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "C_opyright:" msgstr "Avt_orske pravice:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:2 msgid "Co_untry:" msgstr "D_ržava:" +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:3 +msgid "_Code:" +msgstr "Po_štna številka:" + #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:4 msgid "Cr_edit:" msgstr "Za_sluge:" -#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:5 -#| msgid "State/Provence:" -msgid "State/Province:" -msgstr "Regija/Provinca:" - #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:6 -msgid "_Byline:" -msgstr "_Vrstica zaslug:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 +msgid "_Source:" +msgstr "_Vir:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:7 -msgid "_City:" -msgstr "_Mesto:" +msgid "_Urgency:" +msgstr "_Nujnost:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:8 -msgid "_Code:" -msgstr "Po_štna številka:" +msgid "_Object Name:" +msgstr "Ime _predmeta:" + +#: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:9 +msgid "Byline _Title:" +msgstr "_Naslov vrstice zaslug:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:10 -msgid "_Language:" -msgstr "_Jezik:" +msgid "_Byline:" +msgstr "_Vrstica zaslug:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:11 -msgid "_Object Name:" -msgstr "Ime _predmeta:" +msgid "_City:" +msgstr "_Mesto:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:12 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:6 -msgid "_Source:" -msgstr "_Vir:" +msgid "_Language:" +msgstr "_Jezik:" #: ../extensions/exiv2_tools/data/ui/edit-exiv2-page.ui.h:13 -msgid "_Urgency:" -msgstr "_Nujnost:" +msgid "State/Province:" +msgstr "Regija/Provinca:" #: ../extensions/exiv2_tools/exiv2_tools.extension.in.in.h:1 msgid "EXIF, IPTC, XMP support" @@ -1731,11 +1741,11 @@ msgid "XMP Attached" msgstr "Pripet XMP" -#: ../extensions/exiv2_tools/main.c:255 +#: ../extensions/exiv2_tools/main.c:256 msgid "date photo was taken" msgstr "datum zajema fotografije" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" msgstr "Souporaba" @@ -1748,77 +1758,76 @@ msgstr "Pošiljanje fotografij na Facebook" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:1 -msgid "1024 x 1024" -msgstr "1024 x 1024" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 +msgid "Export to Flickr" +msgstr "Izvozi v Flickr" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:2 -msgid "1280 x 1280" -msgstr "1280 x 1280" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 +msgid "_Upload" +msgstr "_Pošlji" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:3 -msgid "1600 x 1600" -msgstr "1600 x 1600" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 +msgid "_Account:" +msgstr "R_ačun:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:4 -msgid "2048 x 2048" -msgstr "2048 x 2048" +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 +msgid "Edit accounts" +msgstr "Urejanje računov" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:5 -msgid "720 x 720" -msgstr "720 x 720" - -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 msgid "A_lbum:" msgstr "A_lbum:" -#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:6 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 msgid "Add a new album" msgstr "Dodaj nov album" +#: ../extensions/facebook/data/ui/export-to-facebook.ui.h:7 +msgid "Resize the images if larger than this size" +msgstr "Prilagodi velikost slike, če je ta večja od navedene velikosti" + #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:8 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 -msgid "Edit accounts" -msgstr "Urejanje računov" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 +msgid "_Resize to:" +msgstr "Sp_remeni velikost v:" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:9 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 -msgid "Export to Flickr" -msgstr "Izvozi v Flickr" +msgid "720 x 720" +msgstr "720 x 720" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:10 -#| msgid "Resize the images if larger then this size" -msgid "Resize the images if larger than this size" -msgstr "Prilagodi velikost slike, če je ta večja od navedene velikosti" +msgid "1024 x 1024" +msgstr "1024 x 1024" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:11 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:13 -msgid "_Account:" -msgstr "R_ačun:" +msgid "1280 x 1280" +msgstr "1280 x 1280" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:12 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:14 -msgid "_Resize to:" -msgstr "Sp_remeni velikost v:" +msgid "1600 x 1600" +msgstr "1600 x 1600" #: ../extensions/facebook/data/ui/export-to-facebook.ui.h:13 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 -msgid "_Upload" -msgstr "_Pošlji" +msgid "2048 x 2048" +msgstr "2048 x 2048" #: ../extensions/facebook/data/ui/facebook-account-chooser.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-account-chooser.ui.h:1 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 #: ../extensions/oauth/data/ui/oauth-account-chooser.ui.h:1 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 #: ../extensions/picasaweb/data/ui/picasa-web-account-chooser.ui.h:1 msgid "A_ccount:" msgstr "Ra_čun:" @@ -1830,27 +1839,23 @@ msgid "A_ccounts:" msgstr "R_ačuni:" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 -msgid "Private" -msgstr "Zasebno" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:1 #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:9 -msgid "Private photos, visible to friends" -msgstr "Zasebne fotografije, vidne prijateljem" - -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:4 -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Public photos" msgstr "Javne fotografije" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 -msgid "_Location:" -msgstr "_Mesto:" +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:2 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 +msgid "Private photos, visible to friends" +msgstr "Zasebne fotografije, vidne prijateljem" -#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:7 +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:3 #: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:5 +msgid "Private" +msgstr "Zasebno" + +#: ../extensions/facebook/data/ui/facebook-album-properties.ui.h:5 +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:2 msgid "_Visibility:" msgstr "_Vidnost:" @@ -1861,18 +1866,18 @@ msgstr "Poo_blasti ..." #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:1 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 +msgid "Once you're done, click the 'Continue' button below." +msgstr "Ko boste končali, kliknite na gumb 'Nadaljuj' spodaj." + +#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 #: ../extensions/flicker_utils/data/ui/flicker-complete-authorization.ui.h:1 #: ../extensions/oauth/data/ui/oauth-complete-authorization.ui.h:1 msgid "C_ontinue" msgstr "_Nadaljuj" -#: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker_utils/flickr-authentication.c:435 -#: ../extensions/oauth/oauth-authentication.c:450 -msgid "Once you're done, click the 'Continue' button below." -msgstr "Ko boste končali, kliknite na gumb 'Nadaljuj' spodaj." - #: ../extensions/facebook/data/ui/facebook-export-completed.ui.h:1 #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:1 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:1 @@ -1884,34 +1889,34 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1851 +#: ../extensions/webalbums/gth-web-exporter.c:1841 msgid "_Open in the Browser" msgstr "_Odpri v brskalniku" -#: ../extensions/facebook/dlg-export-to-facebook.c:128 -#: ../extensions/facebook/dlg-export-to-facebook.c:333 -#: ../extensions/facebook/facebook-authentication.c:219 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:234 -#: ../extensions/flicker_utils/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 #: ../extensions/photobucket/dlg-export-to-photobucket.c:376 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:377 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "Ni se mogoče povezati s strežnikom" -#: ../extensions/facebook/dlg-export-to-facebook.c:180 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 msgid "Could not upload the files" msgstr "Datotek ni mogoče poslati" -#: ../extensions/facebook/dlg-export-to-facebook.c:410 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 #: ../extensions/photobucket/dlg-export-to-photobucket.c:462 @@ -1919,35 +1924,35 @@ msgid "Could not create the album" msgstr "Albuma ni mogoče ustvariti" -#: ../extensions/facebook/dlg-export-to-facebook.c:479 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 #: ../extensions/photobucket/dlg-export-to-photobucket.c:534 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 msgid "New Album" msgstr "Nov album" -#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1816 +#: ../extensions/image_print/gth-image-print-job.c:1789 #: ../extensions/photobucket/dlg-export-to-photobucket.c:614 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 msgid "No valid file selected." msgstr "Nobena veljavna datoteka ni izbrana." -#: ../extensions/facebook/dlg-export-to-facebook.c:559 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 #: ../extensions/photobucket/dlg-export-to-photobucket.c:615 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 msgid "Could not export the files" msgstr "Datotek ni mogoče izvoziti" -#: ../extensions/facebook/dlg-export-to-facebook.c:567 -#: ../extensions/find_duplicates/gth-find-duplicates.c:284 -#: ../extensions/find_duplicates/gth-find-duplicates.c:376 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:255 +#: ../extensions/find_duplicates/gth-find-duplicates.c:347 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 #: ../extensions/photobucket/dlg-export-to-photobucket.c:623 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:800 -#: ../gthumb/gth-browser.c:990 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:1005 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" @@ -1956,71 +1961,71 @@ msgstr[2] "%d datoteki (%s)" msgstr[3] "%d datoteke (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:589 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:590 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:643 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 #, c-format msgid "Export to %s" msgstr "Izvozi v %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:229 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:229 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:229 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "Nova overitev ..." -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker_utils/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." msgstr "Izberi _račun ..." -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker_utils/flickr-authentication.c:434 -#: ../extensions/oauth/oauth-authentication.c:449 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 #, c-format msgid "Return to this window when you have finished the authorization process on %s" msgstr "Vrnite se v to okno, ko boste končali opravilo pooblastitve na %s" -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker_utils/flickr-authentication.c:514 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" msgstr "gthumb zahteva vašo pooblastitev za pošiljanje fotografij na %s" -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker_utils/flickr-authentication.c:515 -#: ../extensions/oauth/oauth-authentication.c:530 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 #, c-format msgid "Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization." msgstr "Kliknite 'Pooblasti' za odprtje spletnega brskalnika in pooblastite gthumb za pošiljanje fotografij na %s. Ko boste končali, se vrnite v to okno za dokončanje pooblastitve." -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker_utils/flickr-authentication.c:615 -#: ../extensions/oauth/oauth-authentication.c:632 +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:681 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Izbor računa" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker_utils/flickr-authentication.c:724 -#: ../extensions/oauth/oauth-authentication.c:741 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:742 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Urejanje računov" -#: ../extensions/facebook/facebook-connection.c:304 -#: ../extensions/facebook/facebook-connection.c:464 -#: ../extensions/facebook/facebook-service.c:191 -#: ../extensions/facebook/facebook-service.c:294 -#: ../extensions/facebook/facebook-service.c:497 -#: ../extensions/flicker_utils/flickr-connection.c:295 -#: ../extensions/flicker_utils/flickr-connection.c:442 -#: ../extensions/flicker_utils/flickr-service.c:224 -#: ../extensions/flicker_utils/flickr-service.c:427 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:195 +#: ../extensions/flicker_utils/flickr-service.c:398 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2028,17 +2033,17 @@ msgid "Unknown error" msgstr "Neznana napaka" -#: ../extensions/facebook/facebook-connection.c:339 -#: ../extensions/facebook/facebook-connection.c:490 -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-connection.c:321 -#: ../extensions/flicker_utils/flickr-connection.c:468 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 -#: ../extensions/picasaweb/google-connection.c:373 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" msgstr "Povezovanje s strežnikom" @@ -2050,125 +2055,125 @@ msgid "Upload images to Facebook" msgstr "Pošiljanje fotografij na Facebook" -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "Pridobivanje podrobnosti računa" -#: ../extensions/facebook/facebook-service.c:425 -#: ../extensions/flicker_utils/flickr-service.c:352 -#: ../extensions/photobucket/photobucket-service.c:236 -#: ../extensions/picasaweb/picasa-web-service.c:238 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:209 msgid "Getting the album list" msgstr "Pridobivanje seznama albumov" -#: ../extensions/facebook/facebook-service.c:554 -#: ../extensions/flicker_utils/flickr-service.c:455 -#: ../extensions/flicker_utils/flickr-service.c:575 -#: ../extensions/flicker_utils/flickr-service.c:613 -#: ../extensions/photobucket/photobucket-service.c:345 -#: ../extensions/picasaweb/picasa-web-service.c:329 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:426 +#: ../extensions/flicker_utils/flickr-service.c:546 +#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:300 msgid "Creating the new album" msgstr "Ustvarjanje novega albuma" -#: ../extensions/facebook/facebook-service.c:613 -#: ../extensions/flicker_utils/flickr-service.c:663 -#: ../extensions/photobucket/photobucket-service.c:402 -#: ../extensions/picasaweb/picasa-web-service.c:386 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:357 #, c-format msgid "Could not upload '%s': %s" msgstr "Ni mogoče poslati '%s': %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:699 -#: ../extensions/flicker_utils/flickr-service.c:774 -#: ../extensions/photobucket/photobucket-service.c:459 -#: ../extensions/picasaweb/picasa-web-service.c:441 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:412 #, c-format msgid "Uploading '%s'" msgstr "Pošiljanje '%s'" -#: ../extensions/facebook/facebook-service.c:915 -#: ../extensions/flicker_utils/flickr-service.c:943 -#: ../extensions/photobucket/photobucket-service.c:628 -#: ../extensions/picasaweb/picasa-web-service.c:634 +#: ../extensions/facebook/facebook-service.c:886 +#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:605 msgid "Uploading the files to the server" msgstr "Pošiljanje datotek na strežnik" -#: ../extensions/facebook/facebook-service.c:1032 -#: ../extensions/flicker_utils/flickr-service.c:1106 -#: ../extensions/picasaweb/picasa-web-service.c:747 +#: ../extensions/facebook/facebook-service.c:1003 +#: ../extensions/flicker_utils/flickr-service.c:1077 +#: ../extensions/picasaweb/picasa-web-service.c:718 msgid "Getting the photo list" msgstr "Pridobivanje seznama fotografij" -#: ../extensions/file_manager/actions.c:130 +#: ../extensions/file_manager/actions.c:133 msgid "New folder" msgstr "Nova mapa" -#: ../extensions/file_manager/actions.c:131 +#: ../extensions/file_manager/actions.c:134 msgid "Enter the folder name:" msgstr "Ime mape:" -#: ../extensions/file_manager/actions.c:397 +#: ../extensions/file_manager/actions.c:400 #: ../extensions/file_manager/callbacks.c:380 -#: ../extensions/file_manager/callbacks.c:847 +#: ../extensions/file_manager/callbacks.c:842 msgid "Could not move the files" msgstr "Datotek ni mogoče premakniti" -#: ../extensions/file_manager/actions.c:398 +#: ../extensions/file_manager/actions.c:401 #: ../extensions/file_manager/callbacks.c:381 -#: ../extensions/file_manager/callbacks.c:848 +#: ../extensions/file_manager/callbacks.c:843 msgid "Files cannot be moved to the current location, as alternative you can choose to copy them." msgstr "Datotek ni mogoče premakniti na trenutno mesto, lahko pa jih poskusite kopirati." -#: ../extensions/file_manager/actions.c:555 +#: ../extensions/file_manager/actions.c:563 msgid "Could not open the location" msgstr "Mesta ni mogoče odpreti" -#: ../extensions/file_manager/actions.c:688 +#: ../extensions/file_manager/actions.c:696 msgid "The folder is not empty, do you want to delete the folder and its content permanently?" msgstr "Mapa ni prazna, ali želite mapo in njeno vsebino trajno izbrisati?" -#: ../extensions/file_manager/actions.c:704 +#: ../extensions/file_manager/actions.c:712 msgid "Could not delete the folder" msgstr "Mape ni mogoče izbrisati" -#: ../extensions/file_manager/actions.c:765 +#: ../extensions/file_manager/actions.c:773 msgid "The folder cannot be moved to the Trash. Do you want to delete it permanently?" msgstr "Mape ni mogoče premakniti v smeti. Ali jo želite trajno izbrisati?" -#: ../extensions/file_manager/actions.c:772 +#: ../extensions/file_manager/actions.c:780 msgid "Could not move the folder to the Trash" msgstr "Datoteke ni mogoče premakniti v smeti" -#: ../extensions/file_manager/actions.c:808 -#: ../gthumb/gth-file-source-vfs.c:826 +#: ../extensions/file_manager/actions.c:816 +#: ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" msgstr "Ali ste prepričani, da želite trajno izbrisati \"%s\"?" -#: ../extensions/file_manager/actions.c:818 -#: ../gthumb/gth-file-source-vfs.c:839 +#: ../extensions/file_manager/actions.c:826 +#: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "V primeru da izbrišete datoteko, bo trajno izgubljena." -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Move To" msgstr "Premakni v" -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:920 msgid "Copy To" msgstr "Kopiraj v" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Move" msgstr "Premakni" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:924 msgid "Copy" msgstr "Kopiraj" @@ -2192,7 +2197,7 @@ #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 -#: ../gthumb/gth-file-source-vfs.c:800 +#: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" msgstr "Pr_emakni v smeti" @@ -2212,7 +2217,7 @@ #: ../extensions/file_manager/callbacks.c:191 #: ../extensions/file_manager/callbacks.c:203 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:2 msgid "_Rename" msgstr "_Preimenuj" @@ -2254,10 +2259,10 @@ msgid "Move the selected files to another folder" msgstr "Premakni izbrane datoteke v drugo mapo" -#: ../extensions/file_manager/callbacks.c:1009 -#: ../extensions/find_duplicates/gth-find-duplicates.c:610 -#: ../gthumb/gth-browser.c:4945 -#: ../gthumb/gth-browser.c:4979 +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:581 +#: ../gthumb/gth-browser.c:4939 +#: ../gthumb/gth-browser.c:4973 msgid "Could not perform the operation" msgstr "Ni mogoče izvesti opravila" @@ -2274,451 +2279,451 @@ msgstr "Brisanje datotek" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:1 -msgid "B_rightness:" -msgstr "_Svetlost:" +msgid "_Preview" +msgstr "_Predogled" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:2 -msgid "Color Levels" -msgstr "Barvne ravni" +msgid "B_rightness:" +msgstr "_Svetlost:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:3 msgid "Con_trast:" msgstr "_Kontrast:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:4 -msgid "Cyan-_Red:" -msgstr "_Sinje-rdeča:" +msgid "_Saturation:" +msgstr "_Nasičenost:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:5 msgid "G_amma:" msgstr "_Gama:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:6 -msgid "_Magenta-Green:" -msgstr "_Škrlatno-zelena:" +msgid "Cyan-_Red:" +msgstr "_Sinje-rdeča:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:7 -msgid "_Preview" -msgstr "_Predogled" +msgid "_Magenta-Green:" +msgstr "_Škrlatno-zelena:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:8 -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 -msgid "_Reset" -msgstr "P_onastavi" +msgid "_Yellow-Blue:" +msgstr "_Rumeno-Modra:" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:9 -msgid "_Saturation:" -msgstr "_Nasičenost:" +msgid "Color Levels" +msgstr "Barvne ravni" #: ../extensions/file_tools/data/ui/adjust-colors-options.ui.h:10 -msgid "_Yellow-Blue:" -msgstr "_Rumeno-Modra:" - -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:5 +msgid "_Reset" +msgstr "P_onastavi" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 -msgid "Aspect ratio" -msgstr "Razmerje velikosti" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 +msgid "_Position:" +msgstr "_Položaj:" +#. this is used to separate the dimensions, for example: 120 × 250 #: ../extensions/file_tools/data/ui/crop-options.ui.h:4 -msgid "C_rop" -msgstr "_Obreži" +msgid "×" +msgstr "×" #: ../extensions/file_tools/data/ui/crop-options.ui.h:5 -msgid "Center" -msgstr "Sredinsko" +msgid "_Grid:" +msgstr "_Mreža:" #: ../extensions/file_tools/data/ui/crop-options.ui.h:6 -#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 -msgid "I_nvert aspect ratio" -msgstr "_Obrni razmerje velikosti" - -#. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 -msgid "M_ultiple of:" -msgstr "Ve_čkratnik števila:" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 msgid "Maximize" msgstr "Razpni" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 +msgid "Center" +msgstr "Sredinsko" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 msgid "Selection" msgstr "Izbira" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 -msgid "_Grid:" -msgstr "_Mreža:" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 +msgid "I_nvert aspect ratio" +msgstr "_Obrni razmerje velikosti" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 -msgid "_Position:" -msgstr "_Položaj:" +#. after the colon there is a control to select the size in pixels +#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +msgid "M_ultiple of:" +msgstr "Ve_čkratnik števila:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 msgid "px" msgstr "točk" +#: ../extensions/file_tools/data/ui/crop-options.ui.h:14 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +msgid "Aspect ratio" +msgstr "Razmerje velikosti" + +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "C_rop" +msgstr "_Obreži" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:1 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:3 +msgid "_Width:" +msgstr "_Širina:" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:2 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 -#, no-c-format -msgid "%" -msgstr "%" +msgid "Heigh_t:" +msgstr "_Višina:" + +#: ../extensions/file_tools/data/ui/resize-options.ui.h:3 +msgid "Set the image size to this value" +msgstr "Nastavi velikost slike na to vrednost" #: ../extensions/file_tools/data/ui/resize-options.ui.h:4 #: ../gthumb/gth-main-default-metadata.c:47 msgid "Dimensions" msgstr "Mere" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:5 -msgid "Heigh_t:" -msgstr "_Višina:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:6 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:7 msgid "High _quality" msgstr "Visoka _kakovost" #: ../extensions/file_tools/data/ui/resize-options.ui.h:8 -msgid "New dimensions:" -msgstr "Nove mere:" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 #: ../extensions/file_tools/data/ui/rotate-options.ui.h:11 msgid "Options" msgstr "Možnosti" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:9 msgid "Original dimensions:" msgstr "Izvorne mere:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:10 msgid "Scale factor:" msgstr "Faktor merila:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 -msgid "Set the image size to this value" -msgstr "Nastavi velikost slike na to vrednost" - -#: ../extensions/file_tools/data/ui/resize-options.ui.h:13 -#: ../extensions/resize_images/data/ui/resize-images.ui.h:11 -msgid "_Width:" -msgstr "_Širina:" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:11 +msgid "New dimensions:" +msgstr "Nove mere:" -#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 -#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +#: ../extensions/file_tools/data/ui/resize-options.ui.h:12 +#: ../extensions/image_print/data/ui/print-layout.ui.h:29 msgid "pixels" msgstr "točke" +#: ../extensions/file_tools/data/ui/resize-options.ui.h:14 +#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 +#, no-c-format +msgid "%" +msgstr "%" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:1 msgid "Align" msgstr "Poravnaj" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:2 -msgid "Alignment" -msgstr "Poravnava" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 msgid "Angle" msgstr "Kot" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:3 +msgid "Point 1:" +msgstr "Točka 1:" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:4 -msgid "Bounding box" -msgstr "Obsegajoči okvir" +msgid "Point 2:" +msgstr "Točka 2:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:5 -msgid "Crop borders" -msgstr "Obreži robove" +msgid "Keep aspect ratio" +msgstr "Ohrani razmerje velikosti" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:6 -msgid "" -"Draw a line on the image \n" -"to set the alignment." -msgstr "" -"Nariši črto na sliki za\n" -"določanje poravnave." +msgid "Image size" +msgstr "Velikost slike" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:7 msgid "Grid:" msgstr "Mreža:" +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:8 +msgid "Pick a background color" +msgstr "Izbor barve ozadja" + #: ../extensions/file_tools/data/ui/rotate-options.ui.h:9 -msgid "Image size" -msgstr "Velikost slike" +msgid "_Transparent" +msgstr "_Prosojno" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:10 -msgid "Keep aspect ratio" -msgstr "Ohrani razmerje velikosti" +msgid "_Background:" +msgstr "_Ozadje:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:12 -msgid "Original size" -msgstr "Izvorna velikost" +msgid "Reset" +msgstr "Ponastavi" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:13 +msgid "" +"Draw a line on the image \n" +"to set the alignment." +msgstr "" +"Nariši črto na sliki za\n" +"določanje poravnave." + +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 msgid "Parallel" msgstr "Vzporedno" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:14 +#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 msgid "Perpendicular" msgstr "Pravokotno" -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:15 -msgid "Pick a background color" -msgstr "Izbor barve ozadja" - -#: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 -msgid "Point 1:" -msgstr "Točka 1:" - #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 -msgid "Point 2:" -msgstr "Točka 2:" +msgid "Alignment" +msgstr "Poravnava" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 -msgid "Reset" -msgstr "Ponastavi" +msgid "Original size" +msgstr "Izvorna velikost" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:19 -msgid "_Background:" -msgstr "_Ozadje:" +msgid "Bounding box" +msgstr "Obsegajoči okvir" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:20 -msgid "_Transparent" -msgstr "_Prosojno" +msgid "Crop borders" +msgstr "Obreži robove" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:1 -msgid "Amount:" -msgstr "Količina:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 +msgid "_Preview:" +msgstr "_Predogled:" #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:2 -msgid "Radius:" -msgstr "Radij:" - -#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 msgid "Threshold:" msgstr "Prag:" +#: ../extensions/file_tools/data/ui/sharpen-options.ui.h:3 +msgid "Radius:" +msgstr "Radij:" + #: ../extensions/file_tools/data/ui/sharpen-options.ui.h:4 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 -msgid "_Preview:" -msgstr "_Predogled:" +msgid "Amount:" +msgstr "Količina:" #: ../extensions/file_tools/file_tools.extension.in.in.h:1 -msgid "Basic tools to modify images." -msgstr "Osnovna orodja za spreminjanje slik." - -#: ../extensions/file_tools/file_tools.extension.in.in.h:2 msgid "Image tools" msgstr "Slikovna orodja" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/file_tools.extension.in.in.h:2 +msgid "Basic tools to modify images." +msgstr "Osnovna orodja za spreminjanje slik." + +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors..." msgstr "Prilagodi barve ..." -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:527 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:530 msgid "Adjust Colors" msgstr "Prilagajanje barv" -#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:528 +#: ../extensions/file_tools/gth-file-tool-adjust-colors.c:531 msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Spremeni svetlost, kontrast, nasičenje in gama raven slike" -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 msgid "Square" msgstr "Kvadrat" -#: ../extensions/file_tools/gth-file-tool-crop.c:423 -#: ../extensions/file_tools/gth-file-tool-resize.c:494 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:499 #, c-format msgid "%d x %d (Image)" msgstr "%d x %d (slika)" -#: ../extensions/file_tools/gth-file-tool-crop.c:426 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:503 #, c-format msgid "%d x %d (Screen)" msgstr "%d x %d (zaslon)" -#: ../extensions/file_tools/gth-file-tool-crop.c:430 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:508 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:431 -#: ../extensions/file_tools/gth-file-tool-resize.c:504 +#: ../extensions/file_tools/gth-file-tool-crop.c:433 +#: ../extensions/file_tools/gth-file-tool-resize.c:509 msgid "4:3 (DVD, Book)" msgstr "4:3 (knjiga, DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:505 +#: ../extensions/file_tools/gth-file-tool-crop.c:434 +#: ../extensions/file_tools/gth-file-tool-resize.c:510 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:506 +#: ../extensions/file_tools/gth-file-tool-crop.c:435 +#: ../extensions/file_tools/gth-file-tool-resize.c:511 msgid "3:2 (Postcard)" msgstr "3:2 (Razglednica)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:507 +#: ../extensions/file_tools/gth-file-tool-crop.c:436 +#: ../extensions/file_tools/gth-file-tool-resize.c:512 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:437 +#: ../extensions/file_tools/gth-file-tool-resize.c:513 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:438 +#: ../extensions/file_tools/gth-file-tool-resize.c:514 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:439 +#: ../extensions/file_tools/gth-file-tool-resize.c:515 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 -#: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/rename_series/gth-template-selector.c:260 +#: ../extensions/file_tools/gth-file-tool-crop.c:440 +#: ../extensions/file_tools/gth-file-tool-resize.c:516 +#: ../extensions/image_print/data/ui/print-layout.ui.h:2 +#: ../extensions/rename_series/gth-template-selector.c:234 msgid "Custom" msgstr "Po meri" -#: ../extensions/file_tools/gth-file-tool-crop.c:449 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:455 +#: ../extensions/file_tools/gth-file-tool-rotate.c:416 msgid "Rule of Thirds" msgstr "Pravilo tretjin" -#: ../extensions/file_tools/gth-file-tool-crop.c:450 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:456 +#: ../extensions/file_tools/gth-file-tool-rotate.c:417 msgid "Golden Sections" msgstr "Zlati rezi" -#: ../extensions/file_tools/gth-file-tool-crop.c:451 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:457 +#: ../extensions/file_tools/gth-file-tool-rotate.c:418 msgid "Center Lines" msgstr "Sredinske črte" -#: ../extensions/file_tools/gth-file-tool-crop.c:452 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:458 +#: ../extensions/file_tools/gth-file-tool-rotate.c:419 msgid "Uniform" msgstr "Enotno" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop..." msgstr "Obreži ..." -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop" msgstr "Obreži" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:65 -#: ../extensions/file_tools/gth-file-tool-negative.c:65 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 msgid "Applying changes" msgstr "Uveljavljanje sprememb" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:189 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 msgid "Desaturate" msgstr "Zmanjšaj nasičenje" -#: ../extensions/file_tools/gth-file-tool-enhance.c:116 +#: ../extensions/file_tools/gth-file-tool-enhance.c:119 msgid "White balance correction" msgstr "Popravljanje ravnotežja bele barve" -#: ../extensions/file_tools/gth-file-tool-enhance.c:339 +#: ../extensions/file_tools/gth-file-tool-enhance.c:342 msgid "Enhance Colors" msgstr "Izboljšaj barve" -#: ../extensions/file_tools/gth-file-tool-enhance.c:340 +#: ../extensions/file_tools/gth-file-tool-enhance.c:343 msgid "Automatic white balance correction" msgstr "Samodejno popravi ravnotežje bele barve" -#: ../extensions/file_tools/gth-file-tool-equalize.c:83 +#: ../extensions/file_tools/gth-file-tool-equalize.c:86 msgid "Equalizing image histogram" msgstr "Uravnavanje histograma slike" -#: ../extensions/file_tools/gth-file-tool-equalize.c:261 +#: ../extensions/file_tools/gth-file-tool-equalize.c:275 msgid "Equalize" msgstr "Uravnavanje" -#: ../extensions/file_tools/gth-file-tool-equalize.c:262 +#: ../extensions/file_tools/gth-file-tool-equalize.c:276 msgid "Equalize image histogram" msgstr "Uravna histogram slike" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Obrni" -#: ../extensions/file_tools/gth-file-tool-flip.c:74 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 msgid "Flip the image vertically" msgstr "Zrcali sliko navpično" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Zrcaljenje" -#: ../extensions/file_tools/gth-file-tool-mirror.c:74 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 msgid "Mirror the image horizontally" msgstr "Zrcali sliko vodoravno" -#: ../extensions/file_tools/gth-file-tool-negative.c:183 +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Negativ" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Uveljavi" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize..." msgstr "Spremeni velikost ..." -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize" msgstr "Spremeni velikost" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate..." msgstr "Zavrti ..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate" msgstr "Zavrti" -#: ../extensions/file_tools/gth-file-tool-rotate.c:597 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Freely rotate the image" msgstr "Prosto zavrti sliko" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Zavrti levo" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 msgid "Rotate the image by 90 degrees counterclockwise" msgstr "Zavrti sliko za 90 stopinj v levo" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Zavrti desno" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 msgid "Rotate the image by 90 degrees clockwise" msgstr "Zavrti sliko za 90 stopinj v desno" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Shrani kot" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Shrani" @@ -2726,15 +2731,15 @@ msgid "Sharpening image" msgstr "Ostrenje slike" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus..." msgstr "Izboljšaj žarišče ..." -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus" msgstr "Izboljšaj žarišče" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Razveljavi" @@ -2751,38 +2756,38 @@ msgstr "_Mape:" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:1 +msgid "Search for Duplicates" +msgstr "Iskanje dvojnikov" + +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 msgid "Duplicates:" msgstr "Podvojene:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:2 +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 msgid "Files:" msgstr "Datoteke:" -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:3 -msgid "No duplicates found." -msgstr "Ni najdenih dvojnikov" - #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:4 -msgid "Search for Duplicates" -msgstr "Iskanje dvojnikov" - -#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 -#: ../gthumb/gth-browser-actions-entries.h:32 +#: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "_Pogled" +#: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 +msgid "No duplicates found." +msgstr "Ni najdenih dvojnikov" + #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:1 #: ../extensions/find_duplicates/find_duplicates.extension.in.in.h:1 msgid "Find Duplicates" msgstr "Najdi podvojene" #: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:2 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 #: ../extensions/search/data/ui/search-editor.ui.h:1 msgid "Start _at:" msgstr "Začni p_ri:" -#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:3 +#: ../extensions/find_duplicates/data/ui/find-duplicates.ui.h:4 msgid "_Filter:" msgstr "_Filter:" @@ -2810,8 +2815,8 @@ msgid "no file" msgstr "brez datotek" -#: ../extensions/find_duplicates/gth-find-duplicates.c:426 -#: ../extensions/find_duplicates/gth-find-duplicates.c:521 +#: ../extensions/find_duplicates/gth-find-duplicates.c:397 +#: ../extensions/find_duplicates/gth-find-duplicates.c:492 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" @@ -2820,15 +2825,15 @@ msgstr[2] "%d dvojnika" msgstr[3] "%d dvojniki" -#: ../extensions/find_duplicates/gth-find-duplicates.c:565 +#: ../extensions/find_duplicates/gth-find-duplicates.c:536 msgid "Search completed" msgstr "Iskanje je končano" -#: ../extensions/find_duplicates/gth-find-duplicates.c:577 +#: ../extensions/find_duplicates/gth-find-duplicates.c:548 msgid "Searching for duplicates" msgstr "Iskanje podvojenih datotek" -#: ../extensions/find_duplicates/gth-find-duplicates.c:580 +#: ../extensions/find_duplicates/gth-find-duplicates.c:551 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2839,20 +2844,20 @@ msgstr[2] "%d preostali datoteki" msgstr[3] "%d preostale datoteke" -#: ../extensions/find_duplicates/gth-find-duplicates.c:663 +#: ../extensions/find_duplicates/gth-find-duplicates.c:634 msgid "Getting the file list" msgstr "Pridobivanje seznama datotek" -#: ../extensions/find_duplicates/gth-find-duplicates.c:769 +#: ../extensions/find_duplicates/gth-find-duplicates.c:740 msgid "Duplicates" msgstr "Podvojeno" -#: ../extensions/find_duplicates/gth-find-duplicates.c:1023 +#: ../extensions/find_duplicates/gth-find-duplicates.c:997 msgid "Select" msgstr "Izberi" #: ../extensions/flicker/callbacks.c:59 -#: ../extensions/flicker/callbacks.c:63 +#: ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr ..." @@ -2860,7 +2865,7 @@ msgid "Download photos from Flickr" msgstr "Prejemanje fotografij s Flickr" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "Pošiljanje fotografij na Flickr" @@ -2872,135 +2877,128 @@ msgid "Upload images to Flickr" msgstr "Pošiljanje slik na Flickr" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:2 -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:8 -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:3 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 msgid "Free space:" msgstr "Neporabljen prostor:" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:3 -msgid "Hi_de from public searches" -msgstr "Sk_rij iz javnih iskanj" - -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:4 -msgid "Moderate content" -msgstr "Srednja vsebina" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:5 -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:3 +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:4 msgid "Ph_otoset:" msgstr "Niz _Fotografij:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:6 -msgid "Private photos" -msgstr "Zasebne fotografije" +msgid "_Privacy:" +msgstr "_Zasebnost:" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:7 -msgid "Private photos, visible to family" -msgstr "Zasebne fotografije, vidne družini" +msgid "Hi_de from public searches" +msgstr "Sk_rij iz javnih iskanj" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:8 +msgid "_Safety:" +msgstr "_Varnost:" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:10 msgid "Private photos, visible to family and friends" msgstr "Zasebne fotografije, vidne družini in prijateljem" -#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:11 -msgid "Restricted content" -msgstr "Omejena vsebina" - #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:12 -msgid "Safe content" -msgstr "Varna vsebina" +msgid "Private photos, visible to family" +msgstr "Zasebne fotografije, vidne družini" + +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:13 +msgid "Private photos" +msgstr "Zasebne fotografije" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:14 -msgid "_Privacy:" -msgstr "_Zasebnost:" +msgid "Safe content" +msgstr "Varna vsebina" #: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:15 -msgid "_Safety:" -msgstr "_Varnost:" +msgid "Moderate content" +msgstr "Srednja vsebina" -#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:5 -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:6 +#: ../extensions/flicker_utils/data/ui/export-to-flickr.ui.h:16 +msgid "Restricted content" +msgstr "Omejena vsebina" + +#: ../extensions/flicker_utils/data/ui/import-from-flickr.ui.h:1 +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:2 msgid "_Import" msgstr "_Uvoz " -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:357 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:827 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "Ni mogoče dobiti seznama fotografij" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:394 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:559 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:861 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1024 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 msgid "No album selected" msgstr "Noben album ni izbran" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:577 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 #, c-format msgid "Import from %s" msgstr "Uvozi iz %s" -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1118 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 #: ../gthumb/gth-browser.c:2008 msgid "Could not save the file" msgstr "Ni mogoče shraniti datoteke" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "Ni mogoče zajeti zaslonske slike" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1266 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 msgid "Save Image" msgstr "Shrani sliko" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Zaslonska slika" -#. this is an empty time +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 +msgid "Slower" +msgstr "Počasneje" + #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 -msgid "--:--" -msgstr "--:--" +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 +msgid "Play" +msgstr "Predvajaj" #: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 -msgid "Change volume level" -msgstr "Spremeni raven glasnosti" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Faster" msgstr "Hitreje" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:656 -msgid "Play" -msgstr "Predvajaj" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 -msgid "Slower" -msgstr "Počasneje" - -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 msgid "Time:" msgstr "Čas:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 +msgid "--:--" +msgstr "--:--" + +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Toggle volume" msgstr "Preklopi glasnost" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 -msgctxt "time" -msgid "/" -msgstr "/" +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +msgid "Change volume level" +msgstr "Spremeni raven glasnosti" -#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 +#: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:3 #: ../extensions/photo_importer/actions.c:67 -#: ../extensions/photo_importer/dlg-photo-importer.c:614 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Izbor mape" @@ -3012,29 +3010,29 @@ msgid "Play audio and video files." msgstr "Predvajanje zvočnih in video datotek." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:93 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Zaslonska slika" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:94 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Zajemi zaslonsko sliko" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:633 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 msgid "Playing video" msgstr "Predvajanje video datotek" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:646 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Pause" msgstr "Premor" #: ../extensions/gstreamer_tools/main.c:31 -#: ../gthumb/gth-main-default-tests.c:211 +#: ../gthumb/gth-main-default-tests.c:247 msgid "Video" msgstr "Video" #: ../extensions/gstreamer_tools/main.c:32 -#: ../gthumb/gth-main-default-tests.c:218 +#: ../gthumb/gth-main-default-tests.c:254 msgid "Audio" msgstr "Zvok" @@ -3043,7 +3041,7 @@ msgstr "Izvajalec" #: ../extensions/gstreamer_tools/main.c:40 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:7 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:16 msgid "Album" msgstr "Album" @@ -3065,13 +3063,13 @@ msgstr "Hitrost sličic" #: ../extensions/gstreamer_tools/main.c:46 -#: ../extensions/image_print/data/ui/print-layout.ui.h:25 -#: ../extensions/image_viewer/gth-image-viewer-page.c:222 +#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Širina" #: ../extensions/gstreamer_tools/main.c:47 -#: ../extensions/image_print/data/ui/print-layout.ui.h:9 +#: ../extensions/image_print/data/ui/print-layout.ui.h:25 msgid "Height" msgstr "Višina" @@ -3093,10 +3091,10 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1318 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 #: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:429 -#: ../extensions/webalbums/gth-web-exporter.c:2456 +#: ../extensions/webalbums/dlg-web-exporter.c:442 +#: ../extensions/webalbums/gth-web-exporter.c:2446 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3109,95 +3107,95 @@ msgid "Print the selected images" msgstr "Natisni izbrane slike" -#: ../extensions/image_print/data/ui/print-layout.ui.h:5 +#: ../extensions/image_print/data/ui/print-layout.ui.h:1 msgid "Centered" msgstr "Sredinjeno" -#: ../extensions/image_print/data/ui/print-layout.ui.h:10 -msgid "Image" -msgstr "Slika" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:12 -msgid "Left" -msgstr "Levo" - #: ../extensions/image_print/data/ui/print-layout.ui.h:13 -msgid "Position:" -msgstr "Položaj:" +msgid "The total number of files" +msgstr "Skupno število datotek" #: ../extensions/image_print/data/ui/print-layout.ui.h:14 -msgid "Preview" -msgstr "Predogled" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:15 -msgid "Rotation:" -msgstr "Vrtenje:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:20 #: ../extensions/importer/data/ui/import-preferences.ui.h:4 msgid "The event description" msgstr "Opis dogodka" +#: ../extensions/image_print/data/ui/print-layout.ui.h:17 +msgid "_Rows:" +msgstr "V_rstice:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:19 +msgid "Image" +msgstr "Slika" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:20 +msgid "Position:" +msgstr "Položaj:" + #: ../extensions/image_print/data/ui/print-layout.ui.h:21 -msgid "The total number of files" -msgstr "Skupno število datotek" +msgid "Left" +msgstr "Levo" -#: ../extensions/image_print/data/ui/print-layout.ui.h:23 +#: ../extensions/image_print/data/ui/print-layout.ui.h:22 msgid "Top" msgstr "Na vrhu" -#: ../extensions/image_print/data/ui/print-layout.ui.h:24 +#: ../extensions/image_print/data/ui/print-layout.ui.h:26 +msgid "Rotation:" +msgstr "Vrtenje:" + +#: ../extensions/image_print/data/ui/print-layout.ui.h:27 msgid "Unit:" msgstr "Enota:" #: ../extensions/image_print/data/ui/print-layout.ui.h:28 -msgid "_Rows:" -msgstr "V_rstice:" - -#: ../extensions/image_print/data/ui/print-layout.ui.h:29 -msgid "inches" -msgstr "palci" +msgid "Preview" +msgstr "Predogled" #: ../extensions/image_print/data/ui/print-layout.ui.h:30 msgid "millimeters" msgstr "milimetri" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:2 -msgid "Fonts" -msgstr "Pisave" +#: ../extensions/image_print/data/ui/print-layout.ui.h:31 +msgid "inches" +msgstr "palci" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:3 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 msgid "Select Caption Font" msgstr "Izbor pisave naslova" -#: ../extensions/image_print/data/ui/print-preferences.ui.h:4 -msgid "Select Footer Font" -msgstr "Izbor pisave noge" - #: ../extensions/image_print/data/ui/print-preferences.ui.h:5 msgid "Select Header Font" msgstr "Izbor pisave glave" -#: ../extensions/image_print/gth-image-print-job.c:997 +#: ../extensions/image_print/data/ui/print-preferences.ui.h:6 +msgid "Select Footer Font" +msgstr "Izbor pisave noge" + +#: ../extensions/image_print/data/ui/print-preferences.ui.h:7 +msgid "Fonts" +msgstr "Pisave" + +#: ../extensions/image_print/gth-image-print-job.c:971 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Stran %d od %d" -#: ../extensions/image_print/gth-image-print-job.c:1761 -#: ../extensions/image_print/gth-image-print-job.c:1888 -#: ../extensions/image_print/gth-image-print-job.c:1925 +#: ../extensions/image_print/gth-image-print-job.c:1734 +#: ../extensions/image_print/gth-image-print-job.c:1861 +#: ../extensions/image_print/gth-image-print-job.c:1898 msgid "Could not print" msgstr "Ni mogoče natisniti" -#: ../extensions/image_print/gth-image-print-job.c:1823 -#: ../gthumb/gth-main-default-tests.c:204 +#: ../extensions/image_print/gth-image-print-job.c:1796 +#: ../gthumb/gth-main-default-tests.c:240 msgid "Images" msgstr "Slike" -#: ../extensions/image_print/gth-image-print-job.c:1890 -#: ../gthumb/gth-image-loader.c:233 -#: ../gthumb/gth-image-loader.c:306 +#: ../extensions/image_print/gth-image-print-job.c:1863 +#: ../gthumb/gth-image-loader.c:204 +#: ../gthumb/gth-image-loader.c:278 msgid "No suitable loader available for this file type" msgstr "Za to vrsto datotek ni primernega nalagalnika" @@ -3208,19 +3206,19 @@ msgstr "Nalaganje \"%s\"" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2695 +#: ../extensions/webalbums/gth-web-exporter.c:2685 msgid "Loading images" msgstr "Nalaganje slik" #: ../extensions/image_print/image_print.extension.in.in.h:1 -msgid "Allow to print images choosing the page layout." -msgstr "Dovoli tisk slik z izbiro postavitve strani." - -#: ../extensions/image_print/image_print.extension.in.in.h:2 msgid "Image print" msgstr "Natisni sliko" -#: ../extensions/image_print/preferences.c:76 +#: ../extensions/image_print/image_print.extension.in.in.h:2 +msgid "Allow to print images choosing the page layout." +msgstr "Dovoli tisk slik z izbiro postavitve strani." + +#: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "Natisni" @@ -3228,30 +3226,30 @@ msgid "Rotate the selected images 90° to the right" msgstr "Zavrti izbrane slike za 90° desno" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 msgid "Rotate the selected images 90° to the left" msgstr "Zavrti izbrane slike za 90° levo" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Fizično zavrti" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 msgid "Rotate the selected images according to the embedded orientation" msgstr "Zavrti izbrane slike glede na vključeno usmerjenost" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" msgstr "Ponastavi usmerjenost EXIF" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" msgstr "Ponastavi vključeno usmerjenost brez vrtenja slik" #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2349 -#: ../extensions/webalbums/gth-web-exporter.c:2433 +#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Shranjevanje slik" @@ -3263,12 +3261,12 @@ msgid "Rotate images without data loss." msgstr "Zavrti slike brez izgube kakovosti." -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "Napaka med preoblikovanjem slike: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" "This transformation may introduce small image distortions along one or more edges, because the image dimensions are not multiples of 8.\n" "\n" @@ -3282,209 +3280,213 @@ "\n" "Moteče robne točke lahko zavržete (ali obrežete). V praksi ta način daje najboljše rezultate, toda preoblikovanje ni več strogo brez izgub." -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" msgstr "_Robljenje" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "_Sprejmi počpačenje" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -msgid "Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, fit-width, fit-width-if-larger." -msgstr "Mogoče vrednosti so: dejanska-velikost, prilagodi, obdrži-prejšnje, prilagodi-če-večje, prilagodi-širino-če-večje." - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -msgid "Whether to resize the window to fit the size of the image" -msgstr "Ali naj bo velikost okna spremenjena do prilagajanja velikosti slike" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 -msgid "After loading an image:" -msgstr "Po nalaganju slike:" +msgid "Set to actual size" +msgstr "Nastavi sliko na dejansko velikost" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Visoka" +msgid "Keep previous zoom" +msgstr "Ohrani predhodno približanje" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Nizka" +msgid "Fit to window" +msgstr "Prilagodi oknu" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +msgid "Fit to window if larger" +msgstr "Prilagodi velikost oknu, če je večja" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 -msgid "Reset scrollbar positions" -msgstr "Ponastavi položaje drsnikov" +msgid "Fit to width" +msgstr "Prilagodi širini" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 -msgid "Transparency _type:" -msgstr "_Vrsta prozornosti:" +msgid "Fit to width if larger" +msgstr "Prilagodi velikost širini, če je večja" #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +msgid "Reset scrollbar positions" +msgstr "Ponastavi položaje drsnikov" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:8 +msgid "After loading an image:" +msgstr "Po nalaganju slike:" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:9 msgid "_Zoom quality:" msgstr "_Kakovost približanja:" -#: ../extensions/image_viewer/gth-image-histogram.c:74 -msgid "Histogram" -msgstr "Histogram" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 -msgid "Copy Image" -msgstr "Kopiraj sliko" +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:10 +msgid "Transparency _type:" +msgstr "_Vrsta prozornosti:" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:11 +msgid "High" +msgstr "Visoka" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:12 +msgid "Low" +msgstr "Nizka" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:13 +msgid "White" +msgstr "Bela" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:15 +msgid "Black" +msgstr "Črna" + +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:16 +msgid "Checked" +msgstr "Preverjeno" + +#: ../extensions/image_viewer/gth-image-histogram.c:84 +msgid "Histogram" +msgstr "Histogram" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 +msgid "Copy Image" +msgstr "Kopiraj sliko" + +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 msgid "Copy the image to the clipboard" msgstr "Kopiraj sliko v odložišče" -#: ../extensions/image_viewer/gth-image-viewer-page.c:197 +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 msgid "Paste Image" msgstr "Prilepi sliko" -#: ../extensions/image_viewer/gth-image-viewer-page.c:198 +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 msgid "Paste the image from the clipboard" msgstr "Prilepi sliko iz odložišča" -#: ../extensions/image_viewer/gth-image-viewer-page.c:202 +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "Povečaj" -#: ../extensions/image_viewer/gth-image-viewer-page.c:203 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Povečaj" -#: ../extensions/image_viewer/gth-image-viewer-page.c:207 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Pomanjšaj" -#: ../extensions/image_viewer/gth-image-viewer-page.c:208 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Pomanjšaj" -#: ../extensions/image_viewer/gth-image-viewer-page.c:212 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:213 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Dejanska velikost" -#: ../extensions/image_viewer/gth-image-viewer-page.c:217 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Prilagodi" -#: ../extensions/image_viewer/gth-image-viewer-page.c:218 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Prilagodi velikost oknu" -#: ../extensions/image_viewer/gth-image-viewer-page.c:223 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Prilagodi velikost širini" -#: ../extensions/image_viewer/gth-image-viewer-page.c:230 -msgid "_Fit Window to Image" -msgstr "_Prilagodi okno sliki" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:231 -msgid "Resize the window to the size of the image" -msgstr "Spremeni velikost okna na velikost slike" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 -msgid "Basic image viewing." -msgstr "Osnoven pogled slik." - -#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 msgid "Image viewer" msgstr "Pregledovalnik slik" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Nastavi sliko na dejansko velikost" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Prilagodi širini" +#: ../extensions/image_viewer/image_viewer.extension.in.in.h:2 +msgid "Basic image viewing." +msgstr "Osnoven pogled slik." -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Pregledovalnik" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "Mogoče vrednosti so: brez, datum_datoteke, trenutni_datum" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "Mogoče vrednosti so: yyyymmdd, yyyymm, yyyy" - -#: ../extensions/importer/data/ui/import-preferences.ui.h:3 -msgid "The day of the month" -msgstr "Dan v mesecu" +#: ../extensions/importer/data/ui/import-preferences.ui.h:1 +msgid "_Destination" +msgstr "_Cilj" -#: ../extensions/importer/data/ui/import-preferences.ui.h:5 -msgid "The hour" -msgstr "Ura" +#: ../extensions/importer/data/ui/import-preferences.ui.h:2 +msgid "_Automatic subfolder" +msgstr "_Samodejna podmapa" -#: ../extensions/importer/data/ui/import-preferences.ui.h:6 -msgid "The minutes" -msgstr "Minute" +#: ../extensions/importer/data/ui/import-preferences.ui.h:3 +msgid "as _single subfolder" +msgstr "kot _ena podmapa" #: ../extensions/importer/data/ui/import-preferences.ui.h:7 -msgid "The month" -msgstr "Mesec" +msgid "The year" +msgstr "Leto" #: ../extensions/importer/data/ui/import-preferences.ui.h:8 -msgid "The seconds" -msgstr "Sekunde" +msgid "The month" +msgstr "Mesec" #: ../extensions/importer/data/ui/import-preferences.ui.h:9 -msgid "The year" -msgstr "Leto" +msgid "The day of the month" +msgstr "Dan v mesecu" #: ../extensions/importer/data/ui/import-preferences.ui.h:10 -msgid "_Automatic subfolder" -msgstr "_Samodejna podmapa" +msgid "The hour" +msgstr "Ura" #: ../extensions/importer/data/ui/import-preferences.ui.h:11 -msgid "_Destination" -msgstr "_Cilj" +msgid "The minutes" +msgstr "Minute" #: ../extensions/importer/data/ui/import-preferences.ui.h:12 -msgid "as _single subfolder" -msgstr "kot _ena podmapa" +msgid "The seconds" +msgstr "Sekunde" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "Neveljaven cilj" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "primer: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:326 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Datum datoteke" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:336 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "leto-mesec-dan" -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "leto-mesec" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "leto" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "oblika po meri" #: ../extensions/importer/gth-import-task.c:442 #: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:643 +#: ../extensions/importer/gth-import-task.c:648 msgid "Importing files" msgstr "Uvažanje datotek" @@ -3496,25 +3498,25 @@ msgid "The selected files are already present in the destination." msgstr "Izbrane datoteke so že prisotne na cilju." -#: ../extensions/importer/gth-import-task.c:619 -#: ../gthumb/gth-file-source-vfs.c:685 +#: ../extensions/importer/gth-import-task.c:622 +#: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Datotek ni mogoče izbrisati" -#: ../extensions/importer/gth-import-task.c:620 +#: ../extensions/importer/gth-import-task.c:623 msgid "Delete operation not supported." msgstr "Dejanje izbrisa ni podprto." -#: ../extensions/importer/gth-import-task.c:704 +#: ../extensions/importer/gth-import-task.c:709 msgid "Last imported" msgstr "Zadnjič uvoženo" -#: ../extensions/importer/gth-import-task.c:839 +#: ../extensions/importer/gth-import-task.c:815 msgid "No file specified." msgstr "Ni določene datoteke." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:876 +#: ../extensions/importer/gth-import-task.c:852 #, c-format msgid "" "Not enough free space in '%s'.\n" @@ -3523,18 +3525,16 @@ "Ni dovolj prostora v mapi '%s'.\n" "Zahtevano je %s prostora, na voljo pa ga je le %s." -#: ../extensions/list_tools/callbacks.c:65 -#: ../gthumb/gth-filterbar.c:303 +#: ../extensions/list_tools/callbacks.c:76 +#: ../gthumb/gth-filterbar.c:304 msgid "Personalize..." msgstr "Ukaz po meri ..." -#: ../extensions/list_tools/callbacks.c:238 -#: ../extensions/list_tools/callbacks.c:249 +#: ../extensions/list_tools/callbacks.c:320 msgid "Tools" msgstr "Orodja" -#: ../extensions/list_tools/callbacks.c:240 -#: ../extensions/list_tools/callbacks.c:251 +#: ../extensions/list_tools/callbacks.c:321 msgid "Batch tools for multiple files" msgstr "Paketna slikovna orodja" @@ -3543,3505 +3543,2005 @@ msgstr "Pre_skoči" #: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:1 -msgid "Co_mmands:" -msgstr "_Ukazi:" - -#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 msgid "Commands" msgstr "Ukazi" -#: ../extensions/list_tools/data/ui/script-editor.ui.h:2 -#, no-c-format -msgid "%E" -msgstr "%E" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:4 -#, no-c-format -msgid "%N" -msgstr "%N" - -#. Translate only 'message' and 'default_value'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:7 -#, no-c-format -msgid "%ask{ message }{ default value }" -msgstr "%ask{ sporočilo }{ privzeta vrednost }" - -#. Translate only 'attribute name' -#: ../extensions/list_tools/data/ui/script-editor.ui.h:10 -#, no-c-format -msgid "%attr{ attribute name }" -msgstr "%attr{ ime atributa }" - -#. Translate only 'text'. -#: ../extensions/list_tools/data/ui/script-editor.ui.h:13 -#, no-c-format -msgid "%quote{ text }" -msgstr "%quote{ besedilo }" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:14 -#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 -msgid "A file attribute" -msgstr "Atribut datoteke" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 -msgid "Ask an input value" -msgstr "Vprašaj vhodno vrednost" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:17 -msgid "E_xecute command once for every file" -msgstr "I_zvedi ukaz enkrat za vsako datoteko" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:18 -msgid "Quote the text " -msgstr "Citiraj besedilo" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 -msgid "Sh_ortcut:" -msgstr "Bl_ižnjica:" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 -msgid "The file basename" -msgstr "Osnovno ime datoteke" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 -msgid "The file basename without extension" -msgstr "Osnovno ime datoteke brez pripone" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:23 -msgid "The file extension" -msgstr "Pripona datoteke" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 -msgid "The file path" -msgstr "Pot datoteke" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 -msgid "The file uri" -msgstr "Uri datoteke" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:26 -msgid "The parent folder path" -msgstr "Pot nadrejene mape" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:27 -msgid "_Command:" -msgstr "_Ukaz:" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 -msgid "_Terminal command (shell script)" -msgstr "Ukaz _terminala (skript lupine)" - -#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 -msgid "_Wait for the command to finish" -msgstr "Po_čakaj na dokončanje ukaza" - -#: ../extensions/list_tools/dlg-personalize-scripts.c:257 -msgid "Script" -msgstr "Skript" - -#: ../extensions/list_tools/dlg-personalize-scripts.c:271 -msgid "Shortcut" -msgstr "Bližnjica" - -#: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 -msgid "Show" -msgstr "Pokaži" - -#: ../extensions/list_tools/dlg-personalize-scripts.c:355 -msgid "Could not save the script" -msgstr "Skripta ni mogoče shraniti" - -#: ../extensions/list_tools/dlg-personalize-scripts.c:406 -msgid "New Command" -msgstr "Nov ukaz" - -#: ../extensions/list_tools/dlg-personalize-scripts.c:433 -msgid "Edit Command" -msgstr "Uredi ukaz" - -#: ../extensions/list_tools/dlg-personalize-scripts.c:461 -msgid "Are you sure you want to delete the selected command?" -msgstr "Ali ste prepričani, da želite izbrisati izbran ukaz?" - -#: ../extensions/list_tools/gth-script.c:642 -msgid "Enter a value:" -msgstr "Vnesite vrednost:" - -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:570 -#: ../extensions/webalbums/gth-web-exporter.c:582 -#: ../extensions/webalbums/gth-web-exporter.c:590 -msgid "Malformed command" -msgstr "Slabo oblikovan ukaz" - -#: ../extensions/list_tools/gth-script-editor-dialog.c:176 -msgid "none" -msgstr "brez" - -#: ../extensions/list_tools/gth-script-editor-dialog.c:182 -#, c-format -msgid "key %d on the numeric keypad" -msgstr "tipka %d na številčni tipkovnici" - -#: ../extensions/list_tools/gth-script-editor-dialog.c:325 -#, c-format -msgid "No command specified" -msgstr "Ukaz ni določen" - -#: ../extensions/list_tools/gth-script-task.c:84 -#, c-format -msgid "Command exited abnormally with status %d" -msgstr "Ukaz je končal nepravilno s stanjem %d" - -#: ../extensions/list_tools/list_tools.extension.in.in.h:1 -msgid "File list tools" -msgstr "Orodja seznama datotek" - -#: ../extensions/list_tools/list_tools.extension.in.in.h:2 -msgid "Scripting and batch manipulation of files." -msgstr "Skripti in paketno upravljanje datotek." - -#: ../extensions/map_view/gth-map-view.c:121 -msgctxt "Cardinal point" -msgid "S" -msgstr "J" - -#: ../extensions/map_view/gth-map-view.c:121 -msgctxt "Cardinal point" -msgid "N" -msgstr "S" - -#: ../extensions/map_view/gth-map-view.c:123 -msgctxt "Cardinal point" -msgid "W" -msgstr "Z" - -#: ../extensions/map_view/gth-map-view.c:123 -msgctxt "Cardinal point" -msgid "E" -msgstr "V" - -#: ../extensions/map_view/gth-map-view.c:196 -#: ../extensions/map_view/map_view.extension.in.in.h:1 -msgid "Map" -msgstr "Zemljevid" - -#. No GPS label -#: ../extensions/map_view/gth-map-view.c:265 -msgid "The geographical position information is not available for this image." -msgstr "Podatki zemljepisne lega za to sliko niso na voljo." - -#: ../extensions/map_view/map_view.extension.in.in.h:2 -msgid "View the photo position on the map" -msgstr "Poglej mesto zajema slike na zemljevidu." - -#: ../extensions/photobucket/callbacks.c:54 -msgid "Photobucket..." -msgstr "Photobucket ..." - -#: ../extensions/photobucket/callbacks.c:55 -msgid "Upload photos to Photobucket" -msgstr "Pošiljanje fotografij na Photobucket" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 -msgid "1 megabyte file size" -msgstr "Velikost datoteke 1 megabajt" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 -msgid "15ʺ screen ( 800 x 600 )" -msgstr "15ʺ zaslon ( 800 x 600 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 -msgid "17ʺ screen ( 1024 x 768 )" -msgstr "17ʺ zaslon ( 1024 x 768 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:9 -msgid "Large ( 640 x 480 )" -msgstr "Velika ( 640 x 480 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:10 -msgid "Medium ( 320 x 240 )" -msgstr "Srednja ( 320 x 240 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:11 -msgid "Small ( 160 x 120 )" -msgstr "Majhna ( 160 x 120 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:12 -msgid "Tiny ( 100 x 75 )" -msgstr "Drobcena ( 100 x 75 )" - -#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:15 -msgid "_Scramble filenames" -msgstr "_Predelaj imena datotek" - -#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:1 -msgid "_Container:" -msgstr "_Zabojnik:" - -#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 -msgid "Tiny ( 100 × 75 )" -msgstr "Drobcena ( 100 x 75 )" - -#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 -msgid "Small ( 160 × 120 )" -msgstr "Majhna ( 160 x 120 )" - -#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 -msgid "Medium ( 320 × 240 )" -msgstr "Srednja ( 320 x 240 )" - -#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 -msgid "Large ( 640 × 480 )" -msgstr "Velika ( 640 x 480 )" - -#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 -msgid "15ʺ screen ( 800 × 600 )" -msgstr "15ʺ zaslon ( 800 x 600 )" - -#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 -msgid "17ʺ screen ( 1024 × 768 )" -msgstr "17ʺ zaslon ( 1024 x 768 )" - -#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 -msgid "2 megabyte file size" -msgstr "Velikost datoteke 2 megabajta" - -#: ../extensions/photobucket/photobucket.extension.in.in.h:1 -msgid "PhotoBucket" -msgstr "PhotoBucket" - -#: ../extensions/photobucket/photobucket.extension.in.in.h:2 -msgid "Upload images to PhotoBucket" -msgstr "Pošiljanje slik na PhotoBucket" - -#: ../extensions/photo_importer/actions.c:71 -msgid "Import" -msgstr "Uvoz i" - -#: ../extensions/photo_importer/callbacks.c:52 -msgid "_Removable Device..." -msgstr "_Odstranljiva naprava ..." - -#: ../extensions/photo_importer/callbacks.c:53 -msgid "Import photos and other files from a removable device" -msgstr "Uvozi slike in druge datoteke z odstranljive naprave" - -#: ../extensions/photo_importer/callbacks.c:56 -msgid "F_older..." -msgstr "_Mapa ..." - -#: ../extensions/photo_importer/callbacks.c:57 -msgid "Import photos and other files from a folder" -msgstr "Uvozi slike in druge datoteke iz mape" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 -msgid "After importing from a device:" -msgstr "Po uvažanju z naprave:" - -#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 -msgid "_Rotate the images physically" -msgstr "_Fizično zavrti slike" - -#. view label -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:1 -#: ../gthumb/gth-filterbar.c:413 -msgid "S_how:" -msgstr "_Pokaži:" - -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:2 -msgid "_Delete the imported files from the source" -msgstr "_Izbriši uvožene slike z vira" - -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 -msgid "_Event:" -msgstr "_Dogodek:" - -#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 -msgid "_Tags:" -msgstr "O_znake:" - -#: ../extensions/photo_importer/dlg-photo-importer.c:222 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:173 -msgid "Could not import the files" -msgstr "Datotek ni mogoče uvoziti" - -#. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:294 -#, c-format -msgid "Files to import: %d (%s)" -msgstr "Datoteke za uvoz: %d (%s)" - -#: ../extensions/photo_importer/dlg-photo-importer.c:334 -msgid "Could not load the folder" -msgstr "Mape ni mogoče naložiti" - -#: ../extensions/photo_importer/dlg-photo-importer.c:364 -#: ../gthumb/gth-browser.c:1921 -msgid "Getting folder listing..." -msgstr "Pridobivanje seznama map ..." - -#: ../extensions/photo_importer/dlg-photo-importer.c:410 -msgid "Empty" -msgstr "Prazno" - -#: ../extensions/photo_importer/dlg-photo-importer.c:580 -msgid "Import from Removable Device" -msgstr "Uvozi z odstranljive naprave" - -#: ../extensions/photo_importer/dlg-photo-importer.c:612 -msgid "Import from Folder" -msgstr "Uvozi iz mape" - -#: ../extensions/photo_importer/photo_importer.extension.in.in.h:1 -msgid "Import photos" -msgstr "Uvozi fotografije" - -#: ../extensions/photo_importer/photo_importer.extension.in.in.h:2 -msgid "Import photos from removable devices." -msgstr "Uvozi fotografije z odstranljivih naprav." - -#: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 -msgid "_Picasa Web Album..." -msgstr "Spletni album _Picasa ..." - -#: ../extensions/picasaweb/callbacks.c:60 -msgid "Download photos from Picasa Web Album" -msgstr "Prejmi fotografije s spletnega albuma Picasa" - -#: ../extensions/picasaweb/callbacks.c:64 -msgid "Upload photos to Picasa Web Album" -msgstr "Pošlji fotografije na spletni album Picasa" - -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:2 -msgid "Export to Picasa Web Albums" -msgstr "Izvozi v spletne albume Picasa" - -#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:4 -msgid "_Albums:" -msgstr "_Albumi:" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:3 -msgid "Import from Picasa Web Album" -msgstr "Uvozi iz spletnega albuma Picasa" - -#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:4 -msgid "_Album:" -msgstr "_Album:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 -msgid "Type the characters you see in the picture below. Letters are not case-sensitive." -msgstr "Vnesite znake, ki jih vidite na sliki spodaj. Črke niso občutljive na velikost." - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 -msgid "_E-Mail:" -msgstr "_Elektronska pošta:" - -#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 -msgid "_Password:" -msgstr "_Geslo:" - -#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:3 -msgid "Public" -msgstr "Javno" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:307 -msgid "Could not get the album list" -msgstr "Ni mogoče dobiti seznama albumov" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:391 -msgid "Picasa Web Album" -msgstr "Spletni album Picasa" - -#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:478 -msgid "Account" -msgstr "Račun" - -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:133 -msgid "Could not load the file" -msgstr "Ni mogoče naložiti datoteke" - -#: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 -msgid "Picasa Web Albums" -msgstr "Picasa spletni albumi" - -#: ../extensions/picasaweb/picasaweb.extension.in.in.h:2 -msgid "Upload images to Picasa Web Albums" -msgstr "Pošlje slike na Picasa spletne albume" - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: jpeg, jpg." -msgstr "Mogoči vrednosti sta jpg in jpeg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:2 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Mogoče vrednosti so brez, stisnjeno in jpeg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:3 -msgid "Possible values are: tiff, tif." -msgstr "Mogoči vrednosti sta tif in tiff." - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 -msgid "Opti_mize" -msgstr "Opti_miziraj" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 -msgid "_Default extension:" -msgstr "_Privzete pripona:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 -msgid "_Progressive" -msgstr "_Napredno" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 -msgid "_Quality:" -msgstr "_Kakovost:" - -#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 -msgid "_Smoothing:" -msgstr "_Glajenje:" - -#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 -msgid "Compression _level:" -msgstr "_Raven stiskanja:" - -#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 -msgid "Default options:" -msgstr "Privzete možnosti:" - -#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 -msgid "_RLE compression" -msgstr "Stiskanje _RLE" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 -msgid "Compression" -msgstr "Stiskanje" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 -msgid "No_rmal (Deflate)" -msgstr "O_bičajno (stisnjeno)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 -msgid "Resolution" -msgstr "Ločljivost" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:6 -msgid "_Loss compression (JPEG)" -msgstr "_Stiskanje z izgubo (JPEG)" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:7 -msgid "_No compression" -msgstr "_Brez stiskanja" - -#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 -msgid "dpi" -msgstr "dpi" - -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:527 -msgid "JPEG" -msgstr "JPEG" - -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 -msgid "PNG" -msgstr "PNG" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 -#: ../gthumb/gth-buffer-data.c:84 -msgid "Insufficient memory" -msgstr "Nezadostna količina pomnilnika" - -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 -msgid "TGA" -msgstr "TGA" - -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:542 -msgid "TIFF" -msgstr "TIFF" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 -msgid "Save images" -msgstr "Shrani slike" - -#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 -msgid "Save images in common file formats such as JPEG, PNG and TIFF" -msgstr "Shrani slike v običajnih vrstah datotek kot so JPEG, PNG in TIFF" - -#: ../extensions/raw_files/raw_files.extension.in.in.h:1 -msgid "Allow to load raw format images." -msgstr "Dovoli nalaganje slik surove vrste." - -#: ../extensions/raw_files/raw_files.extension.in.in.h:2 -msgid "Raw format support" -msgstr "Podpora za surovo vrsto" - -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 -msgid "_X:" -msgstr "_X:" - -#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:3 -msgid "_Y:" -msgstr "_Y:" - -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 -msgid "Red Eye Removal..." -msgstr "Odstranjevanje rdečih oči ..." - -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 -msgid "Red Eye Removal" -msgstr "Odstranjevanje rdečih oči" - -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:470 -msgid "Remove the red eye effect caused by camera flashes" -msgstr "Odstrani učinek rdečih oči, ki ga povzročijo bliskavice" - -#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:1 -msgid "Red-eye removal" -msgstr "Odstranjevanje rdečih oči" - -#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:2 -msgid "Tool to remove the red-eye effect from a photo." -msgstr "Orodje za odstranjevanje učinka rdečih oči s fotografije." - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" -msgstr "Mogoče vrednosti vključujejo: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "Mogoče vrednosti: 0 (brez), 1 (nižje), 2 (višje)" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:1 -msgid "add" -msgstr "dodaj" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 -msgid "digits" -msgstr "številke" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 -msgid "format:" -msgstr "oblika:" - -#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 -msgid "remove" -msgstr "odstrani" - -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:3 -#, no-c-format -msgid "%A{ identifier }" -msgstr "%A{ določilnik }" - -#. translate only the text in the curly brackets -#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 -#, no-c-format -msgid "%M{ format }" -msgstr "%M{ oblika }" - -#. Translators: this is the text case (upper or lower case). -#: ../extensions/rename_series/data/ui/rename-series.ui.h:12 -msgid "Cas_e:" -msgstr "V_elikost črk:" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:14 -msgid "Edit template" -msgstr "Uredi predlogo" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 -msgid "Re_verse Order" -msgstr "O_brnjen vrstni red" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 -msgid "Rename" -msgstr "Preimenuj" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:20 -msgid "The digitalization date" -msgstr "Izviren datum digitalizacije" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 -msgid "The modification date" -msgstr "Izviren datum spremembe" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:22 -msgid "The original enumerator" -msgstr "Izvirni števec" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:23 -msgid "The original extension" -msgstr "Izvirna pripona" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:24 -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:28 -msgid "The original filename" -msgstr "Izvirno ime datoteke" - -#: ../extensions/rename_series/data/ui/rename-series.ui.h:28 -msgid "_Template:" -msgstr "_Predloga:" - -#: ../extensions/rename_series/dlg-rename-series.c:64 -msgid "Enumerator" -msgstr "Števec" - -#: ../extensions/rename_series/dlg-rename-series.c:65 -msgid "Original filename" -msgstr "Izvirno ime datoteke" - -#: ../extensions/rename_series/dlg-rename-series.c:66 -msgid "Original extension" -msgstr "Izvirna pripona" - -#: ../extensions/rename_series/dlg-rename-series.c:67 -msgid "Original enumerator" -msgstr "Izvirni števec" - -#: ../extensions/rename_series/dlg-rename-series.c:68 -msgid "Modification date" -msgstr "Datum spremembe" - -#: ../extensions/rename_series/dlg-rename-series.c:69 -msgid "Digitalization date" -msgstr "Datum digitalizacije" - -#: ../extensions/rename_series/dlg-rename-series.c:70 -msgid "File attribute" -msgstr "Atribut datoteke" - -#: ../extensions/rename_series/dlg-rename-series.c:556 -#: ../extensions/rename_series/dlg-rename-series.c:687 -msgid "Could not rename the files" -msgstr "Ni mogoče preimenovati datotek" - -#: ../extensions/rename_series/dlg-rename-series.c:784 -msgid "Could not save the template" -msgstr "Predloge ni mogoče shraniti" - -#: ../extensions/rename_series/dlg-rename-series.c:802 -msgid "Edit Template" -msgstr "Uredi predlogo" - -#: ../extensions/rename_series/dlg-rename-series.c:859 -msgid "Old Name" -msgstr "Staro ime" - -#: ../extensions/rename_series/dlg-rename-series.c:870 -msgid "New Name" -msgstr "Novo ime" - -#: ../extensions/rename_series/dlg-rename-series.c:945 -msgid "Keep original case" -msgstr "Ohrani izvirno velikost" - -#: ../extensions/rename_series/dlg-rename-series.c:946 -msgid "Convert to lower-case" -msgstr "Pretvori v male črke" - -#: ../extensions/rename_series/dlg-rename-series.c:947 -msgid "Convert to upper-case" -msgstr "Pretvori v velike črke" - -#: ../extensions/rename_series/gth-rename-task.c:167 -msgid "Renaming files" -msgstr "Preimenovanje datotek" - -#: ../extensions/rename_series/rename_series.extension.in.in.h:1 -msgid "Rename files" -msgstr "Preimenuj datoteke" - -#: ../extensions/rename_series/rename_series.extension.in.in.h:2 -msgid "Rename series of files." -msgstr "Preimenuj zaporedje datotek." - -#: ../extensions/resize_images/callbacks.c:45 -msgid "Resize Images..." -msgstr "Spremeni velikost slik ..." - -#: ../extensions/resize_images/callbacks.c:46 -msgid "Resize the selected images" -msgstr "Spremeni velikost izbranih slik" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 -#: ../gthumb/gth-main-default-metadata.c:49 -msgid "Format" -msgstr "Oblika" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:6 -msgid "New dimensions" -msgstr "Nove mere" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:7 -msgid "Resize Images" -msgstr "Spremeni velikost slik" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:8 -msgid "_Height:" -msgstr "_Višina:" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 -msgid "_Preserve original aspect ratios" -msgstr "_Ohrani izvirno razmerje velikosti" - -#: ../extensions/resize_images/data/ui/resize-images.ui.h:12 -msgid "pixel" -msgstr "točka" - -#: ../extensions/resize_images/dlg-resize-images.c:163 -msgid "Resizing images" -msgstr "Spreminjanje v" - -#: ../extensions/resize_images/dlg-resize-images.c:358 -msgid "Keep the original format" -msgstr "Ohrani izvirni zapis" - -#: ../extensions/resize_images/resize_images.extension.in.in.h:1 -msgid "Resize images" -msgstr "Spremeni velikost slik" - -#: ../extensions/resize_images/resize_images.extension.in.in.h:2 -msgid "Resize series of images." -msgstr "Spremeni velikost zaporedja slik." - -#: ../extensions/search/actions.c:49 -#: ../extensions/search/actions.c:117 -#: ../extensions/search/actions.c:123 -msgid "Could not perform the search" -msgstr "Ni mogoče izvesti iskanja" - -#: ../extensions/search/actions.c:54 -msgid "Search Result" -msgstr "Rezultati iskanja" - -#: ../extensions/search/actions.c:76 -msgid "Find" -msgstr "Poišči" - -#: ../extensions/search/callbacks.c:59 -msgid "Find files" -msgstr "Najdi datoteke" - -#: ../extensions/search/callbacks.c:133 -msgid "Search again" -msgstr "Poišči znova" - -#. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 -#: ../extensions/search/search.extension.in.in.h:2 -msgid "Search" -msgstr "Poišči" - -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:195 -msgid "all the following rules" -msgstr "vsa naslednja pravila" - -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:196 -msgid "any of the following rules" -msgstr "katerokoli od naslednjih pravil" - -#: ../extensions/search/gth-search-task.c:181 -#, c-format -msgid "Files found until now: %s" -msgstr "Do sedaj najdene datoteke: %s" - -#: ../extensions/search/gth-search-task.c:270 -msgid "Searching..." -msgstr "Iskanje ..." - -#: ../extensions/search/gth-search-task.c:276 -msgid "Cancel the operation" -msgstr "Prekliči opravilo" - -#: ../extensions/search/search.extension.in.in.h:1 -msgid "File search tool." -msgstr "Orodje iskanja datotek." - -#: ../extensions/slideshow/callbacks.c:56 -msgid "_Slideshow" -msgstr "_Predstavitev" - -#: ../extensions/slideshow/callbacks.c:57 -msgid "View as a slideshow" -msgstr "Poglej kot predstavitev" - -#: ../extensions/slideshow/callbacks.c:406 -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 -#: ../extensions/slideshow/slideshow.extension.in.in.h:1 -msgid "Slideshow" -msgstr "Predstavitev" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 -msgid "Add files to the playlist" -msgstr "Dodaj datoteke na seznam predvajanja" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 -msgid "Playlist" -msgstr "Seznam predvajanja" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 -msgid "R_andom order" -msgstr "N_aključni vrsti red" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:4 -msgid "Remove the selected files" -msgstr "Odstrani izbrane datoteke" - -#. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 -msgid "_Change automatically, every" -msgstr "S_amodejno spremeni vsakih" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 -msgid "_Personalize" -msgstr "_Ukaz po meri" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 -msgid "_Restart when finished" -msgstr "Znova _predvajaj po koncu predvajanja" - -#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 -msgid "_Transition effect:" -msgstr "Učinek _prehoda:" - -#: ../extensions/slideshow/gth-slideshow.c:229 -msgid "Playing slideshow" -msgstr "Predvajanje predstavitve" - -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 -msgid "Choose the files to play" -msgstr "Izbor datotek za predvajanje" - -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 -msgid "Audio files" -msgstr "Zvočne datoteke" - -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 -msgid "Random" -msgstr "Naključno" - -#: ../extensions/slideshow/main.c:283 -msgid "Push from right" -msgstr "Potisk z desne" - -#: ../extensions/slideshow/main.c:289 -msgid "Push from bottom" -msgstr "Potisk od spodaj" - -#: ../extensions/slideshow/main.c:295 -msgid "Slide from right" -msgstr "Zdrsni z desne" - -#: ../extensions/slideshow/main.c:301 -msgid "Slide from bottom" -msgstr "Zdrsni od spodaj" - -#: ../extensions/slideshow/main.c:307 -msgid "Fade in" -msgstr "Postopno ojačanje" - -#: ../extensions/slideshow/main.c:313 -msgid "Flip page" -msgstr "Obrni stran" - -#: ../extensions/slideshow/main.c:319 -msgid "Cube from right" -msgstr "Kocka z desne" - -#: ../extensions/slideshow/main.c:325 -msgid "Cube from bottom" -msgstr "Kocka od spodaj" - -#: ../extensions/slideshow/slideshow.extension.in.in.h:2 -msgid "View images as a slideshow." -msgstr "Poglej slike kot predstavitev." - -#: ../extensions/webalbums/callbacks.c:71 -msgid "_Web Album..." -msgstr "_Spletni album ..." - -#: ../extensions/webalbums/callbacks.c:72 -msgid "Create a static web album" -msgstr "Ustvari statični spletni album" - -#: ../extensions/webalbums/data/albumthemes/text.h:26 -msgid "Click to view the image" -msgstr "Kliknite za pogled slike" - -#: ../extensions/webalbums/data/albumthemes/text.h:27 -msgid "Go back to the index" -msgstr "Pojdi nazaj na kazalo" - -#: ../extensions/webalbums/data/albumthemes/text.h:28 -#, c-format -msgid "Image %d of %d" -msgstr "Slika %d od %d" - -#: ../extensions/webalbums/data/albumthemes/text.h:29 -msgid "Index" -msgstr "Kazalo" - -#: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:110 -msgid "Next" -msgstr "Naslednja" - -#: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:105 -msgid "Previous" -msgstr "Predhodna" - -#: ../extensions/webalbums/data/albumthemes/text.h:33 -#, c-format -msgid "View page %d" -msgstr "Pogled strani %d" - -#: ../extensions/webalbums/data/albumthemes/text.h:34 -msgid "View the next image" -msgstr "Pogled naslednje slike" - -#: ../extensions/webalbums/data/albumthemes/text.h:35 -msgid "View the next page" -msgstr "Pogled naslednje strani" - -#: ../extensions/webalbums/data/albumthemes/text.h:36 -msgid "View the previous image" -msgstr "Pogled predhodne slike" - -#: ../extensions/webalbums/data/albumthemes/text.h:37 -msgid "View the previous page" -msgstr "Pogled predhodne strani" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 -#, no-c-format -msgid "%P" -msgstr "%P" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:6 -msgid "Adapts to the window width" -msgstr "Prilagodi se širini okna" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:8 -msgid "All images on a single image" -msgstr "Vse slike na eni sliki" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:14 -msgid "Image Attributes" -msgstr "Atributi slike" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:15 -msgid "Image Page" -msgstr "Stran slike" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:17 -msgid "Index Page" -msgstr "Stran kazala" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:21 -msgid "Show the description, if available" -msgstr "Pokaži opis, če je na voljo" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:22 -msgid "Show the following attributes:" -msgstr "Pokaži naslednje atribute:" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:25 -msgid "The current image number" -msgstr "Številka trenutne slike" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 -msgid "The file comment" -msgstr "Opomba datoteke" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:29 -msgid "The total number of images" -msgstr "Skupno število slik" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 -msgid "Thumbnail Caption" -msgstr "Naslov sličice" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 -msgid "Web Album" -msgstr "Spletni album" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 -msgid "_Adapt to the window width " -msgstr "_Prilagodi okno širini" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 -msgid "_Copy originals to destination" -msgstr "_Kopiraj izvirnike na cilj" - -#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 -msgid "_Resize if larger than:" -msgstr "_Spremeni velikost, če je večja kot:" - -#: ../extensions/webalbums/gth-web-exporter.c:1812 -msgid "Could not show the destination" -msgstr "Ni mogoče pokazati cilja" - -#: ../extensions/webalbums/gth-web-exporter.c:1848 -msgid "The album has been created successfully." -msgstr "Album je bil uspešno ustvarjen." - -#: ../extensions/webalbums/gth-web-exporter.c:2116 -#: ../extensions/webalbums/gth-web-exporter.c:2143 -msgid "Saving thumbnails" -msgstr "Shranjevanje sličic" - -#: ../extensions/webalbums/gth-web-exporter.c:2171 -msgid "Saving HTML pages: Images" -msgstr "Shranjevanje strani HTML: slike" - -#: ../extensions/webalbums/gth-web-exporter.c:2229 -msgid "Saving HTML pages: Indexes" -msgstr "Shranjevanje strani HTML: kazala" - -#: ../extensions/webalbums/gth-web-exporter.c:2512 -msgid "Copying original images" -msgstr "Kopiranje izvirnih slik" - -#: ../extensions/webalbums/gth-web-exporter.c:2938 -msgid "Could not find the style folder" -msgstr "Ni mogoče najti mape slogov" - -#: ../extensions/webalbums/gth-web-exporter.c:2971 -msgid "Could not create a temporary folder" -msgstr "Začasne mape ni mogoče ustvariti" - -#: ../extensions/webalbums/webalbums.extension.in.in.h:1 -msgid "Create static web albums." -msgstr "Ustvari statične spletne albume." - -#: ../extensions/webalbums/webalbums.extension.in.in.h:2 -msgid "Web Albums" -msgstr "Spletni albumi" - -#: ../gthumb/dlg-personalize-filters.c:236 -msgid "Filter" -msgstr "Filter" - -#: ../gthumb/dlg-personalize-filters.c:314 -msgid "Could not save the filter" -msgstr "Filtra ni mogoče shraniti" - -#: ../gthumb/dlg-personalize-filters.c:357 -msgid "New Filter" -msgstr "Nov filter" - -#: ../gthumb/dlg-personalize-filters.c:386 -msgid "Edit Filter" -msgstr "Uredi filter" - -#: ../gthumb/dlg-preferences-extensions.c:68 -#: ../gthumb/gth-filterbar.c:269 -msgid "All" -msgstr "Vse" - -#: ../gthumb/dlg-preferences-extensions.c:69 -msgid "Enabled" -msgstr "Omogočeno" - -#: ../gthumb/dlg-preferences-extensions.c:70 -msgid "Disabled" -msgstr "Onemogočeno" - -#: ../gthumb/dlg-preferences-extensions.c:73 -msgid "Viewers" -msgstr "Pregledovalniki" - -#: ../gthumb/dlg-preferences-extensions.c:74 -msgid "Metadata" -msgstr "Metapodatki" - -#: ../gthumb/dlg-preferences-extensions.c:75 -msgid "File tools" -msgstr "Datotečna orodja" - -#: ../gthumb/dlg-preferences-extensions.c:76 -msgid "List tools" -msgstr "Orodja seznama" - -#: ../gthumb/dlg-preferences-extensions.c:77 -msgid "Importers" -msgstr "Uvozniki" - -#: ../gthumb/dlg-preferences-extensions.c:78 -msgid "Exporters" -msgstr "Izvozniki" - -#: ../gthumb/dlg-preferences-extensions.c:215 -msgid "Could not activate the extension" -msgstr "Ni mogoče omogočiti razširitve" - -#: ../gthumb/dlg-preferences-extensions.c:225 -msgid "Could not deactivate the extension" -msgstr "Ni mogoče onemogočiti razširitve" - -#. add the page to the preferences dialog -#: ../gthumb/dlg-preferences-extensions.c:772 -msgid "Extensions" -msgstr "Razširitve" - -#: ../gthumb/dlg-preferences-extensions.c:819 -msgid "Restart required" -msgstr "Zahtevan je ponoven zagon" - -#: ../gthumb/dlg-preferences-extensions.c:820 -msgid "You need to restart gthumb for these changes to take effect" -msgstr "Za uveljavitev nekaterih sprememb je treba ponovno zagnati program " - -#: ../gthumb/dlg-preferences-extensions.c:821 -msgid "_Continue" -msgstr "_Nadaljuj" - -#: ../gthumb/dlg-preferences-extensions.c:822 -msgid "_Restart" -msgstr "_Znova zaženi" - -#: ../gthumb/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Vrsta datoteke: %s" - -#: ../gthumb/eggfileformatchooser.c:397 -#: ../gthumb/gth-main-default-tests.c:197 -msgid "All Files" -msgstr "Vse datoteke" - -#: ../gthumb/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Vse podprte datoteke" - -#: ../gthumb/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Po priponi" - -#: ../gthumb/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Vrsta datoteke" - -#: ../gthumb/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Pripone" - -#: ../gthumb/eggfileformatchooser.c:681 -#, c-format -msgid "The program was not able to find out the file format you want to use for `%s'. Please make sure to use a known extension for that file or manually choose a file format from the list below." -msgstr "Ni mogoče določiti vrste datoteke, ki jo želite uporabiti za `%s'. Prepričajte se, da uporabljate znano pripono datoteke ali pa sami izberite vrsto datoteke iz spodnjega seznama." - -#: ../gthumb/eggfileformatchooser.c:688 -msgid "File format not recognized" -msgstr "Vrsta datoteka ni bila prepoznana" - -#. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB -#: ../gthumb/gio-utils.c:1355 -#, c-format -msgid "%s of %s" -msgstr "%s od %s" - -#: ../gthumb/gio-utils.c:1390 -#, c-format -msgid "Moving \"%s\" to \"%s\"" -msgstr "Premikanje \"%s\" v \"%s\"" - -#: ../gthumb/gio-utils.c:1392 -#, c-format -msgid "Copying \"%s\" to \"%s\"" -msgstr "Kopiranje \"%s\" v \"%s\"" - -#: ../gthumb/gio-utils.c:1733 -msgid "Moving files" -msgstr "Premikanje datotek" - -#: ../gthumb/gio-utils.c:1733 -msgid "Copying files" -msgstr "Kopiranje datotek" - -#: ../gthumb/gio-utils.c:1734 -msgid "Getting file information" -msgstr "Pridobivanje podrobnosti datoteke" - -#. hour:minutes:seconds -#. Translators: This is a time format, like "9:05:02" for 9 -#. * hours, 5 minutes, and 2 seconds. You may change ":" to -#. * the separator that your locale uses or use "%Id" instead -#. * of "%d" if your locale uses localized digits. -#. -#: ../gthumb/glib-utils.c:2749 -#, c-format -msgctxt "long time format" -msgid "%d:%02d:%02d" -msgstr "%d:%02d:%02d" - -#. minutes:seconds -#. Translators: This is a time format, like "5:02" for 5 -#. * minutes and 2 seconds. You may change ":" to the -#. * separator that your locale uses or use "%Id" instead of -#. * "%d" if your locale uses localized digits. -#. -#: ../gthumb/glib-utils.c:2758 -#, c-format -msgctxt "short time format" -msgid "%d:%02d" -msgstr "%d:%02d" - -#: ../gthumb/gth-browser-actions-callbacks.c:361 -msgid "gthumb is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." -msgstr "gthumb je prosta programska oprema; program lahko razširjate in/ali spreminjate pod pogoji Splošnega dovoljenja GNU (GNU General PublicLicense), kot ga je objavila ustanova Free Software Foundation; bodisi različice 2 ali (po vaši izbiri) katerekoli poznejše različice." - -#: ../gthumb/gth-browser-actions-callbacks.c:365 -msgid "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." -msgstr "gthumb se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOČEN NAMEN. Za podrobnosti glejte besedilo GNU General Public License." - -#: ../gthumb/gth-browser-actions-callbacks.c:369 -msgid "You should have received a copy of the GNU General Public License along with gthumb. If not, see http://www.gnu.org/licenses/." -msgstr "Skupaj s programom bi morali dobiti tudi kopijo GNU splošne javne licence. V primeru, da je niste, si oglejte http://www.gnu.org/licenses/." - -#: ../gthumb/gth-browser-actions-callbacks.c:388 -msgid "An image viewer and browser for GNOME." -msgstr "Brskalnik in pregledovalnik slik za GNOME." - -#: ../gthumb/gth-browser-actions-callbacks.c:391 -msgid "translator_credits" -msgstr "" -"Matej Urbančič, \n" -"Andrej Žnidaršič, " - -#: ../gthumb/gth-browser-actions-entries.h:30 -msgid "_File" -msgstr "_Datoteka" - -#: ../gthumb/gth-browser-actions-entries.h:31 -msgid "_Edit" -msgstr "_Uredi" - -#: ../gthumb/gth-browser-actions-entries.h:33 -msgid "_Go" -msgstr "P_ojdi" - -#: ../gthumb/gth-browser-actions-entries.h:34 -msgid "_Help" -msgstr "Pomo_č" - -#: ../gthumb/gth-browser-actions-entries.h:35 -msgid "Open _With" -msgstr "Odpri _z" - -#: ../gthumb/gth-browser-actions-entries.h:36 -msgid "I_mport From" -msgstr "U_vozi iz" - -#: ../gthumb/gth-browser-actions-entries.h:37 -msgid "E_xport To" -msgstr "_Izvozi v" - -#: ../gthumb/gth-browser-actions-entries.h:40 -msgid "New _Window" -msgstr "No_vo okno" - -#: ../gthumb/gth-browser-actions-entries.h:41 -msgid "Open another window" -msgstr "Odpri novo okno" - -#: ../gthumb/gth-browser-actions-entries.h:65 -msgid "Open" -msgstr "Odpri" - -#: ../gthumb/gth-browser-actions-entries.h:70 -msgid "Open in New Window" -msgstr "Odpri v novem oknu" - -#: ../gthumb/gth-browser-actions-entries.h:76 -msgid "Edit various preferences" -msgstr "Urejanje različnih možnosti" - -#: ../gthumb/gth-browser-actions-entries.h:85 -msgid "_Sort By..." -msgstr "_Razvrsti po ..." - -#: ../gthumb/gth-browser-actions-entries.h:90 -msgid "_Filter..." -msgstr "_Filter ..." - -#: ../gthumb/gth-browser-actions-entries.h:96 -msgid "Stop loading the current location" -msgstr "Zaustavi nalaganje trenutnega mesta" - -#: ../gthumb/gth-browser-actions-entries.h:101 -msgid "Reload the current location" -msgstr "Ponovno naloži trenutno mesto" - -#: ../gthumb/gth-browser-actions-entries.h:106 -msgid "View previous image" -msgstr "Pogled predhodne slike" - -#: ../gthumb/gth-browser-actions-entries.h:111 -msgid "View next image" -msgstr "Pogled naslednje slike" - -#: ../gthumb/gth-browser-actions-entries.h:116 -msgid "Switch to fullscreen" -msgstr "Preklopi na cel zaslon" - -#: ../gthumb/gth-browser-actions-entries.h:121 -msgid "Leave Fullscreen" -msgstr "Zapusti celozaslonski način" - -#: ../gthumb/gth-browser-actions-entries.h:126 -#: ../gthumb/gth-browser.c:3647 -msgid "Go to the previous visited location" -msgstr "Pojdi na predhodno obiskano mesto" - -#: ../gthumb/gth-browser-actions-entries.h:131 -#: ../gthumb/gth-browser.c:3668 -msgid "Go to the next visited location" -msgstr "Pojdi na naslednje obiskano mesto" - -#: ../gthumb/gth-browser-actions-entries.h:136 -#: ../gthumb/gth-browser.c:3689 -msgid "Go up one level" -msgstr "Pojdi eno raven višje" - -#: ../gthumb/gth-browser-actions-entries.h:145 -#: ../gthumb/gth-browser.c:667 -msgid "_Delete History" -msgstr "_Izbriši zgodovino" - -#: ../gthumb/gth-browser-actions-entries.h:146 -msgid "Delete the list of visited locations" -msgstr "Izbriše seznam obiskanih mest" - -#: ../gthumb/gth-browser-actions-entries.h:151 -msgid "View the folders" -msgstr "Pogled map" - -#: ../gthumb/gth-browser-actions-entries.h:156 -msgid "Show information about gthumb" -msgstr "Prikaže podrobnosti programa gthumb" - -#: ../gthumb/gth-browser-actions-entries.h:160 -msgid "Contents" -msgstr "Vsebina" - -#: ../gthumb/gth-browser-actions-entries.h:161 -msgid "Display the gthumb Manual" -msgstr "Prikaže priročnik gThumb" - -#: ../gthumb/gth-browser-actions-entries.h:165 -msgid "_Keyboard Shortcuts" -msgstr "_Tipkovne bližnjice" - -#: ../gthumb/gth-browser-actions-entries.h:174 -msgid "_Toolbar" -msgstr "_Orodna vrstica" - -#: ../gthumb/gth-browser-actions-entries.h:175 -msgid "View or hide the toolbar of this window" -msgstr "Pokaže ali skrije orodno vrstico tega okna" - -#: ../gthumb/gth-browser-actions-entries.h:179 -msgid "_Statusbar" -msgstr "_Vrstica stanja" - -#: ../gthumb/gth-browser-actions-entries.h:180 -msgid "View or hide the statusbar of this window" -msgstr "Pokaže ali skrije vrstico stanja tega okna" - -#: ../gthumb/gth-browser-actions-entries.h:184 -msgid "_Filterbar" -msgstr "Vrstica _filtra" - -#: ../gthumb/gth-browser-actions-entries.h:185 -msgid "View or hide the filterbar of this window" -msgstr "Pokaže ali skrije filtrirno vrstico tega okna" - -#: ../gthumb/gth-browser-actions-entries.h:189 -msgid "_Sidebar" -msgstr "_Stranska vrstica" - -#: ../gthumb/gth-browser-actions-entries.h:190 -msgid "View or hide the sidebar of this window" -msgstr "Pokaže ali skrije stransko vrstico tega okna" - -#: ../gthumb/gth-browser-actions-entries.h:194 -msgid "_Thumbnail Pane" -msgstr "Pladenj s_ličic" - -#: ../gthumb/gth-browser-actions-entries.h:195 -msgid "View or hide the thumbnail pane in viewer mode" -msgstr "Pokaže ali skrije pladenj sličic v načinu pregledovalnika" - -#: ../gthumb/gth-browser-actions-entries.h:199 -msgid "_Thumbnails" -msgstr "_Sličice" - -#: ../gthumb/gth-browser-actions-entries.h:200 -msgid "View thumbnails" -msgstr "Pogled sličic" - -#: ../gthumb/gth-browser-actions-entries.h:204 -msgid "_Hidden Files" -msgstr "_Skrite datoteke" - -#: ../gthumb/gth-browser-actions-entries.h:205 -msgid "Show hidden files and folders" -msgstr "Pokaže skrite datoteke in mape" - -#: ../gthumb/gth-browser-actions-entries.h:210 -msgid "View file properties" -msgstr "Pogled lastnosti datoteke" - -#: ../gthumb/gth-browser-actions-entries.h:214 -msgid "Edit" -msgstr "Uredi" - -#: ../gthumb/gth-browser-actions-entries.h:215 -msgid "Edit file" -msgstr "Uredi datoteko" - -#: ../gthumb/gth-browser.c:363 -#, c-format -msgid "Open %s" -msgstr "Odpri %s" - -#: ../gthumb/gth-browser.c:503 -msgid "[modified]" -msgstr "[spremenjeno]" - -#: ../gthumb/gth-browser.c:991 -#, c-format -msgid "%d file selected (%s)" -msgid_plural "%d files selected (%s)" -msgstr[0] "%d izbranih datotek (%s)" -msgstr[1] "%d izbrana datoteka (%s)" -msgstr[2] "%d izbrani datoteki (%s)" -msgstr[3] "%d izbrane datoteke (%s)" - -#: ../gthumb/gth-browser.c:1026 -#, c-format -msgid "%s of free space" -msgstr "%s neporabljenega prostora" - -#: ../gthumb/gth-browser.c:1235 -#: ../gthumb/gth-browser.c:1809 -#: ../gthumb/gth-browser.c:5797 -#: ../gthumb/gth-browser.c:5816 -#: ../gthumb/gth-browser.c:5841 -#, c-format -msgid "Could not load the position \"%s\"" -msgstr "Ni mogoče naložiti položaja \"%s\"" - -#: ../gthumb/gth-browser.c:1905 -#: ../gthumb/gth-browser.c:1932 -#, c-format -msgid "No suitable module found for %s" -msgstr "Primernega modula za %s ni bilo mogoče najti" - -#: ../gthumb/gth-browser.c:2052 -#, c-format -msgid "Save changes to file '%s'?" -msgstr "Ali naj bodo spremembe datoteke '%s' shranjene?" - -#: ../gthumb/gth-browser.c:2057 -msgid "If you don't save, changes to the file will be permanently lost." -msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene." - -#: ../gthumb/gth-browser.c:2058 -msgid "Do _Not Save" -msgstr "_Ne shrani" - -#: ../gthumb/gth-browser.c:2863 -#: ../gthumb/gth-browser.c:2883 -#: ../gthumb/gth-source-tree.c:178 -#: ../gthumb/gth-source-tree.c:200 -msgid "Could not change name" -msgstr "Ni mogoče spremeniti imena" - -#: ../gthumb/gth-browser.c:3328 -#: ../gthumb/gth-main-default-metadata.c:41 -msgid "Modified" -msgstr "Spremenjeno" - -#: ../gthumb/gth-browser.c:3648 -#: ../gthumb/gth-browser.c:3669 -msgid "View the list of visited locations" -msgstr "Pogled seznama obiskanih mest" - -#: ../gthumb/gth-browser.c:3690 -msgid "View the list of upper locations" -msgstr "Pogled seznama zgornjih mest" - -#: ../gthumb/gth-browser.c:5798 -#, c-format -msgid "File type not supported" -msgstr "Vrsta datoteke ni podprta" - -#: ../gthumb/gth-browser.c:5842 -#, c-format -msgid "No suitable module found" -msgstr "Ni mogoče najti primernega modula" - -#: ../gthumb/gth-extensions.c:228 -#, c-format -msgid "Could not open the module `%s`: %s" -msgstr "Ni mogoče odpreti modula `%s`: %s" - -#: ../gthumb/gth-extensions.c:831 -#, c-format -msgid "The extension '%1$s' is required by the extension '%2$s'" -msgstr "Razširitev '%2$s' zahteva nameščeno tudi razširitev '%1$s'." - -#: ../gthumb/gth-file-source-vfs.c:116 -msgid "Home Folder" -msgstr "Domača mapa" - -#: ../gthumb/gth-file-source-vfs.c:121 -msgid "File System" -msgstr "Datotečni sistem" - -#: ../gthumb/gth-file-source-vfs.c:730 -msgid "The files cannot be moved to the Trash. Do you want to delete them permanently?" -msgstr "Datotek ni mogoče premakniti v smeti. Ali jih želite trajno izbrisati?" - -#: ../gthumb/gth-file-source-vfs.c:741 -msgid "Could not move the files to the Trash" -msgstr "Datotek ni mogoče premakniti v smeti" - -#: ../gthumb/gth-file-source-vfs.c:785 -#, c-format -msgid "Are you sure you want to move \"%s\" to trash?" -msgstr "Ali ste prepričani, da želite premakniti \"%s\" v smeti?" - -#: ../gthumb/gth-file-source-vfs.c:788 -#, c-format -msgid "Are you sure you want to move to trash the %'d selected file?" -msgid_plural "Are you sure you want to move to trash the %'d selected files?" -msgstr[0] "Ali ste prepričani, da želite %'d izbranih datotek premakniti v smeti?" -msgstr[1] "Ali ste prepričani, da želite %'d izbrano datoteko premakniti v smeti?" -msgstr[2] "Ali ste prepričani, da želite %'d izbrani datoteki premakniti v smeti?" -msgstr[3] "Ali ste prepričani, da želite %'d izbrane datoteke premakniti v smeti?" - -#: ../gthumb/gth-file-source-vfs.c:829 -#, c-format -msgid "Are you sure you want to permanently delete the %'d selected file?" -msgid_plural "Are you sure you want to permanently delete the %'d selected files?" -msgstr[0] "Ali ste prepričani, da želite trajno izbrisati %'d izbranih datotek?" -msgstr[1] "Ali ste prepričani, da želite trajno izbrisati %'d izbrano datoteko?" -msgstr[2] "Ali ste prepričani, da želite trajno izbrisati %'d izbrani datoteki?" -msgstr[3] "Ali ste prepričani, da želite trajno izbrisati %'d izbrane datoteke?" - -#: ../gthumb/gth-filterbar.c:405 -msgid "Hide the filterbar" -msgstr "Skrij vrstico filtra" - -#: ../gthumb/gth-filter.c:43 -#: ../gthumb/gth-filter-editor-dialog.c:208 -#: ../gthumb/gth-test-simple.c:75 -msgid "kB" -msgstr "kB" - -#: ../gthumb/gth-filter.c:44 -#: ../gthumb/gth-filter-editor-dialog.c:209 -#: ../gthumb/gth-test-simple.c:76 -msgid "MB" -msgstr "MB" - -#: ../gthumb/gth-filter.c:45 -#: ../gthumb/gth-filter-editor-dialog.c:210 -#: ../gthumb/gth-test-simple.c:77 -msgid "GB" -msgstr "GB" - -#. "files" label -#: ../gthumb/gth-filter.c:279 -#: ../gthumb/gth-filter-editor-dialog.c:207 -msgid "files" -msgstr "datoteke" - -#: ../gthumb/gth-filter-editor-dialog.c:254 -msgid "ascending" -msgstr "naraščajoče" - -#: ../gthumb/gth-filter-editor-dialog.c:255 -msgid "descending" -msgstr "padajoče" - -#: ../gthumb/gth-filter-editor-dialog.c:545 -#, c-format -msgid "No limit specified" -msgstr "Omejitev ni navedena" - -#: ../gthumb/gth-folder-tree.c:848 -msgid "Loading..." -msgstr "Nalaganje ..." - -#: ../gthumb/gth-folder-tree.c:1119 -msgid "(Open Parent)" -msgstr "(Odpri nadrejeno)" - -#: ../gthumb/gth-histogram-view.c:800 -msgid "Linear scale" -msgstr "Linearna skala" - -#: ../gthumb/gth-histogram-view.c:812 -msgid "Logarithmic scale" -msgstr "Logaritmska skala" - -#: ../gthumb/gth-histogram-view.c:832 -msgid "Channel:" -msgstr "Kanal:" - -#: ../gthumb/gth-histogram-view.c:864 -msgid "Value" -msgstr "Vrednost" - -#: ../gthumb/gth-histogram-view.c:870 -msgid "Red" -msgstr "Rdeča" - -#: ../gthumb/gth-histogram-view.c:876 -msgid "Green" -msgstr "Zelena" - -#: ../gthumb/gth-histogram-view.c:882 -msgid "Blue" -msgstr "Modra" - -#: ../gthumb/gth-histogram-view.c:888 -msgid "Alpha" -msgstr "Alfa" - -#: ../gthumb/gth-histogram-view.c:895 -msgid "RGB" -msgstr "RGB" - -#: ../gthumb/gth-load-file-data-task.c:108 -msgid "Reading file information" -msgstr "Pridobivanje podrobnosti datoteke" - -#: ../gthumb/gth-main-default-metadata.c:32 -msgid "File" -msgstr "Datoteka" - -#: ../gthumb/gth-main-default-metadata.c:39 -msgid "Name" -msgstr "Ime" - -#: ../gthumb/gth-main-default-metadata.c:40 -#: ../gthumb/gth-main-default-tests.c:248 -msgid "Size" -msgstr "Velikost" - -#: ../gthumb/gth-main-default-metadata.c:42 -msgid "Type" -msgstr "Vrsta" - -#: ../gthumb/gth-main-default-metadata.c:44 -msgid "Full Name" -msgstr "Polno ime" - -#: ../gthumb/gth-main-default-metadata.c:48 -msgid "Duration" -msgstr "Trajanje" - -#: ../gthumb/gth-main-default-sort-types.c:131 -msgid "file name" -msgstr "ime datoteke" - -#: ../gthumb/gth-main-default-sort-types.c:132 -msgid "file path" -msgstr "pot datoteke" - -#: ../gthumb/gth-main-default-sort-types.c:133 -msgid "file size" -msgstr "velikost datoteke" - -#: ../gthumb/gth-main-default-sort-types.c:134 -msgid "file modified date" -msgstr "datum spremembe datoteke" - -#: ../gthumb/gth-main-default-sort-types.c:135 -msgid "no sorting" -msgstr "brez razvrščanja" - -#: ../gthumb/gth-main-default-sort-types.c:136 -msgid "dimensions" -msgstr "mere" - -#: ../gthumb/gth-main-default-tests.c:225 -msgid "Media" -msgstr "Večpredstavnostna datoteka" - -#: ../gthumb/gth-main-default-tests.c:232 -msgid "Text Files" -msgstr "Besedilne datoteke" - -#: ../gthumb/gth-main-default-tests.c:240 -msgid "Filename" -msgstr "Ime datoteke" - -#: ../gthumb/gth-main-default-tests.c:272 -msgid "Title (embedded)" -msgstr "Naslov (vključen)" - -#: ../gthumb/gth-main-default-tests.c:278 -msgid "Description (embedded)" -msgstr "Opis (vključen)" - -#: ../gthumb/gth-pixbuf-list-task.c:139 -msgid "Could not rename the file" -msgstr "Datoteke ni mogoče preimenovati" - -#: ../gthumb/gth-pixbuf-saver.c:34 -msgid "No options available for this file type" -msgstr "Za to vrsto datotek ni razpoložljivih možnosti" - -#: ../gthumb/gth-progress-dialog.c:142 -msgid "Cancel operation" -msgstr "Prekliči opravilo" - -#: ../gthumb/gth-save-file-data-task.c:102 -msgid "Saving file information" -msgstr "Shranjevanje podrobnosti datoteke" - -#: ../gthumb/gth-tags-entry.c:373 -#, c-format -msgid "Create tag «%s»" -msgstr "Ustvari oznako «%s»" - -#: ../gthumb/gth-tags-entry.c:719 -msgid "Show all the tags" -msgstr "Pokaži vse oznake" - -#: ../gthumb/gth-tags-file.c:234 -msgid "Holidays" -msgstr "Počitnice" - -#: ../gthumb/gth-tags-file.c:235 -msgid "Temporary" -msgstr "Začasno" - -#: ../gthumb/gth-tags-file.c:236 -msgid "Screenshots" -msgstr "Zajete slike" - -#: ../gthumb/gth-tags-file.c:237 -msgid "Science" -msgstr "Znanost" - -#: ../gthumb/gth-tags-file.c:238 -msgid "Favorite" -msgstr "Priljubljeno" - -#: ../gthumb/gth-tags-file.c:239 -msgid "Important" -msgstr "Pomembno" - -#: ../gthumb/gth-tags-file.c:240 -msgid "GNOME" -msgstr "GNOME" - -#: ../gthumb/gth-tags-file.c:241 -msgid "Games" -msgstr "Igre" - -#: ../gthumb/gth-tags-file.c:242 -msgid "Party" -msgstr "Zabava" - -#: ../gthumb/gth-tags-file.c:243 -msgid "Birthday" -msgstr "Rojstni dan" - -#: ../gthumb/gth-tags-file.c:244 -msgid "Astronomy" -msgstr "Astronomija" - -#: ../gthumb/gth-tags-file.c:245 -msgid "Family" -msgstr "Družina" - -#: ../gthumb/gth-test-category.c:46 -#: ../gthumb/gth-test-simple.c:49 -#: ../gthumb/gth-test-simple.c:64 -msgid "is" -msgstr "je" - -#: ../gthumb/gth-test-category.c:47 -msgid "is only" -msgstr "je le" - -#: ../gthumb/gth-test-category.c:48 -#: ../gthumb/gth-test-simple.c:50 -#: ../gthumb/gth-test-simple.c:65 -msgid "is not" -msgstr "ni" - -#: ../gthumb/gth-test-category.c:374 -#: ../gthumb/gth-test-simple.c:800 -#: ../gthumb/gth-test-simple.c:826 -#: ../gthumb/gth-test-simple.c:847 -#: ../gthumb/gth-test-simple.c:873 -#, c-format -msgid "The test definition is incomplete" -msgstr "Preizkusna definicija ni končana" - -#: ../gthumb/gth-test-selector.c:278 -msgid "Add a new rule" -msgstr "Dodaj novo pravilo" - -#: ../gthumb/gth-test-selector.c:289 -msgid "Remove this rule" -msgstr "Odstrani to pravilo" - -#: ../gthumb/gth-test-simple.c:46 -msgid "contains" -msgstr "vsebuje" - -#: ../gthumb/gth-test-simple.c:47 -msgid "starts with" -msgstr "se začne z" - -#: ../gthumb/gth-test-simple.c:48 -msgid "ends with" -msgstr "se konča z" - -#: ../gthumb/gth-test-simple.c:51 -msgid "does not contain" -msgstr "ne vsebuje" - -#: ../gthumb/gth-test-simple.c:52 -msgid "matches" -msgstr "zadetki" - -#: ../gthumb/gth-test-simple.c:56 -msgid "is lower than" -msgstr "je manjše kot" - -#: ../gthumb/gth-test-simple.c:57 -msgid "is greater than" -msgstr "je večje kot" - -#: ../gthumb/gth-test-simple.c:58 -msgid "is equal to" -msgstr "je enako" - -#: ../gthumb/gth-test-simple.c:62 -msgid "is before" -msgstr "je pred" - -#: ../gthumb/gth-test-simple.c:63 -msgid "is after" -msgstr "je po" - -#: ../gthumb/gth-time-selector.c:471 -msgid "Today" -msgstr "Danes" - -#: ../gthumb/gth-time-selector.c:479 -msgid "Now" -msgstr "Sedaj" - -#: ../gthumb/gth-window-actions-entries.h:32 -msgid "Close this window" -msgstr "Zapre to okno" - -#: ../gthumb/gth-window-actions-entries.h:36 -msgid "Close _All Windows" -msgstr "Zapri _vsa okna" - -#: ../gthumb/gtk-utils.c:704 -msgid "Could not display help" -msgstr "Pomoči ni mogoče prikazati" - -#: ../gthumb/gtk-utils.c:991 -#: ../gthumb/gtk-utils.c:1000 -msgid "Could not launch the application" -msgstr "Programa ni mogoče zagnati" - -#: ../gthumb/gtk-utils.c:1103 -msgid "_Copy Here" -msgstr "_Kopiraj sem" - -#: ../gthumb/gtk-utils.c:1108 -msgid "_Move Here" -msgstr "_Premakni sem" - -#: ../gthumb/gtk-utils.c:1113 -msgid "_Link Here" -msgstr "_Poveži sem" - -#: ../gthumb/gtk-utils.c:1122 -msgid "Cancel" -msgstr "Prekliči" - -#: ../gthumb/main.c:72 -msgid "Open a new window" -msgstr "Odpri novo okno" - -#: ../gthumb/main.c:76 -msgid "Start in fullscreen mode" -msgstr "Zaženi v celozaslonskem načinu" - -#: ../gthumb/main.c:80 -msgid "Automatically start a slideshow" -msgstr "Samodejno začni predstavitev" - -#: ../gthumb/main.c:84 -msgid "Automatically import digital camera photos" -msgstr "Samodejno uvozi fotografije iz digitalnega fotoaparata" - -#: ../gthumb/main.c:88 -msgid "Show version" -msgstr "Pokaži različico" - -#. command line options -#: ../gthumb/main.c:539 -msgid "- Image browser and viewer" -msgstr "- Brskalnik in pregledovalnik slik" - -#: ../gthumb/pixbuf-io.c:174 -#, c-format -msgid "Could not find a suitable module to save the image as \"%s\"" -msgstr "Ni mogoče najti primernega modula za shranjevanje slike kot \"%s\"" - -#~ msgid " " -#~ msgstr " " - -#~ msgid "#" -#~ msgstr "#" - -#~ msgid "###" -#~ msgstr "###" - -#~ msgid "%n" -#~ msgstr "%n" +#: ../extensions/list_tools/data/ui/personalize-scripts.ui.h:2 +msgid "Co_mmands:" +msgstr "_Ukazi:" -#~ msgid "%p" -#~ msgstr "%p" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:2 +msgid "_Wait for the command to finish" +msgstr "Po_čakaj na dokončanje ukaza" -#~ msgid "%B" -#~ msgstr "%B" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:3 +msgid "E_xecute command once for every file" +msgstr "I_zvedi ukaz enkrat za vsako datoteko" -#~ msgid "%F" -#~ msgstr "%F" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:4 +msgid "_Terminal command (shell script)" +msgstr "Ukaz _terminala (skript lupine)" -#~ msgid "%U" -#~ msgstr "%U" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:5 +msgid "Sh_ortcut:" +msgstr "Bl_ižnjica:" -#~ msgid "%C" -#~ msgstr "%C" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:6 +msgid "The file uri" +msgstr "Uri datoteke" -#~ msgid "%I" -#~ msgstr "%I" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:7 +msgid "The file path" +msgstr "Pot datoteke" -#~ msgid "%i" -#~ msgstr "%i" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:8 +msgid "The file basename" +msgstr "Osnovno ime datoteke" -#~ msgid "Available _extensions:" -#~ msgstr "Razpoložljive _razširitve:" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:9 +msgid "The parent folder path" +msgstr "Pot nadrejene mape" -#~ msgid "_Categories:" -#~ msgstr "_Kategorije:" +#. Translate only 'message' and 'default_value'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:14 +#, no-c-format +msgid "%ask{ message }{ default value }" +msgstr "%ask{ sporočilo }{ privzeta vrednost }" -#~ msgid "gthumb Extensions" -#~ msgstr "Razširitve gthumb" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:15 +msgid "Ask an input value" +msgstr "Vprašaj vhodno vrednost" -#~ msgid "Could not create the library" -#~ msgstr "Knjižnice ni mogoče ustvariti" +#. Translate only 'attribute name' +#: ../extensions/list_tools/data/ui/script-editor.ui.h:18 +#, no-c-format +msgid "%attr{ attribute name }" +msgstr "%attr{ ime atributa }" -#~ msgid "Could not create the folder" -#~ msgstr "Mape ni mogoče ustvariti" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:19 +#: ../extensions/rename_series/data/ui/rename-series.ui.h:25 +msgid "A file attribute" +msgstr "Atribut datoteke" -#~ msgid "Information" -#~ msgstr "Podrobnosti" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:21 +#, no-c-format +msgid "%N" +msgstr "%N" -#~ msgid "Desaturating image" -#~ msgstr "Zmanjšanje nasičenja slike" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:22 +msgid "The file basename without extension" +msgstr "Osnovno ime datoteke brez pripone" -#~ msgid "Ask" -#~ msgstr "Vprašaj" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:24 +#, no-c-format +msgid "%E" +msgstr "%E" -#~ msgid "Skip" -#~ msgstr "Preskoči" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:25 +msgid "The file extension" +msgstr "Pripona datoteke" -#~ msgid "Use subfolders to organize files" -#~ msgstr "Uporabi podmape za organizacijo datotek" +#. Translate only 'text'. +#: ../extensions/list_tools/data/ui/script-editor.ui.h:28 +#, no-c-format +msgid "%quote{ text }" +msgstr "%quote{ besedilo }" -#~ msgid "Use" -#~ msgstr "Uporabi" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:29 +msgid "Quote the text " +msgstr "Citiraj besedilo" -#~ msgid "Extension" -#~ msgstr "Razširitev" +#: ../extensions/list_tools/data/ui/script-editor.ui.h:30 +msgid "_Command:" +msgstr "_Ukaz:" -#~ msgid "Activate, deactivate and configure the gthumb extensions" -#~ msgstr "Omogoči, onemogoči in nastavi razširitve gthumb" +#: ../extensions/list_tools/dlg-personalize-scripts.c:257 +msgid "Script" +msgstr "Skript" -#~ msgid "gthumb" -#~ msgstr "gThumb" +#: ../extensions/list_tools/dlg-personalize-scripts.c:271 +msgid "Shortcut" +msgstr "Bližnjica" -#~ msgid "Unable to show '%s'" -#~ msgstr "Ni mogoče pokazati '%s'" +#: ../extensions/list_tools/dlg-personalize-scripts.c:285 +#: ../gthumb/dlg-personalize-filters.c:252 +msgid "Show" +msgstr "Pokaži" -#~ msgid "Unable to open '%s'" -#~ msgstr "Ni mogoče odpreti '%s'" +#: ../extensions/list_tools/dlg-personalize-scripts.c:355 +msgid "Could not save the script" +msgstr "Skripta ni mogoče shraniti" -#~ msgid "Do _not change folder" -#~ msgstr "_Ne spremeni mape" +#: ../extensions/list_tools/dlg-personalize-scripts.c:406 +msgid "New Command" +msgstr "Nov ukaz" -#~ msgid "15ʺ screen ( 800 x 600 )" -#~ msgstr "15ʺ zaslon ( 800 x 600 )" +#: ../extensions/list_tools/dlg-personalize-scripts.c:433 +msgid "Edit Command" +msgstr "Uredi ukaz" -#~ msgid "17ʺ screen ( 1024 x 768 )" -#~ msgstr "17ʺ zaslon ( 1024 x 768 )" +#: ../extensions/list_tools/dlg-personalize-scripts.c:461 +msgid "Are you sure you want to delete the selected command?" +msgstr "Ali ste prepričani, da želite izbrisati izbran ukaz?" -#~ msgid "_Overwrite existing files" -#~ msgstr "_Prepiši obstoječe datoteke" +#: ../extensions/list_tools/gth-script.c:610 +msgid "Enter a value:" +msgstr "Vnesite vrednost:" -#~ msgid "Close" -#~ msgstr "Zapri" +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:560 +#: ../extensions/webalbums/gth-web-exporter.c:572 +#: ../extensions/webalbums/gth-web-exporter.c:580 +msgid "Malformed command" +msgstr "Slabo oblikovan ukaz" -#~ msgid "file modified date " -#~ msgstr "datum spremembe datoteke" +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 +msgid "none" +msgstr "brez" -#~ msgid "Edit file metadata" -#~ msgstr "Uredi metapodatke datoteke" +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 +#, c-format +msgid "key %d on the numeric keypad" +msgstr "tipka %d na številčni tipkovnici" -#~ msgid "Paolo Bacchilega " -#~ msgstr "Paolo Bacchilega " +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 +#, c-format +msgid "No command specified" +msgstr "Ukaz ni določen" -#~ msgid "_Preserve original aspect ratio" -#~ msgstr "O_hrani izvorno razmerje velikosti" +#: ../extensions/list_tools/gth-script-task.c:83 +#, c-format +msgid "Command exited abnormally with status %d" +msgstr "Ukaz je končal nepravilno s stanjem %d" -#~ msgid "Show _grid" -#~ msgstr "Pokaži _mrežo" +#: ../extensions/list_tools/list_tools.extension.in.in.h:1 +msgid "File list tools" +msgstr "Orodja seznama datotek" -#~ msgid "4 x 3 (Book, DVD)" -#~ msgstr "4 x 3 (knjiga, DVD)" +#: ../extensions/list_tools/list_tools.extension.in.in.h:2 +msgid "Scripting and batch manipulation of files." +msgstr "Skripti in paketno upravljanje datotek." -#~ msgid "5 x 7" -#~ msgstr "5 x 7" +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "S" +msgstr "J" -#~ msgid "8 x 10" -#~ msgstr "8 x 10" +#: ../extensions/map_view/gth-map-view.c:130 +msgctxt "Cardinal point" +msgid "N" +msgstr "S" -#~ msgid "gtk-close" -#~ msgstr "gtk-zapri" +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "W" +msgstr "Z" -#~ msgid "gtk-edit" -#~ msgstr "gtk-uredi" +#: ../extensions/map_view/gth-map-view.c:132 +msgctxt "Cardinal point" +msgid "E" +msgstr "V" -#~ msgid "gtk-help" -#~ msgstr "gtk-pomoč" +#: ../extensions/map_view/gth-map-view.c:205 +#: ../extensions/map_view/map_view.extension.in.in.h:1 +msgid "Map" +msgstr "Zemljevid" -#~ msgid "gtk-new" -#~ msgstr "gtk-novo" +#. No GPS label +#: ../extensions/map_view/gth-map-view.c:276 +msgid "The geographical position information is not available for this image." +msgstr "Podatki zemljepisne lega za to sliko niso na voljo." -#~ msgid "gtk-remove" -#~ msgstr "gtk-odstrani" +#: ../extensions/map_view/map_view.extension.in.in.h:2 +msgid "View the photo position on the map" +msgstr "Poglej mesto zajema slike na zemljevidu." -#~ msgid "gtk-cancel" -#~ msgstr "gtk-prekliči" +#: ../extensions/photobucket/callbacks.c:54 +msgid "Photobucket..." +msgstr "Photobucket ..." -#~ msgid "appointment-soon" -#~ msgstr "sestanek-kamlu" +#: ../extensions/photobucket/callbacks.c:55 +msgid "Upload photos to Photobucket" +msgstr "Pošiljanje fotografij na Photobucket" -#~ msgid "camera-photo" -#~ msgstr "fotografija-fotoaparata" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:1 +msgid "Tiny ( 100 x 75 )" +msgstr "Drobcena ( 100 x 75 )" -#~ msgid "Upload to Flickr" -#~ msgstr "Pošlji na Flickr" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:2 +msgid "Small ( 160 x 120 )" +msgstr "Majhna ( 160 x 120 )" -#~ msgid "112" -#~ msgstr "112" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:3 +msgid "Medium ( 320 x 240 )" +msgstr "Srednja ( 320 x 240 )" -#~ msgid "128" -#~ msgstr "128" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:4 +msgid "Large ( 640 x 480 )" +msgstr "Velika ( 640 x 480 )" -#~ msgid "164" -#~ msgstr "164" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:5 +msgid "15ʺ screen ( 800 x 600 )" +msgstr "15ʺ zaslon ( 800 x 600 )" -#~ msgid "200" -#~ msgstr "200" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:6 +msgid "17ʺ screen ( 1024 x 768 )" +msgstr "17ʺ zaslon ( 1024 x 768 )" -#~ msgid "256" -#~ msgstr "256" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:7 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:297 +msgid "1 megabyte file size" +msgstr "Velikost datoteke 1 megabajt" -#~ msgid "48" -#~ msgstr "48" +#: ../extensions/photobucket/data/ui/export-to-photobucket.ui.h:16 +msgid "_Scramble filenames" +msgstr "_Predelaj imena datotek" -#~ msgid "64" -#~ msgstr "64" +#: ../extensions/photobucket/data/ui/photobucket-album-properties.ui.h:2 +msgid "_Container:" +msgstr "_Zabojnik:" -#~ msgid "85" -#~ msgstr "85" +#: ../extensions/photobucket/dlg-export-to-photobucket.c:291 +msgid "Tiny ( 100 × 75 )" +msgstr "Drobcena ( 100 x 75 )" -#~ msgid "95" -#~ msgstr "95" +#: ../extensions/photobucket/dlg-export-to-photobucket.c:292 +msgid "Small ( 160 × 120 )" +msgstr "Majhna ( 160 x 120 )" -#~ msgid "1" -#~ msgstr "1" +#: ../extensions/photobucket/dlg-export-to-photobucket.c:293 +msgid "Medium ( 320 × 240 )" +msgstr "Srednja ( 320 x 240 )" -#~ msgid "16" -#~ msgstr "16" +#: ../extensions/photobucket/dlg-export-to-photobucket.c:294 +msgid "Large ( 640 × 480 )" +msgstr "Velika ( 640 x 480 )" -#~ msgid "180°" -#~ msgstr "180°" +#: ../extensions/photobucket/dlg-export-to-photobucket.c:295 +msgid "15ʺ screen ( 800 × 600 )" +msgstr "15ʺ zaslon ( 800 x 600 )" -#~ msgid "270°" -#~ msgstr "270°" +#: ../extensions/photobucket/dlg-export-to-photobucket.c:296 +msgid "17ʺ screen ( 1024 × 768 )" +msgstr "17ʺ zaslon ( 1024 x 768 )" -#~ msgid "32" -#~ msgstr "32" +#: ../extensions/photobucket/dlg-export-to-photobucket.c:304 +msgid "2 megabyte file size" +msgstr "Velikost datoteke 2 megabajta" -#~ msgid "4" -#~ msgstr "4" +#: ../extensions/photobucket/photobucket.extension.in.in.h:1 +msgid "PhotoBucket" +msgstr "PhotoBucket" -#~ msgid "8" -#~ msgstr "8" +#: ../extensions/photobucket/photobucket.extension.in.in.h:2 +msgid "Upload images to PhotoBucket" +msgstr "Pošiljanje slik na PhotoBucket" -#~ msgid "90°" -#~ msgstr "90°" +#: ../extensions/photo_importer/actions.c:71 +msgid "Import" +msgstr "Uvoz i" -#~ msgid " " -#~ msgstr " " +#: ../extensions/photo_importer/callbacks.c:52 +msgid "_Removable Device..." +msgstr "_Odstranljiva naprava ..." -#~ msgid "_Crop" -#~ msgstr "_Obreži" +#: ../extensions/photo_importer/callbacks.c:53 +msgid "Import photos and other files from a removable device" +msgstr "Uvozi slike in druge datoteke z odstranljive naprave" -#~ msgid "Bytes" -#~ msgstr "Bajti" +#: ../extensions/photo_importer/callbacks.c:56 +msgid "F_older..." +msgstr "_Mapa ..." -#~ msgid "Exposure mode" -#~ msgstr "Način osvetlitve" +#: ../extensions/photo_importer/callbacks.c:57 +msgid "Import photos and other files from a folder" +msgstr "Uvozi slike in druge datoteke iz mape" -#~ msgid "Flash" -#~ msgstr "Bliskavica" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:1 +msgid "_Rotate the images physically" +msgstr "_Fizično zavrti slike" -#~ msgid "Shutter speed" -#~ msgstr "Hitrost zaklopke" +#: ../extensions/photo_importer/data/ui/photo-importer-options.ui.h:2 +msgid "After importing from a device:" +msgstr "Po uvažanju z naprave:" -#~ msgid "Aperture value" -#~ msgstr "Vrednost zaslonke" +#. view label +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:3 +#: ../gthumb/gth-filterbar.c:414 +msgid "S_how:" +msgstr "_Pokaži:" -#~ msgid "Focal length" -#~ msgstr "Goriščna razdalja" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:4 +msgid "_Tags:" +msgstr "O_znake:" -#~ msgid "Camera model" -#~ msgstr "Model fotoaparata" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:5 +msgid "_Event:" +msgstr "_Dogodek:" -#~ msgid "Categories:" -#~ msgstr "Kategorije:" +#: ../extensions/photo_importer/data/ui/photo-importer.ui.h:7 +msgid "_Delete the imported files from the source" +msgstr "_Izbriši uvožene slike z vira" -#~ msgid "Information on Channel:" -#~ msgstr "Podrobnosti kanala:" +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 +msgid "Could not import the files" +msgstr "Datotek ni mogoče uvoziti" -#~ msgid "Choose a Catalog" -#~ msgstr "Izbor kataloga" +#. translators: %d is the number of files, %s the total size +#: ../extensions/photo_importer/dlg-photo-importer.c:299 +#, c-format +msgid "Files to import: %d (%s)" +msgstr "Datoteke za uvoz: %d (%s)" -#~ msgid "Comm_ent" -#~ msgstr "_Opomba" +#: ../extensions/photo_importer/dlg-photo-importer.c:339 +msgid "Could not load the folder" +msgstr "Mape ni mogoče naložiti" -#~ msgid "Open Images" -#~ msgstr "Odpri slike" +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:1921 +msgid "Getting folder listing..." +msgstr "Pridobivanje seznama map ..." -#~ msgid "Overwrite Image" -#~ msgstr "Prepiši sliko" +#: ../extensions/photo_importer/dlg-photo-importer.c:415 +msgid "Empty" +msgstr "Prazno" -#~ msgid "Photo _Data (EXIF)" -#~ msgstr "Podatki _fotografije (EXIF)" +#: ../extensions/photo_importer/dlg-photo-importer.c:586 +msgid "Import from Removable Device" +msgstr "Uvozi z odstranljive naprave" -#~ msgid "R_ecent applications:" -#~ msgstr "_Nedavni programi:" +#: ../extensions/photo_importer/dlg-photo-importer.c:618 +msgid "Import from Folder" +msgstr "Uvozi iz mape" -#~ msgid "_Application:" -#~ msgstr "_Program:" +#: ../extensions/photo_importer/photo_importer.extension.in.in.h:1 +msgid "Import photos" +msgstr "Uvozi fotografije" -#~ msgid "_Next" -#~ msgstr "_Naslednji" +#: ../extensions/photo_importer/photo_importer.extension.in.in.h:2 +msgid "Import photos from removable devices." +msgstr "Uvozi fotografije z odstranljivih naprav." -#~ msgid "_Previous" -#~ msgstr "_Predhodni" +#: ../extensions/picasaweb/callbacks.c:59 +#: ../extensions/picasaweb/callbacks.c:64 +msgid "_Picasa Web Album..." +msgstr "Spletni album _Picasa ..." -#~ msgid "Camera Model" -#~ msgstr "Model fotoaparata" +#: ../extensions/picasaweb/callbacks.c:60 +msgid "Download photos from Picasa Web Album" +msgstr "Prejmi fotografije s spletnega albuma Picasa" -#~ msgid "" -#~ "If this checkbox is enabled and the imported photo contains an Exif " -#~ "orientation tag, the image data will be physically transformed " -#~ "(losslessly) so that the viewed image looks the same as before but the " -#~ "orientation tag is reset to \"top left\". If this checkbox is not " -#~ "enabled, the image data and the orientation tag are both left unchanged. " -#~ "The image will be displayed identically by gthumb for both possibilities, " -#~ "but for maximum compatibility with other applications this checkbox " -#~ "should be enabled." -#~ msgstr "" -#~ "Izbrana možnost v primeru, da uvožena fotografija vsebuje Exif oznako " -#~ "usmerjenosti, omogoča fizično preoblikovanje (brez izgub), tako da je " -#~ "slika videti enako, oznaka usmerjenosti pa je ponastavljena na \"zgoraj " -#~ "levo\". V primeru da možnost ni izbrana, so slikovni podatki iz oznake " -#~ "usmerjenosti nespremenjeni. Program bo sliko v obeh primerih prikazal " -#~ "enako, toda izbrana možnost omogoča največjo združljivost z ostalimi " -#~ "programi. " +#: ../extensions/picasaweb/callbacks.c:65 +msgid "Upload photos to Picasa Web Album" +msgstr "Pošlji fotografije na spletni album Picasa" -#~ msgid "Select a camera model" -#~ msgstr "Izbor modela fotoaparata" +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:1 +msgid "Export to Picasa Web Albums" +msgstr "Izvozi v spletne albume Picasa" -#~ msgid "Update previews" -#~ msgstr "Posodobitev predogledov" +#: ../extensions/picasaweb/data/ui/export-to-picasaweb.ui.h:5 +msgid "_Albums:" +msgstr "_Albumi:" -#~ msgid "_Film:" -#~ msgstr "_Film:" +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:1 +msgid "Import from Picasa Web Album" +msgstr "Uvozi iz spletnega albuma Picasa" -#~ msgid "A_vailable categories:" -#~ msgstr "_Kategorije na voljo:" +#: ../extensions/picasaweb/data/ui/import-from-picasaweb.ui.h:5 +msgid "_Album:" +msgstr "_Album:" -#~ msgid "Categories" -#~ msgstr "Kategorije" +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:1 +msgid "_E-Mail:" +msgstr "_Elektronska pošta:" -#~ msgid "Remove selected category" -#~ msgstr "Odstrani izbrano kategorijo" +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:2 +msgid "Type the characters you see in the picture below. Letters are not case-sensitive." +msgstr "Vnesite znake, ki jih vidite na sliki spodaj. Črke niso občutljive na velikost." -#~ msgid "_Selected categories:" -#~ msgstr "_Izbrane kategorije:" +#: ../extensions/picasaweb/data/ui/picasa-web-account-properties.ui.h:3 +msgid "_Password:" +msgstr "_Geslo:" -#~ msgid "Compression" -#~ msgstr "Stiskanje" +#: ../extensions/picasaweb/data/ui/picasa-web-album-properties.ui.h:4 +msgid "Public" +msgstr "Javno" -#~ msgid "Image type" -#~ msgstr "Vrsta slike:" +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 +msgid "Could not get the album list" +msgstr "Ni mogoče dobiti seznama albumov" -#~ msgid "JPEG Options" -#~ msgstr "Možnosti JPEG" +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 +msgid "Picasa Web Album" +msgstr "Spletni album Picasa" -#~ msgid "Overwrite mode:" -#~ msgstr "Način prepisovanja:" +#: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 +msgid "Account" +msgstr "Račun" -#~ msgid "R_emove original" -#~ msgstr "O_dstrani izvirnik" +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 +msgid "Could not load the file" +msgstr "Ni mogoče naložiti datoteke" -#~ msgid "" -#~ "Skip\n" -#~ "Rename\n" -#~ "Ask\n" -#~ "Overwrite" -#~ msgstr "" -#~ "Preskoči\n" -#~ "Preimenuj\n" -#~ "Vprašaj\n" -#~ "Prepiši" +#: ../extensions/picasaweb/picasaweb.extension.in.in.h:1 +msgid "Picasa Web Albums" +msgstr "Picasa spletni albumi" -#~ msgid "TGA Options" -#~ msgstr "Možnosti TGA" +#: ../extensions/picasaweb/picasaweb.extension.in.in.h:2 +msgid "Upload images to Picasa Web Albums" +msgstr "Pošlje slike na Picasa spletne albume" -#~ msgid "TIFF Options" -#~ msgstr "Možnosti TIFF" +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:1 +msgid "_Default extension:" +msgstr "_Privzete pripona:" -#~ msgid "Selection" -#~ msgstr "Izbor" +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:2 +msgid "_Quality:" +msgstr "_Kakovost:" -#~ msgid "Scale ratio" -#~ msgstr "Razmerje merila" +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:3 +msgid "_Smoothing:" +msgstr "_Glajenje:" -#~ msgid "Brightness - Contrast" -#~ msgstr "Svetlost - kontrast" +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:4 +msgid "Opti_mize" +msgstr "Opti_miziraj" -#~ msgid "Color Balance" -#~ msgstr "Barvno uravnoteženje" +#: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:5 +msgid "_Progressive" +msgstr "_Napredno" -#~ msgid "Hue - Saturation" -#~ msgstr "Odtenek - nasičenost" +#: ../extensions/pixbuf_savers/data/ui/png-options.ui.h:1 +msgid "Compression _level:" +msgstr "_Raven stiskanja:" -#~ msgid "Posterize" -#~ msgstr "Posteriziraj" +#: ../extensions/pixbuf_savers/data/ui/save-options-preferences.ui.h:1 +msgid "Default options:" +msgstr "Privzete možnosti:" -#~ msgid "Preserve l_uminosity" -#~ msgstr "Ohrani osve_tljenost" +#: ../extensions/pixbuf_savers/data/ui/tga-options.ui.h:1 +msgid "_RLE compression" +msgstr "Stiskanje _RLE" -#~ msgid "Width:" -#~ msgstr "Širina:" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:2 +msgid "_No compression" +msgstr "_Brez stiskanja" -#~ msgid "_Hue:" -#~ msgstr "_Odtenek:" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:3 +msgid "No_rmal (Deflate)" +msgstr "O_bičajno (stisnjeno)" -#~ msgid "_Levels:" -#~ msgstr "_Ravni:" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:4 +msgid "_Loss compression (JPEG)" +msgstr "_Stiskanje z izgubo (JPEG)" -#~ msgid "_Lightness:" -#~ msgstr "_Svetlost:" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:5 +msgid "Compression" +msgstr "Stiskanje" -#~ msgid "_Scale" -#~ msgstr "_Umeritev" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:8 +msgid "dpi" +msgstr "dpi" -#~ msgid "Background style" -#~ msgstr "Slog ozadja" +#: ../extensions/pixbuf_savers/data/ui/tiff-options.ui.h:9 +msgid "Resolution" +msgstr "Ločljivost" -#~ msgid "Caption" -#~ msgstr "Naslov" +#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 +msgid "JPEG" +msgstr "JPEG" -#~ msgid "Footer" -#~ msgstr "Noga" +#: ../extensions/pixbuf_savers/gth-png-saver.c:140 +msgid "PNG" +msgstr "PNG" -#~ msgid "Header and footer" -#~ msgstr "Glava in noga" +#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 +#: ../gthumb/gth-buffer-data.c:84 +msgid "Insufficient memory" +msgstr "Nezadostna količina pomnilnika" -#~ msgid "Header" -#~ msgstr "Glava" +#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 +msgid "TGA" +msgstr "TGA" -#~ msgid "Index images" -#~ msgstr "Slike kazala" +#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 +msgid "TIFF" +msgstr "TIFF" -#~ msgid "Page size" -#~ msgstr "Velikost strani" +#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:1 +msgid "Save images" +msgstr "Shrani slike" -#~ msgid "Note: # (enumerator)." -#~ msgstr "Sproročilo: # (številčnik)." +#: ../extensions/pixbuf_savers/pixbuf_savers.extension.in.in.h:2 +msgid "Save images in common file formats such as JPEG, PNG and TIFF" +msgstr "Shrani slike v običajnih vrstah datotek kot so JPEG, PNG in TIFF" -#~ msgid "" -#~ "Note: %p (page number), %n (total number of pages)." -#~ msgstr "" -#~ "Sporočilo: %p (številka strani), %n (skupno število " -#~ "strani)." +#: ../extensions/raw_files/raw_files.extension.in.in.h:1 +msgid "Raw format support" +msgstr "Podpora za surovo vrsto" -#~ msgid "Co_mment" -#~ msgstr "_Opomba" +#: ../extensions/raw_files/raw_files.extension.in.in.h:2 +msgid "Allow to load raw format images." +msgstr "Dovoli nalaganje slik surove vrste." -#~ msgid "F_ooter:" -#~ msgstr "_Noga:" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 +msgid "_X:" +msgstr "_X:" -#~ msgid "Frame co_lor:" -#~ msgstr "_Barva okvirja:" +#: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:2 +msgid "_Y:" +msgstr "_Y:" -#~ msgid "H_eader:" -#~ msgstr "_Glava:" +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 +msgid "Red Eye Removal..." +msgstr "Odstranjevanje rdečih oči ..." -#~ msgid "Header/Footer" -#~ msgstr "Glava/noga" +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 +msgid "Red Eye Removal" +msgstr "Odstranjevanje rdečih oči" -#~ msgid "Hei_ght:" -#~ msgstr "_Višina:" +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 +msgid "Remove the red eye effect caused by camera flashes" +msgstr "Odstrani učinek rdečih oči, ki ga povzročijo bliskavice" -#~ msgid "Image dim_ensions" -#~ msgstr "_Mere slike" +#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:1 +msgid "Red-eye removal" +msgstr "Odstranjevanje rdečih oči" -#~ msgid "Index Image Style" -#~ msgstr "Slog slike kazala" +#: ../extensions/red_eye_removal/red_eye_removal.extension.in.in.h:2 +msgid "Tool to remove the red-eye effect from a photo." +msgstr "Orodje za odstranjevanje učinka rdečih oči s fotografije." -#~ msgid "Rows a_nd columns" -#~ msgstr "Vrstice _in stolpci" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:1 +msgid "digits" +msgstr "številke" -#~ msgid "Shadow out" -#~ msgstr "Senca iz" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:2 +msgid "format:" +msgstr "oblika:" -#~ msgid "Sor_t:" -#~ msgstr "Razvrs_ti:" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:3 +msgid "remove" +msgstr "odstrani" -#~ msgid "Wi_dth:" -#~ msgstr "Ši_rina:" +#: ../extensions/rename_series/data/ui/code-selector.ui.h:4 +msgid "add" +msgstr "dodaj" -#~ msgid "_Draw frame" -#~ msgstr "_Nariši okvir" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:1 +msgid "Rename" +msgstr "Preimenuj" -#~ msgid "by name" -#~ msgstr "po imenu" +#. Translators: this is the text case (upper or lower case). +#: ../extensions/rename_series/data/ui/rename-series.ui.h:6 +msgid "Cas_e:" +msgstr "V_elikost črk:" -#~ msgid "jpeg" -#~ msgstr "jpeg" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:7 +msgid "Edit template" +msgstr "Uredi predlogo" -#~ msgid "png" -#~ msgstr "png" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:9 +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:34 +msgid "The original filename" +msgstr "Izvirno ime datoteke" -#~ msgid "0:" -#~ msgstr "0:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:10 +msgid "The original extension" +msgstr "Izvirna pripona" -#~ msgid "112 x 112" -#~ msgstr "112 x 112" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:13 +msgid "The original enumerator" +msgstr "Izvirni števec" -#~ msgid "128 x 128" -#~ msgstr "128 x 128" +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:16 +#, no-c-format +msgid "%M{ format }" +msgstr "%M{ oblika }" -#~ msgid "164 x 164" -#~ msgstr "164 x 164" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:17 +msgid "The modification date" +msgstr "Izviren datum spremembe" -#~ msgid "1:" -#~ msgstr "1:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:21 +msgid "The digitalization date" +msgstr "Izviren datum digitalizacije" -#~ msgid "256 x 256" -#~ msgstr "256 x 256" +#. translate only the text in the curly brackets +#: ../extensions/rename_series/data/ui/rename-series.ui.h:24 +#, no-c-format +msgid "%A{ identifier }" +msgstr "%A{ določilnik }" -#~ msgid "2:" -#~ msgstr "2:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:26 +msgid "_Template:" +msgstr "_Predloga:" -#~ msgid "3:" -#~ msgstr "3:" +#: ../extensions/rename_series/data/ui/rename-series.ui.h:27 +msgid "Re_verse Order" +msgstr "O_brnjen vrstni red" -#~ msgid "4:" -#~ msgstr "4:" +#: ../extensions/rename_series/dlg-rename-series.c:58 +msgid "Enumerator" +msgstr "Števec" -#~ msgid "64 x 64" -#~ msgstr "64 x 64" +#: ../extensions/rename_series/dlg-rename-series.c:59 +msgid "Original filename" +msgstr "Izvirno ime datoteke" -#~ msgid "6:" -#~ msgstr "6:" +#: ../extensions/rename_series/dlg-rename-series.c:60 +msgid "Original extension" +msgstr "Izvirna pripona" -#~ msgid "7:" -#~ msgstr "7:" +#: ../extensions/rename_series/dlg-rename-series.c:61 +msgid "Original enumerator" +msgstr "Izvirni števec" -#~ msgid "85 x 85" -#~ msgstr "85 x 85" +#: ../extensions/rename_series/dlg-rename-series.c:62 +msgid "Modification date" +msgstr "Datum spremembe" -#~ msgid "8:" -#~ msgstr "8:" +#: ../extensions/rename_series/dlg-rename-series.c:63 +msgid "Digitalization date" +msgstr "Datum digitalizacije" -#~ msgid "95 x 95" -#~ msgstr "95 x 95" +#: ../extensions/rename_series/dlg-rename-series.c:64 +msgid "File attribute" +msgstr "Atribut datoteke" -#~ msgid "9:" -#~ msgstr "9:" +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 +msgid "Could not rename the files" +msgstr "Ni mogoče preimenovati datotek" -#~ msgid "Direction" -#~ msgstr "Smer" +#: ../extensions/rename_series/dlg-rename-series.c:780 +msgid "Could not save the template" +msgstr "Predloge ni mogoče shraniti" -#~ msgid "Hide/Show" -#~ msgstr "Pokaži/skrij" +#: ../extensions/rename_series/dlg-rename-series.c:798 +msgid "Edit Template" +msgstr "Uredi predlogo" -#~ msgid "Interface" -#~ msgstr "Vmesnik" +#: ../extensions/rename_series/dlg-rename-series.c:856 +msgid "Old Name" +msgstr "Staro ime" -#~ msgid "Other" -#~ msgstr "Ostalo" +#: ../extensions/rename_series/dlg-rename-series.c:867 +msgid "New Name" +msgstr "Novo ime" -#~ msgid "Slide show" -#~ msgstr "Diapredstavitev" +#: ../extensions/rename_series/dlg-rename-series.c:944 +msgid "Keep original case" +msgstr "Ohrani izvirno velikost" -#~ msgid "Viewer" -#~ msgstr "Pregledovalnik" +#: ../extensions/rename_series/dlg-rename-series.c:945 +msgid "Convert to lower-case" +msgstr "Pretvori v male črke" -#~ msgid "" -#~ "Special characters:\n" -#~ "%F = all selected filenames on one line, space delimited\n" -#~ "%f = a single filename, including path\n" -#~ "%n = a single filename, including path, with no extension\n" -#~ "%e = a single extension (starting with a period)\n" -#~ "%p = the parent folder of the single file\n" -#~ "Scripts with the %F code will be executed just once, regardless of the " -#~ "number of files selected. All other scripts will be executed once per " -#~ "selected file.\n" -#~ "The default scripts are explained in the Help file." -#~ msgstr "" -#~ "Posebni znaki\n" -#~ "%F = vsa izbrana imena datotek v eni vrstici, ločena s presledki\n" -#~ "%f = eno ime datoteke, vključno s potjo\n" -#~ "%n =eno ime datoteke, vključno s potjo, brez končnice\n" -#~ "%e = ena končnica (začenjajoča s piko)\n" -#~ "%p = starševska mapa ene datoteke\n" -#~ "Skripti s kodo %F bodo izvedeni samo enkrat ne glede na število izbranih " -#~ "datotek. Ostali skripti bodo izvedeni enkrat na izbrano datoteko.\n" -#~ "Privzeti skripti so razloženi v datoteki pomoči." +#: ../extensions/rename_series/dlg-rename-series.c:946 +msgid "Convert to upper-case" +msgstr "Pretvori v velike črke" -#~ msgid "C_lick policy:" -#~ msgstr "Pravila k_lika:" +#: ../extensions/rename_series/gth-rename-task.c:167 +msgid "Renaming files" +msgstr "Preimenovanje datotek" -#~ msgid "D_elay before changing image:" -#~ msgstr "_Zamik pred spremembo slike:" +#: ../extensions/rename_series/rename_series.extension.in.in.h:1 +msgid "Rename files" +msgstr "Preimenuj datoteke" -#~ msgid "For_ward" -#~ msgstr "_Naprej" +#: ../extensions/rename_series/rename_series.extension.in.in.h:2 +msgid "Rename series of files." +msgstr "Preimenuj zaporedje datotek." -#~ msgid "Go to last _visited folder or catalog" -#~ msgstr "Pojdi na zadnjo _obiskano mapo ali katalog" +#: ../extensions/resize_images/callbacks.c:45 +msgid "Resize Images..." +msgstr "Spremeni velikost slik ..." -#~ msgid "Hot Keys" -#~ msgstr "Tipkovne bližnjice" +#: ../extensions/resize_images/callbacks.c:46 +msgid "Resize the selected images" +msgstr "Spremeni velikost izbranih slik" -#~ msgid "" -#~ "Keys 0-9 on the numeric keypad can be used in the browser to open or " -#~ "modify the selected images with other applications." -#~ msgstr "" -#~ "Tipke 0-9 se v brskalniku lahko uporabijo za odpiranje ali spreminjanje " -#~ "izbranih slik z drugimi programi." +#: ../extensions/resize_images/data/ui/resize-images.ui.h:1 +msgid "Resize Images" +msgstr "Spremeni velikost slik" -#~ msgid "Layout:" -#~ msgstr "Razpored:" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:2 +msgid "New dimensions" +msgstr "Nove mere" -#~ msgid "Re_verse" -#~ msgstr "_Obrnjeno" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:4 +msgid "_Height:" +msgstr "_Višina:" -#~ msgid "Use a _fading effect when changing image" -#~ msgstr "Uporabi učinek _pojemanja pri menjavi slik " +#: ../extensions/resize_images/data/ui/resize-images.ui.h:5 +msgid "_Preserve original aspect ratios" +msgstr "_Ohrani izvirno razmerje velikosti" -#~ msgid "150" -#~ msgstr "150" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:9 +#: ../gthumb/gth-main-default-metadata.c:49 +msgid "Format" +msgstr "Oblika" -#~ msgid "300" -#~ msgstr "300" +#: ../extensions/resize_images/data/ui/resize-images.ui.h:10 +msgid "pixel" +msgstr "točka" -#~ msgid "600" -#~ msgstr "600" +#: ../extensions/resize_images/dlg-resize-images.c:168 +msgid "Resizing images" +msgstr "Spreminjanje v" -#~ msgid "72" -#~ msgstr "72" +#: ../extensions/resize_images/dlg-resize-images.c:412 +msgid "Keep the original format" +msgstr "Ohrani izvirni zapis" -#~ msgid "Image Sizing" -#~ msgstr "Velikost slik" +#: ../extensions/resize_images/resize_images.extension.in.in.h:1 +msgid "Resize images" +msgstr "Spremeni velikost slik" -#~ msgid "Margins" -#~ msgstr "Robovi" +#: ../extensions/resize_images/resize_images.extension.in.in.h:2 +msgid "Resize series of images." +msgstr "Spremeni velikost zaporedja slik." -#~ msgid "Orientation" -#~ msgstr "Usmerjenost" +#: ../extensions/search/actions.c:49 +#: ../extensions/search/actions.c:117 +#: ../extensions/search/actions.c:123 +msgid "Could not perform the search" +msgstr "Ni mogoče izvesti iskanja" -#~ msgid "Size" -#~ msgstr "Velikost" +#: ../extensions/search/actions.c:54 +msgid "Search Result" +msgstr "Rezultati iskanja" -#~ msgid "" -#~ "Note: Drag the image to move it in the page.\n" -#~ "Click on an image to rotate it." -#~ msgstr "" -#~ "Sporočilo: Za premik slike na strani jo povlecite.\n" -#~ "Za vrtenje sliko kliknite." +#: ../extensions/search/actions.c:76 +msgid "Find" +msgstr "Poišči" -#~ msgid "" -#~ "Note: High-resolution images will be\n" -#~ "down-sampled to this resolution. Increase\n" -#~ "the resolution to get better image quality.\n" -#~ "Decrease it to get shorter print times." -#~ msgstr "" -#~ "Sporočilo: Slike visoke ločljivosti\n" -#~ "bodo pomanjšane na to ločljivost. Za boljšo\n" -#~ "kakovost slik povečajte ločljivost.\n" -#~ "Za hitrejše čase tiskanja ločljivost zmanjšajte." +#: ../extensions/search/callbacks.c:59 +msgid "Find files" +msgstr "Najdi datoteke" -#~ msgid "A4" -#~ msgstr "A4" +#: ../extensions/search/callbacks.c:132 +msgid "Search again" +msgstr "Poišči znova" -#~ msgid "Center _on Page" -#~ msgstr "Na _sredini strani" +#. Translators: This is not a verb, it's a name as in "the search properties". +#: ../extensions/search/callbacks.c:174 +#: ../extensions/search/search.extension.in.in.h:1 +msgid "Search" +msgstr "Poišči" -#~ msgid "Comment _font:" -#~ msgstr "_Pisava opomb:" +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:165 +msgid "all the following rules" +msgstr "vsa naslednja pravila" -#~ msgid "Executive" -#~ msgstr "izvršilno" +#: ../extensions/search/gth-search-editor.c:113 +#: ../gthumb/gth-filter-editor-dialog.c:166 +msgid "any of the following rules" +msgstr "katerokoli od naslednjih pravil" -#~ msgid "I_nclude comment" -#~ msgstr "V_ključi opombo" +#: ../extensions/search/gth-search-task.c:181 +#, c-format +msgid "Files found until now: %s" +msgstr "Do sedaj najdene datoteke: %s" -#~ msgid "Lan_dscape" -#~ msgstr "L_ežeče" +#: ../extensions/search/gth-search-task.c:271 +msgid "Searching..." +msgstr "Iskanje ..." -#~ msgid "Legal" -#~ msgstr "Pravniška besedila" +#: ../extensions/search/gth-search-task.c:277 +msgid "Cancel the operation" +msgstr "Prekliči opravilo" -#~ msgid "Letter" -#~ msgstr "Pismo" +#: ../extensions/search/search.extension.in.in.h:2 +msgid "File search tool." +msgstr "Orodje iskanja datotek." -#~ msgid "P_ortrait" -#~ msgstr "_Pokončno" +#: ../extensions/selections/callbacks.c:62 +msgid "Add to _Selection" +msgstr "Dodaj v iz_bor" -#~ msgid "Paper Details" -#~ msgstr "Podrobnosti papirja" +#: ../extensions/selections/callbacks.c:65 +msgid "Selection 1" +msgstr "Izbor 1" -#~ msgid "Postcard" -#~ msgstr "Razglednica" +#: ../extensions/selections/callbacks.c:70 +msgid "Selection 2" +msgstr "Izbor 2" -#~ msgid "Scale to this size" -#~ msgstr "Umeri na to velikost" +#: ../extensions/selections/callbacks.c:75 +msgid "Selection 3" +msgstr "Izbor 3" -#~ msgid "Tabloid" -#~ msgstr "Tabloid" +#: ../extensions/selections/callbacks.c:180 +#, c-format +msgid "Use Alt-%d to add files to this selection, Ctrl-%d to view this selection." +msgstr "Uporabi Alt-%d za dodajanje datotek temu izboru, Ctrl-%d za ogled tega izbora." -#~ msgid "_Bottom:" -#~ msgstr "_Spodaj:" +#: ../extensions/selections/gth-selections-manager.c:250 +#, c-format +msgid "Selection %d" +msgstr "Izbor %d" -#~ msgid "Actual Size" -#~ msgstr "Dejanska velikost" +#: ../extensions/selections/gth-selections-manager.c:253 +#: ../extensions/selections/selections.extension.in.in.h:1 +msgid "Selections" +msgstr "Izbori" -#~ msgid "Zoom In" -#~ msgstr "Približaj" +#: ../extensions/selections/selections.extension.in.in.h:2 +msgid "Advanced file selection." +msgstr "Napredna izbira datotek" -#~ msgid "Zoom Out" -#~ msgstr "Oddalji" +#: ../extensions/slideshow/callbacks.c:56 +msgid "_Slideshow" +msgstr "_Predstavitev" -#~ msgid "Zoom to Fit" -#~ msgstr "Prilagodi velikost" +#: ../extensions/slideshow/callbacks.c:57 +msgid "View as a slideshow" +msgstr "Poglej kot predstavitev" -#~ msgid "Search criteria" -#~ msgstr "Iskalni pogoji" +#: ../extensions/slideshow/callbacks.c:410 +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:2 +#: ../extensions/slideshow/preferences.c:162 +#: ../extensions/slideshow/slideshow.extension.in.in.h:1 +msgid "Slideshow" +msgstr "Predstavitev" -#~ msgid "Search scope" -#~ msgstr "Doseg iskanja" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:1 +msgid "_Personalize" +msgstr "_Ukaz po meri" -#~ msgid "After" -#~ msgstr "Po" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:3 +msgid "_Transition effect:" +msgstr "Učinek _prehoda:" -#~ msgid "Any" -#~ msgstr "Katerikoli" +#. This is the first part of the phrase "change automatically, every x seconds", where x is an input control that let the user choose a value. +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 +msgid "_Change automatically, every" +msgstr "S_amodejno spremeni vsakih" -#~ msgid "Before" -#~ msgstr "Pred" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:7 +msgid "_Restart when finished" +msgstr "Znova _predvajaj po koncu predvajanja" -#~ msgid "Choose categories from the saved list" -#~ msgstr "Izberite kategorije iz shranjenega seznama" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:8 +msgid "R_andom order" +msgstr "N_aključni vrsti red" -#~ msgid "Equal to" -#~ msgstr "Enako" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:9 +msgid "Playlist" +msgstr "Seznam predvajanja" -#~ msgid "Found images:" -#~ msgstr "Najdene slike:" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:10 +msgid "Add files to the playlist" +msgstr "Dodaj datoteke na seznam predvajanja" -#~ msgid "Match a_ll selected categories" -#~ msgstr "Skladaj z _vsemi izbranimi kategorijami" +#: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:11 +msgid "Remove the selected files" +msgstr "Odstrani izbrane datoteke" -#~ msgid "Match a_ny selected category" -#~ msgstr "Skladaj _katerokoli izbrano kategorijo" +#: ../extensions/slideshow/gth-slideshow.c:229 +msgid "Playing slideshow" +msgstr "Predvajanje predstavitve" -#~ msgid "New _Search..." -#~ msgstr "Novo i_skanje ..." +#: ../extensions/slideshow/gth-slideshow-preferences.c:184 +msgid "Choose the files to play" +msgstr "Izbor datotek za predvajanje" -#~ msgid "Search Progress" -#~ msgstr "Napredek iskanja" +#: ../extensions/slideshow/gth-slideshow-preferences.c:193 +msgid "Audio files" +msgstr "Zvočne datoteke" -#~ msgid "_Edit Search" -#~ msgstr "_Uredi iskanje" +#: ../extensions/slideshow/gth-slideshow-preferences.c:259 +msgid "Random" +msgstr "Naključno" -#~ msgid "Change to:" -#~ msgstr "Spremeni v:" +#: ../extensions/slideshow/main.c:283 +msgid "Push from right" +msgstr "Potisk z desne" -#~ msgid "Write to CD" -#~ msgstr "Zapiši na CD" +#: ../extensions/slideshow/main.c:289 +msgid "Push from bottom" +msgstr "Potisk od spodaj" -#~ msgid "" -#~ "Note: JPEG transformations are normally lossless.\n" -#~ "When viewing images, you can use the [ and ] shortcut\n" -#~ "keys to rotate and save losslessly, bypassing this dialog." -#~ msgstr "" -#~ "Sporočilo: JPEG preoblikovanja so običajno brez izgub.\n" -#~ "Med ogledovanjem slik lahko z uporabo tipkovnih bližnjic\n" -#~ "[ in ] za vrtenje in shranjevanje brez izgub obidete to pogovorno okno." +#: ../extensions/slideshow/main.c:295 +msgid "Slide from right" +msgstr "Zdrsni z desne" -#~ msgid "" -#~ "Special characters: # (enumerator), %f (original " -#~ "filename), %d (image date), %s (image size), %e (original extension)." -#~ msgstr "" -#~ "Posebni znaki: # (številčnik), %f (izvirno ime " -#~ "datoteke), %d (datum slike), %s (velikost slike), %e (izvirna končnica)." +#: ../extensions/slideshow/main.c:301 +msgid "Slide from bottom" +msgstr "Zdrsni od spodaj" -#~ msgid "A_djust timezone:" -#~ msgstr "P_rilagodi časovni pas:" +#: ../extensions/slideshow/main.c:307 +msgid "Fade in" +msgstr "Postopno ojačanje" -#~ msgid "Apply physical _transform" -#~ msgstr "Uporabi fizično p_reoblikovanje" +#: ../extensions/slideshow/main.c:313 +msgid "Flip page" +msgstr "Obrni stran" -#~ msgid "Apply to all _images" -#~ msgstr "Uporabi za vse _slike" +#: ../extensions/slideshow/main.c:319 +msgid "Cube from right" +msgstr "Kocka z desne" -#~ msgid "C_urrent date" -#~ msgstr "_Trenutni datum" +#: ../extensions/slideshow/main.c:325 +msgid "Cube from bottom" +msgstr "Kocka od spodaj" -#~ msgid "Check _All" -#~ msgstr "Preveri _vse" +#: ../extensions/slideshow/slideshow.extension.in.in.h:2 +msgid "View images as a slideshow." +msgstr "Poglej slike kot predstavitev." -#~ msgid "Check _None" -#~ msgstr "Preveri _nič" +#: ../extensions/webalbums/callbacks.c:71 +msgid "_Web Album..." +msgstr "_Spletni album ..." -#~ msgid "Checking image:" -#~ msgstr "Preverjanje slike:" +#: ../extensions/webalbums/callbacks.c:72 +msgid "Create a static web album" +msgstr "Ustvari statični spletni album" -#~ msgid "" -#~ "Click OK to reset the Exif orientation tag for the selected images to Top-" -#~ "Left." -#~ msgstr "" -#~ "Za ponastavitev Exif oznak usmerjenosti za izbrane slike na zgoraj-levo " -#~ "kliknite v redu." +#: ../extensions/webalbums/data/albumthemes/text.h:26 +msgid "Click to view the image" +msgstr "Kliknite za pogled slike" -#~ msgid "Equal images:" -#~ msgstr "Enake slike:" +#: ../extensions/webalbums/data/albumthemes/text.h:27 +msgid "Go back to the index" +msgstr "Pojdi nazaj na kazalo" -#~ msgid "Mirror image vertically (top-bottom)" -#~ msgstr "Zrcali sliko navpično (zgoraj-navzdol)" +#: ../extensions/webalbums/data/albumthemes/text.h:28 +#, c-format +msgid "Image %d of %d" +msgstr "Slika %d od %d" -#~ msgid "New names _preview:" -#~ msgstr "_Predogled novih imen:" +#: ../extensions/webalbums/data/albumthemes/text.h:29 +msgid "Index" +msgstr "Kazalo" -#~ msgid "P_hoto digitalization date (From EXIF data)" -#~ msgstr "Datum _digitalizacije fotografije (iz EXIF podatkov)" +#: ../extensions/webalbums/data/albumthemes/text.h:30 +#: ../gthumb/gth-browser-actions-entries.h:125 +msgid "Next" +msgstr "Naslednja" -#~ msgid "Reset Exif Orientation Tags" -#~ msgstr "Ponastavi exif usmeritvene oznake" +#: ../extensions/webalbums/data/albumthemes/text.h:32 +#: ../gthumb/gth-browser-actions-entries.h:119 +msgid "Previous" +msgstr "Predhodna" -#~ msgid "Rotate Images" -#~ msgstr "Zavrti slike" +#: ../extensions/webalbums/data/albumthemes/text.h:33 +#, c-format +msgid "View page %d" +msgstr "Pogled strani %d" -#~ msgid "Scale Images" -#~ msgstr "Umeritev slik" +#: ../extensions/webalbums/data/albumthemes/text.h:34 +msgid "View the next image" +msgstr "Pogled naslednje slike" -#~ msgid "Search terminated, no duplicates found." -#~ msgstr "Iskanje je bilo prekinjeno, dvojniki niso bili najdeni. " +#: ../extensions/webalbums/data/albumthemes/text.h:35 +msgid "View the next page" +msgstr "Pogled naslednje strani" -#~ msgid "" -#~ "This checkbox governs the rotation method used for JPEG images that " -#~ "contain Exif orientation tags. If this checkbox is enabled, the rotation " -#~ "will be performed using a physical transform, and the Exif orientation " -#~ "tag will be reset to the default \"top left\" value. If it is not " -#~ "enabled, the rotation will be performed by changing the Exif orientation " -#~ "tag only. For maximum compatibility with other applications, this " -#~ "checkbox should be enabled." -#~ msgstr "" -#~ "To potrditveno polje nadzira način vrtenja JPEG slik z Exif oznakami " -#~ "usmerjenosti. V primeru, da je potrditveno polje izbrano, bo vrtenje " -#~ "izvedeno s fizičnim preoblikovanjem, Exif oznaka usmerjenosti bo " -#~ "ponastavljena na vrednost \"zgoraj levo\". V primeru, da potrditveno " -#~ "polje ni izbrano, bo vrtenje izvedeno samo s spremembo Exif oznake " -#~ "usmerjenosti. Za največjo združljivost z ostalimi programi mora biti " -#~ "potrditveno polje izbrano." +#: ../extensions/webalbums/data/albumthemes/text.h:36 +msgid "View the previous image" +msgstr "Pogled predhodne slike" -#~ msgid "1024 x 768" -#~ msgstr "1024 x 768" +#: ../extensions/webalbums/data/albumthemes/text.h:37 +msgid "View the previous page" +msgstr "Pogled predhodne strani" -#~ msgid "1280 x 960" -#~ msgstr "1280 x 960" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:1 +msgid "All images on a single image" +msgstr "Vse slike na eni sliki" -#~ msgid "320 x 200" -#~ msgstr "320 x 200" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:2 +msgid "Adapts to the window width" +msgstr "Prilagodi se širini okna" -#~ msgid "320 x 320" -#~ msgstr "320 x 320" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:3 +msgid "Web Album" +msgstr "Spletni album" -#~ msgid "640 x 640" -#~ msgstr "640 x 640" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:5 +#, no-c-format +msgid "%P" +msgstr "%P" -#~ msgid "800 x 800" -#~ msgstr "800 x 800" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:19 +msgid "_Copy originals to destination" +msgstr "_Kopiraj izvirnike na cilj" -#~ msgid "Album Style" -#~ msgstr "Slog albuma" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:20 +msgid "_Resize if larger than:" +msgstr "_Spremeni velikost, če je večja kot:" -#~ msgid "Basic Information" -#~ msgstr "Osnovne podrobnosti" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:27 +msgid "_Adapt to the window width " +msgstr "_Prilagodi okno širini" -#~ msgid "Camera Data" -#~ msgstr "Podatki fotoaparata" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:30 +msgid "Index Page" +msgstr "Stran kazala" -#~ msgid "Comments" -#~ msgstr "Opombe" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:31 +msgid "Thumbnail Caption" +msgstr "Naslov sličice" -#~ msgid "Index Page Layout" -#~ msgstr "Razporeditev strani kazala" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:32 +msgid "The current image number" +msgstr "Številka trenutne slike" -#~ msgid "Theme" -#~ msgstr "Tema" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:33 +msgid "The total number of images" +msgstr "Skupno število slik" -#~ msgid "Note: %d (current date)." -#~ msgstr "Sporočilo: %d (trenutni datum)." +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:35 +msgid "The file comment" +msgstr "Opomba datoteke" -#~ msgid "" -#~ "Note: Some themes may auto-adjust the\n" -#~ "number of rows and columns, but keep the total \n" -#~ "number of images per page constant." -#~ msgstr "" -#~ "Sporočilo: Nekatere teme lahko samodejno prilagodijo\n" -#~ "število vrstic in stolpcev, toda obdržijo skupno \n" -#~ "število slik na stran stalno." +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:36 +msgid "Image Page" +msgstr "Stran slike" -#~ msgid "Came_ra Model" -#~ msgstr "Model _fotoaparata" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:37 +msgid "Show the description, if available" +msgstr "Pokaži opis, če je na voljo" -#~ msgid "Da_te and Time" -#~ msgstr "D_atum in čas" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:38 +msgid "Show the following attributes:" +msgstr "Pokaži naslednje atribute:" -#~ msgid "Exposure _time" -#~ msgstr "Čas o_svetlitve" +#: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:39 +msgid "Image Attributes" +msgstr "Atributi slike" -#~ msgid "Focal _length" -#~ msgstr "Goriščna _razdalja" +#: ../extensions/webalbums/gth-web-exporter.c:1802 +msgid "Could not show the destination" +msgstr "Ni mogoče pokazati cilja" -#~ msgid "Web Album Theme" -#~ msgstr "Tema spletnega albuma" +#: ../extensions/webalbums/gth-web-exporter.c:1838 +msgid "The album has been created successfully." +msgstr "Album je bil uspešno ustvarjen." -#~ msgid "_Aperture value" -#~ msgstr "Vred_nost zaslonke" +#: ../extensions/webalbums/gth-web-exporter.c:2106 +#: ../extensions/webalbums/gth-web-exporter.c:2133 +msgid "Saving thumbnails" +msgstr "Shranjevanje sličic" -#~ msgid "_Date and Time" -#~ msgstr "_Datum in čas" +#: ../extensions/webalbums/gth-web-exporter.c:2161 +msgid "Saving HTML pages: Images" +msgstr "Shranjevanje strani HTML: slike" -#~ msgid "_Flash" -#~ msgstr "_Bliskavica" +#: ../extensions/webalbums/gth-web-exporter.c:2219 +msgid "Saving HTML pages: Indexes" +msgstr "Shranjevanje strani HTML: kazala" -#~ msgid "_Go to Theme Folder" -#~ msgstr "_Pojdi v mapo tem" +#: ../extensions/webalbums/gth-web-exporter.c:2502 +msgid "Copying original images" +msgstr "Kopiranje izvirnih slik" -#~ msgid "_Install Theme..." -#~ msgstr "_Namesti temo ..." +#: ../extensions/webalbums/gth-web-exporter.c:2929 +msgid "Could not find the style folder" +msgstr "Ni mogoče najti mape slogov" -#~ msgid "_Place" -#~ msgstr "M_esto" +#: ../extensions/webalbums/gth-web-exporter.c:2967 +msgid "Could not create a temporary folder" +msgstr "Začasne mape ni mogoče ustvariti" -#~ msgid "_Shutter speed" -#~ msgstr "Hitrost _zaklopke" +#: ../extensions/webalbums/webalbums.extension.in.in.h:1 +msgid "Web Albums" +msgstr "Spletni albumi" -#~ msgid "columns, by" -#~ msgstr "stolpci z" +#: ../extensions/webalbums/webalbums.extension.in.in.h:2 +msgid "Create static web albums." +msgstr "Ustvari statične spletne albume." -#~ msgid "index.html" -#~ msgstr "index.html" +#: ../gthumb/dlg-location.c:200 +#: ../gthumb/gth-browser.c:1250 +#: ../gthumb/gth-browser.c:1809 +#: ../gthumb/gth-browser.c:5899 +#: ../gthumb/gth-browser.c:5918 +#: ../gthumb/gth-browser.c:5942 +#, c-format +msgid "Could not load the position \"%s\"" +msgstr "Ni mogoče naložiti položaja \"%s\"" -#~ msgid "or _use a single index page" -#~ msgstr "ali _uporabi kazalo na eni strani" +#: ../gthumb/dlg-personalize-filters.c:237 +msgid "Filter" +msgstr "Filter" -#~ msgid "rows per page," -#~ msgstr "vrsticami na stran," +#: ../gthumb/dlg-personalize-filters.c:315 +msgid "Could not save the filter" +msgstr "Filtra ni mogoče shraniti" -#~ msgid "" -#~ "Possible values are 0 (portrait), 1 (landscape), 2 (reverse portrait), 3 " -#~ "(reverse landscape)" -#~ msgstr "" -#~ "Možne vrednosti so 0 (pokončno), 1 (ležeče), 2 (obratno pokončno), 3 " -#~ "(obratno ležeče)" +#: ../gthumb/dlg-personalize-filters.c:358 +msgid "New Filter" +msgstr "Nov filter" -#~ msgid "Possible values are: 1, 2, 3, 4." -#~ msgstr "Možni vrednosti so: 1, 2, 3, 4." +#: ../gthumb/dlg-personalize-filters.c:387 +msgid "Edit Filter" +msgstr "Uredi filter" -#~ msgid "Possible values are: 72, 150, 300, 600." -#~ msgstr "Možne vrednosti so: 72, 150, 300, 600." +#: ../gthumb/dlg-preferences-extensions.c:67 +#: ../gthumb/gth-filterbar.c:270 +msgid "All" +msgstr "Vse" -#~ msgid "Possible values are: ascending, descending." -#~ msgstr "Možni vrednosti sta: naraščajoče, padajoče." +#: ../gthumb/dlg-preferences-extensions.c:68 +msgid "Enabled" +msgstr "Omogočeno" -#~ msgid "Possible values are: forward, backward, random." -#~ msgstr "Možne vrednosti so: naprej, nazaj, naključno." +#: ../gthumb/dlg-preferences-extensions.c:69 +msgid "Disabled" +msgstr "Onemogočeno" -#~ msgid "Possible values are: image, data, comment." -#~ msgstr "Možne vrednosti so: slika, podatek, opomba." +#: ../gthumb/dlg-preferences-extensions.c:72 +msgid "Viewers" +msgstr "Pregledovalniki" -#~ msgid "Possible values are: jpeg, png, tga, tiff." -#~ msgstr "Možne vrednosti so: jpeg, png, tga, tiff." +#: ../gthumb/dlg-preferences-extensions.c:73 +msgid "Metadata" +msgstr "Metapodatki" -#~ msgid "Possible values are: manual, auto." -#~ msgstr "Možni vrednosti sta: ročno, samodejno." +#: ../gthumb/dlg-preferences-extensions.c:74 +msgid "File tools" +msgstr "Datotečna orodja" -#~ msgid "Possible values are: nautilus, single, double." -#~ msgstr "Možne vrednosti: nautilus, enojni, dvojni." +#: ../gthumb/dlg-preferences-extensions.c:75 +msgid "List tools" +msgstr "Orodja seznama" -#~ msgid "" -#~ "Possible values are: none, name, path, size, time, exifdate, comment." -#~ msgstr "" -#~ "Možne vrednosti so: brez, ime, pot, velikost, čas, exif_datum, opomba." +#: ../gthumb/dlg-preferences-extensions.c:76 +msgid "Importers" +msgstr "Uvozniki" -#~ msgid "" -#~ "Possible values are: none, simple, simple_with_shadow, shadow, slide, " -#~ "shadow_in, shadow_out." -#~ msgstr "" -#~ "Možne vrednosti so: brez, preprosto, preprosto_s_senco, senca, " -#~ "diapozitiv, senca_v, senca_iz." +#: ../gthumb/dlg-preferences-extensions.c:77 +msgid "Exporters" +msgstr "Izvozniki" -#~ msgid "" -#~ "Possible values are: none, square, image, display, 4x3, 4x6, 5x7, 8x10, " -#~ "custom." -#~ msgstr "" -#~ "Možne vrednosti so: brez, kvadrat, slika, zaslon, 4x3, 4x6, 5x7, 8x10, po " -#~ "meri." +#: ../gthumb/dlg-preferences-extensions.c:216 +msgid "Could not activate the extension" +msgstr "Ni mogoče omogočiti razširitve" -#~ msgid "Possible values are: skip, rename, ask, overwrite." -#~ msgstr "Možne vrednosti so: preskoči, preimenuj, vprašaj, prepiši." +#: ../gthumb/dlg-preferences-extensions.c:226 +msgid "Could not deactivate the extension" +msgstr "Ni mogoče onemogočiti razširitve" -#~ msgid "Cannot open catalog \"%s\": %s" -#~ msgstr "Kataloga \"%s\" ni mogoče odpreti: %s" +#. add the page to the preferences dialog +#: ../gthumb/dlg-preferences-extensions.c:772 +msgid "Extensions" +msgstr "Razširitve" -#~ msgid "Cannot save catalog \"%s\": %s" -#~ msgstr "Kataloga \"%s\" ni mogoče shraniti: %s" +#: ../gthumb/dlg-preferences-extensions.c:819 +msgid "Restart required" +msgstr "Zahtevan je ponoven zagon" -#~ msgid "%d %B %Y, %H:%M" -#~ msgstr "%d %B %Y, %H:%M" +#: ../gthumb/dlg-preferences-extensions.c:820 +msgid "You need to restart gthumb for these changes to take effect" +msgstr "Za uveljavitev nekaterih sprememb je treba ponovno zagnati program " -#~ msgid "Image type:" -#~ msgstr "Vrsta slike:" +#: ../gthumb/dlg-preferences-extensions.c:821 +msgid "_Continue" +msgstr "_Nadaljuj" -#~ msgid "Home" -#~ msgstr "Domov" +#: ../gthumb/dlg-preferences-extensions.c:822 +msgid "_Restart" +msgstr "_Znova zaženi" -#~ msgid "Library not empty" -#~ msgstr "Knjižnica ni prazna" +#: ../gthumb/eggfileformatchooser.c:236 +#, c-format +msgid "File _Format: %s" +msgstr "_Vrsta datoteke: %s" -#~ msgid "Cannot remove library \"%s\": %s" -#~ msgstr "Knjižnice \"%s\" ni mogoče odstraniti: %s" +#: ../gthumb/eggfileformatchooser.c:397 +#: ../gthumb/gth-main-default-tests.c:233 +msgid "All Files" +msgstr "Vse datoteke" -#~ msgid "Cannot remove catalog \"%s\": %s" -#~ msgstr "Kataloga \"%s\" ni mogoče odstraniti: %s" +#: ../gthumb/eggfileformatchooser.c:398 +msgid "All Supported Files" +msgstr "Vse podprte datoteke" -#~ msgid "No image" -#~ msgstr "Brez slike" +#: ../gthumb/eggfileformatchooser.c:407 +msgid "By Extension" +msgstr "Po priponi" -#~ msgid "Ro_tate Images" -#~ msgstr "Za_vrti slike" +#: ../gthumb/eggfileformatchooser.c:422 +msgid "File Format" +msgstr "Vrsta datoteke" -#~ msgid "Loading image: %s" -#~ msgstr "Nalaganje slike: %s" +#: ../gthumb/eggfileformatchooser.c:440 +msgid "Extension(s)" +msgstr "Pripone" -#~ msgid "Deleting all thumbnails, wait please..." -#~ msgstr "Brisanje vseh sličic, počakajte ..." +#: ../gthumb/eggfileformatchooser.c:681 +#, c-format +msgid "The program was not able to find out the file format you want to use for `%s'. Please make sure to use a known extension for that file or manually choose a file format from the list below." +msgstr "Ni mogoče določiti vrste datoteke, ki jo želite uporabiti za `%s'. Prepričajte se, da uporabljate znano pripono datoteke ali pa sami izberite vrsto datoteke iz spodnjega seznama." -#~ msgid "Deleting old thumbnails, wait please..." -#~ msgstr "Brisanje starih sličic, počakajte ..." +#: ../gthumb/eggfileformatchooser.c:688 +msgid "File format not recognized" +msgstr "Vrsta datoteka ni bila prepoznana" -#~ msgid "(Invalid Name)" -#~ msgstr "(Neveljavno ime)" +#. For translators: This is a progress size indicator, for example: 230.4 MB of 512.8 MB +#: ../gthumb/gio-utils.c:1351 +#, c-format +msgid "%s of %s" +msgstr "%s od %s" -#~ msgid "%d x %d pixels" -#~ msgstr "%d x %d točk" +#: ../gthumb/gio-utils.c:1386 +#, c-format +msgid "Moving \"%s\" to \"%s\"" +msgstr "Premikanje \"%s\" v \"%s\"" -#~ msgid "Move Catalog to..." -#~ msgstr "Premakni katalog v ..." +#: ../gthumb/gio-utils.c:1388 +#, c-format +msgid "Copying \"%s\" to \"%s\"" +msgstr "Kopiranje \"%s\" v \"%s\"" -#~ msgid "Enter the new category name" -#~ msgstr "Vnos imena nove kategorije" +#: ../gthumb/gio-utils.c:1750 +msgid "Moving files" +msgstr "Premikanje datotek" -#~ msgid "" -#~ "The name \"%s\" is not valid because it contains the character \",\". " -#~ "Please use a different name." -#~ msgstr "" -#~ "Ime \"%s\" ni pravilno, saj vsebuje znak \",\". Uporabite drugo ime." +#: ../gthumb/gio-utils.c:1750 +msgid "Copying files" +msgstr "Kopiranje datotek" -#~ msgid "The category \"%s\" is already present. Please use a different name." -#~ msgstr "Kategorija \"%s\" že obstaja. Uporabite drugačno ime." +#: ../gthumb/gio-utils.c:1751 +msgid "Getting file information" +msgstr "Pridobivanje podrobnosti datoteke" -#~ msgid "" -#~ "An image named \"%s\" is already present. Please specify a different name." -#~ msgstr "Slika z imenom \"%s\" že obstaja. Izberite drugo ime." +#. hour:minutes:seconds +#. Translators: This is a time format, like "9:05:02" for 9 +#. * hours, 5 minutes, and 2 seconds. You may change ":" to +#. * the separator that your locale uses or use "%Id" instead +#. * of "%d" if your locale uses localized digits. +#. +#: ../gthumb/glib-utils.c:2848 +#, c-format +msgctxt "long time format" +msgid "%d:%02d:%02d" +msgstr "%d:%02d:%02d" -#~ msgid "Duplicates Size" -#~ msgstr "Velikost dvojnikov" +#. minutes:seconds +#. Translators: This is a time format, like "5:02" for 5 +#. * minutes and 2 seconds. You may change ":" to the +#. * separator that your locale uses or use "%Id" instead of +#. * "%d" if your locale uses localized digits. +#. +#: ../gthumb/glib-utils.c:2857 +#, c-format +msgctxt "short time format" +msgid "%d:%02d" +msgstr "%d:%02d" -#~ msgid "Checked images will be moved to the Trash, are you sure?" -#~ msgstr "Označene slike bodo premaknjene v smeti, ali ste prepričani?" +#: ../gthumb/gth-browser-actions-callbacks.c:400 +msgid "gthumb is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." +msgstr "gthumb je prosta programska oprema; program lahko razširjate in/ali spreminjate pod pogoji Splošnega dovoljenja GNU (GNU General PublicLicense), kot ga je objavila ustanova Free Software Foundation; bodisi različice 2 ali (po vaši izbiri) katerekoli poznejše različice." -#~ msgid "The destination folder does not exist. Do you want to create it?" -#~ msgstr "Ciljna mapa ne obstaja. Ali jo želite ustvariti?" +#: ../gthumb/gth-browser-actions-callbacks.c:404 +msgid "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." +msgstr "gthumb se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOČEN NAMEN. Za podrobnosti glejte besedilo GNU General Public License." -#~ msgid "Could not create folder \"%s\": %s." -#~ msgstr "Ni mogoče ustvariti mape \"%s\": %s." +#: ../gthumb/gth-browser-actions-callbacks.c:408 +msgid "You should have received a copy of the GNU General Public License along with gthumb. If not, see http://www.gnu.org/licenses/." +msgstr "Skupaj s programom bi morali dobiti tudi kopijo GNU splošne javne licence. V primeru, da je niste, si oglejte http://www.gnu.org/licenses/." -#~ msgid "" -#~ "You don't have the right permissions to create images in the folder \"%s\"" -#~ msgstr "Ni ustreznih dovoljenj za ustvarjanje slik v mapi \"%s\"" +#: ../gthumb/gth-browser-actions-callbacks.c:427 +msgid "An image viewer and browser for GNOME." +msgstr "Brskalnik in pregledovalnik slik za GNOME." -#~ msgid "_Do not display this message again" -#~ msgstr "_Sporočila ne prikaži več" +#: ../gthumb/gth-browser-actions-callbacks.c:430 +msgid "translator_credits" +msgstr "" +"Matej Urbančič, \n" +"Andrej Žnidaršič, " -#~ msgid "%d %b %Y, %H:%M" -#~ msgstr "%d %b %Y, %H:%M" +#: ../gthumb/gth-browser-actions-entries.h:31 +msgid "_File" +msgstr "_Datoteka" -#~ msgid "You didn't enter the new name" -#~ msgstr "Niste vnesli novega imena" +#: ../gthumb/gth-browser-actions-entries.h:32 +msgid "_Edit" +msgstr "_Uredi" -#~ msgid "" -#~ "The name \"%s\" is already used in this folder. Please use a different " -#~ "name." -#~ msgstr "Ime \"%s\" je v tej mapi že uporabljeno. Uporabite drugo ime." +#: ../gthumb/gth-browser-actions-entries.h:34 +msgid "_Go" +msgstr "P_ojdi" -#~ msgid "Could not rename the following images:" -#~ msgstr "Sledečih slik ni mogoče preimenovati:" +#: ../gthumb/gth-browser-actions-entries.h:35 +msgid "_Help" +msgstr "Pomo_č" -#~ msgid "_Abort" -#~ msgstr "_Prekliči" +#: ../gthumb/gth-browser-actions-entries.h:36 +msgid "Open _With" +msgstr "Odpri _z" -#~ msgid "Collecting images info" -#~ msgstr "Pridobivanje podrobnosti slike" +#: ../gthumb/gth-browser-actions-entries.h:37 +msgid "I_mport From" +msgstr "U_vozi iz" -#~ msgid "Copying file %ld of %ld" -#~ msgstr "Kopiranje datoteke %ld od %ld" +#: ../gthumb/gth-browser-actions-entries.h:38 +msgid "E_xport To" +msgstr "_Izvozi v" -#~ msgid "" -#~ "Could not move temporary file to remote location. Check remote " -#~ "permissions." -#~ msgstr "" -#~ "Začasne datoteke ni mogoče premakniti na oddaljeno mesto. Preverite " -#~ "oddaljena dovoljenja." +#: ../gthumb/gth-browser-actions-entries.h:41 +msgid "New _Window" +msgstr "No_vo okno" -#~ msgid "Film" -#~ msgstr "Film" +#: ../gthumb/gth-browser-actions-entries.h:42 +msgid "Open another window" +msgstr "Odpri novo okno" -#~ msgid "Import errors detected" -#~ msgstr "Zaznane so bile napake uvoza" +#: ../gthumb/gth-browser-actions-entries.h:71 +msgid "Open" +msgstr "Odpri" -#~ msgid "The files on the camera will not be deleted" -#~ msgstr "Datoteke na fotoaparatu ne bodo izbrisane" +#: ../gthumb/gth-browser-actions-entries.h:77 +msgid "Open in New Window" +msgstr "Odpri v novem oknu" -#~ msgid "Not enough free space left on disk" -#~ msgstr "Na disku ni dovolj prostora" +#: ../gthumb/gth-browser-actions-entries.h:84 +msgid "Edit various preferences" +msgstr "Urejanje različnih možnosti" -#~ msgid "by path" -#~ msgstr "po poti" +#: ../gthumb/gth-browser-actions-entries.h:95 +msgid "_Sort By..." +msgstr "_Razvrsti po ..." -#~ msgid "by size" -#~ msgstr "po velikosti" +#: ../gthumb/gth-browser-actions-entries.h:101 +msgid "_Filter..." +msgstr "_Filter ..." -#~ msgid "by comment" -#~ msgstr "po opombi" +#: ../gthumb/gth-browser-actions-entries.h:108 +msgid "Stop loading the current location" +msgstr "Zaustavi nalaganje trenutnega mesta" -#~ msgid "" -#~ "The name \"%s\" is not valid because it contains the character \"/\". " -#~ "Please use a different name." -#~ msgstr "" -#~ "Ime \"%s\" ni veljavno, ker vsebuje znak \"/\". Uporabite drugačno ime." +#: ../gthumb/gth-browser-actions-entries.h:114 +msgid "Reload the current location" +msgstr "Ponovno naloži trenutno mesto" -#~ msgid "Select Album Theme" -#~ msgstr "Izbor teme albuma" +#: ../gthumb/gth-browser-actions-entries.h:120 +msgid "View previous image" +msgstr "Pogled predhodne slike" -#~ msgid "The image will be moved to the Trash, are you sure?" -#~ msgstr "Slika bo premaknjena v smeti, ali ste prepričani?" +#: ../gthumb/gth-browser-actions-entries.h:126 +msgid "View next image" +msgstr "Pogled naslednje slike" -#~ msgid "The selected images will be moved to the Trash, are you sure?" -#~ msgstr "Izbrane slike bodo premaknjene v smeti, ali ste prepričani?" +#: ../gthumb/gth-browser-actions-entries.h:132 +msgid "Switch to fullscreen" +msgstr "Preklopi na cel zaslon" -#~ msgid "Enter the new name: " -#~ msgstr "Vnos novega imena:" +#: ../gthumb/gth-browser-actions-entries.h:138 +msgid "Leave Fullscreen" +msgstr "Zapusti celozaslonski način" -#~ msgid "The name \"%s\" is already used. Please use a different name." -#~ msgstr "Ime \"%s\" je v uporabi. Izberite drugačno ime." +#: ../gthumb/gth-browser-actions-entries.h:144 +#: ../gthumb/gth-browser.c:3586 +msgid "Go to the previous visited location" +msgstr "Pojdi na predhodno obiskano mesto" -#~ msgid "Could not rename the library \"%s\": %s" -#~ msgstr "Knjižnice \"%s\" ni mogoče preimenovati: %s" +#: ../gthumb/gth-browser-actions-entries.h:150 +#: ../gthumb/gth-browser.c:3604 +msgid "Go to the next visited location" +msgstr "Pojdi na naslednje obiskano mesto" -#~ msgid "The selected library will be removed, are you sure?" -#~ msgstr "Izbrana knjižnica bo odstranjena, ali ste prepričani?" +#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser.c:3622 +msgid "Go up one level" +msgstr "Pojdi eno raven višje" -#~ msgid "The selected catalog will be removed, are you sure?" -#~ msgstr "Izbrani katalog bo odstranjen, ali ste prepričani?" +#: ../gthumb/gth-browser-actions-entries.h:161 +msgid "_Location..." +msgstr "_Mesto ..." -#~ msgid "Could not rename the folder \"%s\": %s" -#~ msgstr "Mape \"%s\" ni mogoče preimenovati : %s" +#: ../gthumb/gth-browser-actions-entries.h:162 +msgid "Specify a location to open" +msgstr "Mesto za odpiranje" -#~ msgid "source and destination are the same" -#~ msgstr "Izvor in cilj sta ista" +#: ../gthumb/gth-browser-actions-entries.h:173 +#: ../gthumb/gth-browser.c:672 +msgid "_Delete History" +msgstr "_Izbriši zgodovino" -#~ msgid "" -#~ "\"%s\" cannot be moved to the Trash. Do you want to delete it permanently?" -#~ msgstr "" -#~ "\"%s\" ni mogoče premakniti v smeti. Ali jo želite trajno izbrisati?" +#: ../gthumb/gth-browser-actions-entries.h:174 +msgid "Delete the list of visited locations" +msgstr "Izbriše seznam obiskanih mest" -#~ msgid "The selected folder will be moved to the Trash, are you sure?" -#~ msgstr "Izbrana mapa bo bila premaknjena v smeti, ali ste prepričani?" +#: ../gthumb/gth-browser-actions-entries.h:180 +msgid "View the folders" +msgstr "Pogled map" -#~ msgid "Could not copy the folder \"%s\": %s" -#~ msgstr "Mape \"%s\" ni mogoče kopirati: %s" +#: ../gthumb/gth-browser-actions-entries.h:186 +msgid "Show information about gthumb" +msgstr "Prikaže podrobnosti programa gthumb" -#~ msgid "source contains destination" -#~ msgstr "izvor vsebuje cilj" +#: ../gthumb/gth-browser-actions-entries.h:191 +msgid "Contents" +msgstr "Vsebina" -#~ msgid "a folder with that name is already present." -#~ msgstr "mapa s tem imenom že obstaja." +#: ../gthumb/gth-browser-actions-entries.h:192 +msgid "Display the gthumb Manual" +msgstr "Prikaže priročnik gThumb" -#~ msgid "Open Location" -#~ msgstr "Odpri mesto" +#: ../gthumb/gth-browser-actions-entries.h:197 +msgid "_Keyboard Shortcuts" +msgstr "_Tipkovne bližnjice" -#~ msgid "_Folder" -#~ msgstr "_Mapa" +#: ../gthumb/gth-browser-actions-entries.h:206 +msgid "_Toolbar" +msgstr "_Orodna vrstica" -#~ msgid "S_ort Images" -#~ msgstr "Ra_zvrsti slike" +#: ../gthumb/gth-browser-actions-entries.h:207 +msgid "View or hide the toolbar of this window" +msgstr "Pokaže ali skrije orodno vrstico tega okna" -#~ msgid "_Zoom" -#~ msgstr "_Povečaj" +#: ../gthumb/gth-browser-actions-entries.h:211 +msgid "_Statusbar" +msgstr "_Vrstica stanja" -#~ msgid "_Image" -#~ msgstr "_Slika" +#: ../gthumb/gth-browser-actions-entries.h:212 +msgid "View or hide the statusbar of this window" +msgstr "Pokaže ali skrije vrstico stanja tega okna" -#~ msgid "Set Image as _Wallpaper" -#~ msgstr "Uporabi sliko za oz_adje " +#: ../gthumb/gth-browser-actions-entries.h:216 +msgid "_Filterbar" +msgstr "Vrstica _filtra" -#~ msgid "Create a new window" -#~ msgstr "Ustvari novo okno" +#: ../gthumb/gth-browser-actions-entries.h:217 +msgid "View or hide the filterbar of this window" +msgstr "Pokaže ali skrije filtrirno vrstico tega okna" -#~ msgid "Open the selected image in a new window" -#~ msgstr "Odpri izbrano sliko v novem oknu" +#: ../gthumb/gth-browser-actions-entries.h:221 +msgid "_Sidebar" +msgstr "_Stranska vrstica" -#~ msgid "_Import Photos..." -#~ msgstr "Uvoz _fotografij ..." +#: ../gthumb/gth-browser-actions-entries.h:222 +msgid "View or hide the sidebar of this window" +msgstr "Pokaže ali skrije stransko vrstico tega okna" -#~ msgid "_Write To CD..." -#~ msgstr "Z_apiši na CD ..." +#: ../gthumb/gth-browser-actions-entries.h:226 +msgid "_Thumbnail Pane" +msgstr "Pladenj s_ličic" -#~ msgid "Write selection to CD" -#~ msgstr "Zapiše izbor na CD" +#: ../gthumb/gth-browser-actions-entries.h:227 +msgid "View or hide the thumbnail pane in viewer mode" +msgstr "Pokaže ali skrije pladenj sličic v načinu pregledovalnika" -#~ msgid "Move this image to the Trash" -#~ msgstr "Premakni sliko v smeti" +#: ../gthumb/gth-browser-actions-entries.h:231 +msgid "_Thumbnails" +msgstr "_Sličice" -#~ msgid "Move this image to another location" -#~ msgstr "Premakne sliko na drugo mesto" +#: ../gthumb/gth-browser-actions-entries.h:232 +msgid "View thumbnails" +msgstr "Pogled sličic" -#~ msgid "Copy selected images to another location" -#~ msgstr "Kopiraj izbrane slike na drugo mesto" +#: ../gthumb/gth-browser-actions-entries.h:236 +msgid "_Hidden Files" +msgstr "_Skrite datoteke" -#~ msgid "Move selected images to another location" -#~ msgstr "Premakni izbrane slike na drugo mesto" +#: ../gthumb/gth-browser-actions-entries.h:237 +msgid "Show hidden files and folders" +msgstr "Pokaže skrite datoteke in mape" -#~ msgid "Select all images" -#~ msgstr "Izberi vse slike" +#: ../gthumb/gth-browser-actions-entries.h:242 +#: ../gthumb/gth-browser-actions-entries.h:247 +msgid "View file properties" +msgstr "Pogled lastnosti datoteke" -#~ msgid "Open the selected catalog" -#~ msgstr "Odpre izbrani katalog" +#: ../gthumb/gth-browser-actions-entries.h:251 +msgid "Edit" +msgstr "Uredi" -#~ msgid "Open the selected catalog in a new window" -#~ msgstr "Odpre izbrani katalog v novem oknu" +#: ../gthumb/gth-browser-actions-entries.h:252 +msgid "Edit file" +msgstr "Uredi datoteko" -#~ msgid "Rename selected catalog" -#~ msgstr "Preimenuj izbran katalog" +#: ../gthumb/gth-browser-actions-entries.h:256 +msgid "_Fit Window to Image" +msgstr "_Prilagodi okno sliki" -#~ msgid "Remove selected catalog" -#~ msgstr "Odstrani izbran katalog" +#: ../gthumb/gth-browser-actions-entries.h:257 +msgid "Resize the window to the size of the image" +msgstr "Spremeni velikost okna na velikost slike" -#~ msgid "Move selected catalog to another location" -#~ msgstr "Premakne izbran katalog na drugo mesto" +#: ../gthumb/gth-browser.c:369 +#, c-format +msgid "Open %s" +msgstr "Odpri %s" -#~ msgid "_Edit Search..." -#~ msgstr "_Uredi iskanje ..." +#: ../gthumb/gth-browser.c:509 +msgid "[modified]" +msgstr "[spremenjeno]" -#~ msgid "Modify search criteria" -#~ msgstr "Spremeni iskalne pogoje" +#: ../gthumb/gth-browser.c:1006 +#, c-format +msgid "%d file selected (%s)" +msgid_plural "%d files selected (%s)" +msgstr[0] "%d izbranih datotek (%s)" +msgstr[1] "%d izbrana datoteka (%s)" +msgstr[2] "%d izbrani datoteki (%s)" +msgstr[3] "%d izbrane datoteke (%s)" -#~ msgid "Redo _Search" -#~ msgstr "Ponovi _iskanje" +#: ../gthumb/gth-browser.c:1041 +#, c-format +msgid "%s of free space" +msgstr "%s neporabljenega prostora" -#~ msgid "_New Catalog..." -#~ msgstr "_Nov katalog ..." +#: ../gthumb/gth-browser.c:1905 +#: ../gthumb/gth-browser.c:1932 +#, c-format +msgid "No suitable module found for %s" +msgstr "Primernega modula za %s ni bilo mogoče najti" -#~ msgid "New _Library..." -#~ msgstr "Nova _knjižnica ..." +#: ../gthumb/gth-browser.c:2052 +#, c-format +msgid "Save changes to file '%s'?" +msgstr "Ali naj bodo spremembe datoteke '%s' shranjene?" -#~ msgid "Create a new catalog library" -#~ msgstr "Ustvari novo knjižnico katalogov" +#: ../gthumb/gth-browser.c:2057 +msgid "If you don't save, changes to the file will be permanently lost." +msgstr "V primeru, da sprememb ne shranite, bodo trajno izgubljene." -#~ msgid "Rename current catalog" -#~ msgstr "Preimenuj trenuten katalog" +#: ../gthumb/gth-browser.c:2058 +msgid "Do _Not Save" +msgstr "_Ne shrani" -#~ msgid "Remove current catalog" -#~ msgstr "Odstrani trenuten katalog" +#: ../gthumb/gth-browser.c:2828 +#: ../gthumb/gth-source-tree.c:182 +msgid "Could not change name" +msgstr "Ni mogoče spremeniti imena" -#~ msgid "Move current catalog to another location" -#~ msgstr "Premakne trenuten katalog na drugo mesto" +#: ../gthumb/gth-browser.c:3257 +#: ../gthumb/gth-main-default-metadata.c:41 +msgid "Modified" +msgstr "Spremenjeno" -#~ msgid "Open the selected folder in a new window" -#~ msgstr "Odpre izbrano mapo v novem oknu" +#: ../gthumb/gth-browser.c:3587 +#: ../gthumb/gth-browser.c:3605 +msgid "View the list of visited locations" +msgstr "Pogled seznama obiskanih mest" -#~ msgid "Open the selected folder with the Nautilus file manager" -#~ msgstr "Odpre izbrano mapo z upravljalnikom datotek Nautilus" +#: ../gthumb/gth-browser.c:3623 +msgid "View the list of upper locations" +msgstr "Pogled seznama zgornjih mest" -#~ msgid "Rename selected folder" -#~ msgstr "Preimenuj izbrano mapo" +#: ../gthumb/gth-browser.c:5900 +#, c-format +msgid "File type not supported" +msgstr "Vrsta datoteke ni podprta" -#~ msgid "Copy selected folder" -#~ msgstr "Kopiraj izbrano mapo" +#: ../gthumb/gth-browser.c:5943 +#, c-format +msgid "No suitable module found" +msgstr "Ni mogoče najti primernega modula" -#~ msgid "Move selected folder" -#~ msgstr "Premakni izbrano mapo" +#: ../gthumb/gth-extensions.c:203 +#, c-format +msgid "Could not open the module `%s`: %s" +msgstr "Ni mogoče odpreti modula `%s`: %s" -#~ msgid "Open current folder with the Nautilus file manager" -#~ msgstr "Odpre trenutno mapo z upravljalnikom datotek Nautilus" +#: ../gthumb/gth-extensions.c:744 +#, c-format +msgid "The extension '%1$s' is required by the extension '%2$s'" +msgstr "Razširitev '%2$s' zahteva nameščeno tudi razširitev '%1$s'." -#~ msgid "Rename current folder" -#~ msgstr "Preimenuj trenutno mapo" +#: ../gthumb/gth-file-source-vfs.c:121 +msgid "Home Folder" +msgstr "Domača mapa" -#~ msgid "Move the current folder to the Trash" -#~ msgstr "Premakne trenutno mapo v smeti" +#: ../gthumb/gth-file-source-vfs.c:126 +msgid "File System" +msgstr "Datotečni sistem" -#~ msgid "Assign categories to the current folder" -#~ msgstr "Dodeli kategorije trenutni mapi" +#: ../gthumb/gth-file-source-vfs.c:739 +msgid "The files cannot be moved to the Trash. Do you want to delete them permanently?" +msgstr "Datotek ni mogoče premakniti v smeti. Ali jih želite trajno izbrisati?" -#~ msgid "Go to the home folder" -#~ msgstr "Pojdi v mapo slik" +#: ../gthumb/gth-file-source-vfs.c:750 +msgid "Could not move the files to the Trash" +msgstr "Datotek ni mogoče premakniti v smeti" -#~ msgid "_Go to the Image Folder" -#~ msgstr "_Pojdi v mapo slik" +#: ../gthumb/gth-file-source-vfs.c:797 +#, c-format +msgid "Are you sure you want to move \"%s\" to trash?" +msgstr "Ali ste prepričani, da želite premakniti \"%s\" v smeti?" -#~ msgid "Specify a location to visit" -#~ msgstr "Izberite mesto, ki ga želite obiskati" +#: ../gthumb/gth-file-source-vfs.c:801 +#, c-format +msgid "Are you sure you want to move to trash the %'d selected file?" +msgid_plural "Are you sure you want to move to trash the %'d selected files?" +msgstr[0] "Ali ste prepričani, da želite %'d izbranih datotek premakniti v smeti?" +msgstr[1] "Ali ste prepričani, da želite %'d izbrano datoteko premakniti v smeti?" +msgstr[2] "Ali ste prepričani, da želite %'d izbrani datoteki premakniti v smeti?" +msgstr[3] "Ali ste prepričani, da želite %'d izbrane datoteke premakniti v smeti?" -#~ msgid "_Slide Show" -#~ msgstr "_Diapredstavitev" +#: ../gthumb/gth-file-source-vfs.c:844 +#, c-format +msgid "Are you sure you want to permanently delete the %'d selected file?" +msgid_plural "Are you sure you want to permanently delete the %'d selected files?" +msgstr[0] "Ali ste prepričani, da želite trajno izbrisati %'d izbranih datotek?" +msgstr[1] "Ali ste prepričani, da želite trajno izbrisati %'d izbrano datoteko?" +msgstr[2] "Ali ste prepričani, da želite trajno izbrisati %'d izbrani datoteki?" +msgstr[3] "Ali ste prepričani, da želite trajno izbrisati %'d izbrane datoteke?" -#~ msgid "Create _Index Image..." -#~ msgstr "Ustvari sliko _kazala ..." +#: ../gthumb/gth-filterbar.c:406 +msgid "Hide the filterbar" +msgstr "Skrij vrstico filtra" -#~ msgid "Search for _Duplicates..." -#~ msgstr "Iskanje _dvojnikov ..." +#: ../gthumb/gth-filter.c:43 +#: ../gthumb/gth-filter-editor-dialog.c:178 +#: ../gthumb/gth-test-simple.c:75 +msgid "kB" +msgstr "kB" -#~ msgid "Scale Images..." -#~ msgstr "Umeri slike ..." +#: ../gthumb/gth-filter.c:44 +#: ../gthumb/gth-filter-editor-dialog.c:179 +#: ../gthumb/gth-test-simple.c:76 +msgid "MB" +msgstr "MB" -#~ msgid "_Image Preview" -#~ msgstr "_Predogled slike" +#: ../gthumb/gth-filter.c:45 +#: ../gthumb/gth-filter-editor-dialog.c:180 +#: ../gthumb/gth-test-simple.c:77 +msgid "GB" +msgstr "GB" -#~ msgid "_Reversed Order" -#~ msgstr "_Obrnjen vrstni red" +#. "files" label +#: ../gthumb/gth-filter.c:291 +#: ../gthumb/gth-filter-editor-dialog.c:177 +msgid "files" +msgstr "datoteke" -#~ msgid "Reverse images order" -#~ msgstr "Obrnjen vrstni red slik" +#: ../gthumb/gth-filter-editor-dialog.c:224 +msgid "ascending" +msgstr "naraščajoče" -#~ msgid "by _Name" -#~ msgstr "po ime_nu" +#: ../gthumb/gth-filter-editor-dialog.c:225 +msgid "descending" +msgstr "padajoče" -#~ msgid "Sort images by name" -#~ msgstr "Razvrsti slike po imenu" +#: ../gthumb/gth-filter-editor-dialog.c:515 +#, c-format +msgid "No limit specified" +msgstr "Omejitev ni navedena" -#~ msgid "by _Path" -#~ msgstr "po _poti" +#: ../gthumb/gth-folder-tree.c:857 +msgid "Loading..." +msgstr "Nalaganje ..." -#~ msgid "Sort images by path" -#~ msgstr "Razvrsti slike po poti" +#: ../gthumb/gth-folder-tree.c:1100 +msgid "(Open Parent)" +msgstr "(Odpri nadrejeno)" -#~ msgid "by _Size" -#~ msgstr "po veliko_sti" +#: ../gthumb/gth-histogram-view.c:826 +msgid "Linear scale" +msgstr "Linearna skala" -#~ msgid "Sort images by file modification time" -#~ msgstr "Razvrsti slike po času sprememb" +#: ../gthumb/gth-histogram-view.c:838 +msgid "Logarithmic scale" +msgstr "Logaritmska skala" -#~ msgid "by _Exif Time" -#~ msgstr "po _exif času" +#: ../gthumb/gth-histogram-view.c:858 +msgid "Channel:" +msgstr "Kanal:" -#~ msgid "Sort images by Exif DateTime tag" -#~ msgstr "Razvrsti slike po oznaki Exif DatumČas" +#: ../gthumb/gth-histogram-view.c:890 +msgid "Value" +msgstr "Vrednost" -#~ msgid "by _Comment" -#~ msgstr "po opo_mbi" +#: ../gthumb/gth-histogram-view.c:896 +msgid "Red" +msgstr "Rdeča" -#~ msgid "Sort images by comment" -#~ msgstr "Razvrsti slike po opombah" +#: ../gthumb/gth-histogram-view.c:902 +msgid "Green" +msgstr "Zelena" -#~ msgid "_Manual Order" -#~ msgstr "_Ročna razvrstitev" +#: ../gthumb/gth-histogram-view.c:908 +msgid "Blue" +msgstr "Modra" -#~ msgid "Sort images manually" -#~ msgstr "Ročna razvrstitev slik" +#: ../gthumb/gth-histogram-view.c:914 +msgid "Alpha" +msgstr "Alfa" -#~ msgid "View As Slides" -#~ msgstr "Pogled diapozitivov" +#: ../gthumb/gth-histogram-view.c:921 +msgid "RGB" +msgstr "RGB" -#~ msgid "View As List" -#~ msgstr "Pogled seznama" +#: ../gthumb/gth-load-file-data-task.c:108 +msgid "Reading file information" +msgstr "Pridobivanje podrobnosti datoteke" -#~ msgid "_Catalogs" -#~ msgstr "_Katalogi" +#: ../gthumb/gth-main-default-metadata.c:32 +msgid "File" +msgstr "Datoteka" -#~ msgid "View the catalogs" -#~ msgstr "Ogled katalogov" +#: ../gthumb/gth-main-default-metadata.c:39 +msgid "Name" +msgstr "Ime" -#~ msgid "[Press 'c' to add a comment]" -#~ msgstr "[Pritisnite 'c' za dodajanje opombe]" +#: ../gthumb/gth-main-default-metadata.c:40 +#: ../gthumb/gth-main-default-tests.c:284 +msgid "Size" +msgstr "Velikost" -#~ msgid "1 image (%s)" -#~ msgstr "1 slika (%s)" +#: ../gthumb/gth-main-default-metadata.c:42 +msgid "Type" +msgstr "Vrsta" -#~ msgid "The current image has been modified, do you want to save it?" -#~ msgstr "Trenutna slka je bila spremenjena. Jo želite shraniti?" +#: ../gthumb/gth-main-default-metadata.c:44 +msgid "Full Name" +msgstr "Polno ime" -#~ msgid "Dragged Images" -#~ msgstr "Povlečene slike" +#: ../gthumb/gth-main-default-metadata.c:48 +msgid "Duration" +msgstr "Trajanje" -#~ msgid "Cannot load folder \"%s\": %s\n" -#~ msgstr "Mape \"%s\" ni mogoče naložiti: %s\n" +#: ../gthumb/gth-main-default-sort-types.c:131 +msgid "file name" +msgstr "ime datoteke" -#~ msgid "The specified catalog does not exist." -#~ msgstr "Naveden katalog ne obstaja." +#: ../gthumb/gth-main-default-sort-types.c:132 +msgid "file path" +msgstr "pot datoteke" -#~ msgid "Wait please..." -#~ msgstr "Počakajte ..." +#: ../gthumb/gth-main-default-sort-types.c:133 +msgid "file size" +msgstr "velikost datoteke" -#~ msgid "Filesystem Data" -#~ msgstr "Podatki datotečnega sistema" +#: ../gthumb/gth-main-default-sort-types.c:134 +msgid "file modified date" +msgstr "datum spremembe datoteke" -#~ msgid "GPS Coordinates" -#~ msgstr "Koordinate GPS" +#: ../gthumb/gth-main-default-sort-types.c:135 +msgid "no sorting" +msgstr "brez razvrščanja" -#~ msgid "Embedded Thumbnail" -#~ msgstr "Vključena sličica" +#: ../gthumb/gth-main-default-sort-types.c:136 +msgid "dimensions" +msgstr "mere" -#~ msgid "Versions & Interoperability" -#~ msgstr "Različice in vzajemna združljivost" +#: ../gthumb/gth-main-default-tests.c:261 +msgid "Media" +msgstr "Večpredstavnostna datoteka" -#~ msgid "Path" -#~ msgstr "Pot" +#: ../gthumb/gth-main-default-tests.c:268 +msgid "Text Files" +msgstr "Besedilne datoteke" -#~ msgid "KB" -#~ msgstr "KB" +#: ../gthumb/gth-main-default-tests.c:276 +msgid "Filename" +msgstr "Ime datoteke" -#~ msgid "Category" -#~ msgstr "Kategorija" +#: ../gthumb/gth-main-default-tests.c:308 +msgid "Title (embedded)" +msgstr "Naslov (vključen)" -#~ msgid "Text contains" -#~ msgstr "Besedilo vsebuje" +#: ../gthumb/gth-main-default-tests.c:316 +msgid "Description (embedded)" +msgstr "Opis (vključen)" -#~ msgid "_Folder" -#~ msgstr "_Mapa" +#: ../gthumb/gth-pixbuf-list-task.c:139 +msgid "Could not rename the file" +msgstr "Datoteke ni mogoče preimenovati" -#~ msgid "_Browse..." -#~ msgstr "_Prebrskaj ..." +#: ../gthumb/gth-pixbuf-saver.c:34 +msgid "No options available for this file type" +msgstr "Za to vrsto datotek ni razpoložljivih možnosti" -#~ msgid "_Recent folders:" -#~ msgstr "_Nedavne mape:" +#: ../gthumb/gth-progress-dialog.c:144 +msgid "Cancel operation" +msgstr "Prekliči opravilo" -#~ msgid "_Transform" -#~ msgstr "_Preoblikuj" +#: ../gthumb/gth-save-file-data-task.c:102 +msgid "Saving file information" +msgstr "Shranjevanje podrobnosti datoteke" -#~ msgid "_Single Window" -#~ msgstr "_Enojno okno" +#: ../gthumb/gth-tags-entry.c:388 +#, c-format +msgid "Create tag «%s»" +msgstr "Ustvari oznako «%s»" -#~ msgid "_None" -#~ msgstr "_Brez" +#: ../gthumb/gth-tags-entry.c:735 +msgid "Show all the tags" +msgstr "Pokaži vse oznake" -#~ msgid "Open selected images with an application" -#~ msgstr "Odpri izbrane slike s programom" +#: ../gthumb/gth-tags-file.c:236 +msgid "Holidays" +msgstr "Počitnice" -#~ msgid "_Open With..." -#~ msgstr "Odp_ri z ..." +#: ../gthumb/gth-tags-file.c:237 +msgid "Temporary" +msgstr "Začasno" -#~ msgid "Revert to saved image" -#~ msgstr "Povrni na shranjeno sliko" +#: ../gthumb/gth-tags-file.c:238 +msgid "Screenshots" +msgstr "Zajete slike" -#~ msgid "Print the current image" -#~ msgstr "Natisne sliko" +#: ../gthumb/gth-tags-file.c:239 +msgid "Science" +msgstr "Znanost" -#~ msgid "Open this image with an application" -#~ msgstr "Odpri izbrano sliko z drugim programom" +#: ../gthumb/gth-tags-file.c:240 +msgid "Favorite" +msgstr "Priljubljeno" -#~ msgid "Comm_ent..." -#~ msgstr "_Opomba ..." +#: ../gthumb/gth-tags-file.c:241 +msgid "Important" +msgstr "Pomembno" -#~ msgid "Add a comment to selected images" -#~ msgstr "Dodaj opombo izbranim slikam" +#: ../gthumb/gth-tags-file.c:242 +msgid "GNOME" +msgstr "GNOME" -#~ msgid "Rem_ove Comment" -#~ msgstr "Odstra_ni opombo" +#: ../gthumb/gth-tags-file.c:243 +msgid "Games" +msgstr "Igre" -#~ msgid "Remove comments of selected images" -#~ msgstr "Odstrani opombe izbranih slik" +#: ../gthumb/gth-tags-file.c:244 +msgid "Party" +msgstr "Zabava" -#~ msgid "Assign categories to selected images" -#~ msgstr "Dodeli kategorije izbranim slikam" +#: ../gthumb/gth-tags-file.c:245 +msgid "Birthday" +msgstr "Rojstni dan" -#~ msgid "Ca_tegories" -#~ msgstr "Ka_tegorije" +#: ../gthumb/gth-tags-file.c:246 +msgid "Astronomy" +msgstr "Astronomija" -#~ msgid "View the image rotated clockwise" -#~ msgstr "Ogled slike zavrtene v smeri urinih kazalcev" +#: ../gthumb/gth-tags-file.c:247 +msgid "Family" +msgstr "Družina" -#~ msgid "View the image rotated counter-clockwise" -#~ msgstr "Ogled slike zavrtene levo" +#: ../gthumb/gth-test-category.c:46 +#: ../gthumb/gth-test-simple.c:49 +#: ../gthumb/gth-test-simple.c:64 +msgid "is" +msgstr "je" -#~ msgid "View the image flipped" -#~ msgstr "Pogled navpično zrcaljene slike" +#: ../gthumb/gth-test-category.c:47 +msgid "is only" +msgstr "je le" -#~ msgid "View the image mirrored" -#~ msgstr "Pogled vodoravno zrcaljene slike" +#: ../gthumb/gth-test-category.c:48 +#: ../gthumb/gth-test-simple.c:50 +#: ../gthumb/gth-test-simple.c:65 +msgid "is not" +msgstr "ni" -#~ msgid "View the image in black and white" -#~ msgstr "Ogled slike v črno-beli " +#: ../gthumb/gth-test-category.c:394 +#: ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 +#: ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 +#, c-format +msgid "The test definition is incomplete" +msgstr "Preizkusna definicija ni končana" -#~ msgid "View the image with negative colors" -#~ msgstr "Ogled slike z negativnimi barvami" +#: ../gthumb/gth-test-selector.c:252 +msgid "Add a new rule" +msgstr "Dodaj novo pravilo" -#~ msgid "_Enhance" -#~ msgstr "_Poudari" +#: ../gthumb/gth-test-selector.c:263 +msgid "Remove this rule" +msgstr "Odstrani to pravilo" -#~ msgid "Automatically adjust the color levels" -#~ msgstr "Samodejno prilagodi nivo barve" +#: ../gthumb/gth-test-simple.c:46 +msgid "contains" +msgstr "vsebuje" -#~ msgid "Reduce the number of colors" -#~ msgstr "Zmanjša število barv" +#: ../gthumb/gth-test-simple.c:47 +msgid "starts with" +msgstr "se začne z" -#~ msgid "_Brightness-Contrast..." -#~ msgstr "S_vetlost-kontrast ..." +#: ../gthumb/gth-test-simple.c:48 +msgid "ends with" +msgstr "se konča z" -#~ msgid "Adjust brightness and contrast" -#~ msgstr "Prilagodi svetlost in kontrast" +#: ../gthumb/gth-test-simple.c:51 +msgid "does not contain" +msgstr "ne vsebuje" -#~ msgid "_Hue-Saturation..." -#~ msgstr "_Odtenek-nasičenje ..." +#: ../gthumb/gth-test-simple.c:52 +msgid "matches" +msgstr "zadetki" -#~ msgid "Adjust hue and saturation" -#~ msgstr "Prilagodi odtenek in nasičenje" +#: ../gthumb/gth-test-simple.c:56 +msgid "is lower than" +msgstr "je manjše kot" -#~ msgid "Redeye Removal Tool" -#~ msgstr "Orodje za odstranjevanje rdečih oči" +#: ../gthumb/gth-test-simple.c:57 +msgid "is greater than" +msgstr "je večje kot" -#~ msgid "_Color Balance..." -#~ msgstr "_Barvno uravnavanje ..." +#: ../gthumb/gth-test-simple.c:58 +msgid "is equal to" +msgstr "je enako" -#~ msgid "Adjust color balance" -#~ msgstr "Prilagodi ravnotežje barv" +#: ../gthumb/gth-test-simple.c:62 +msgid "is before" +msgstr "je pred" -#~ msgid "Black and White" -#~ msgstr "Črno-belo" +#: ../gthumb/gth-test-simple.c:63 +msgid "is after" +msgstr "je po" -#~ msgid "Web Palette" -#~ msgstr "Spletna paleta" +#: ../gthumb/gth-time-selector.c:477 +msgid "Today" +msgstr "Danes" -#~ msgid "Step A_nimation" -#~ msgstr "_Animacija po korakih" +#: ../gthumb/gth-time-selector.c:485 +msgid "Now" +msgstr "Sedaj" -#~ msgid "View next animation frame" -#~ msgstr "Poglej naslednjo sliko animacije" +#: ../gthumb/gth-window-actions-entries.h:32 +msgid "Close this window" +msgstr "Zapre to okno" -#~ msgid "Set the image as desktop background (centered)" -#~ msgstr "Nastavi sliko kot ozadje namizja (sredinsko)" +#: ../gthumb/gth-window-actions-entries.h:36 +msgid "Close _All Windows" +msgstr "Zapri _vsa okna" -#~ msgid "_Scaled" -#~ msgstr "_Prilagojena velikost" +#: ../gthumb/gtk-utils.c:551 +msgid "Could not display help" +msgstr "Pomoči ni mogoče prikazati" -#~ msgid "Set the image as desktop background (scaled keeping aspect ratio)" -#~ msgstr "Določi sliko kot ozadje namizja (umerjeno na razmerje velikosti)" +#: ../gthumb/gtk-utils.c:868 +#: ../gthumb/gtk-utils.c:875 +msgid "Could not launch the application" +msgstr "Programa ni mogoče zagnati" -#~ msgid "Str_etched" -#~ msgstr "Raz_tegnjeno" +#: ../gthumb/gtk-utils.c:978 +msgid "_Copy Here" +msgstr "_Kopiraj sem" -#~ msgid "Set the image as desktop background (stretched)" -#~ msgstr "Nastavi sliko kot ozadje namizja (raztegnjeno)" +#: ../gthumb/gtk-utils.c:983 +msgid "_Move Here" +msgstr "_Premakni sem" -#~ msgid "Reset Exif orientation to top-left" -#~ msgstr "Ponastavi Exif usmeritev na zgoraj-levo" +#: ../gthumb/gtk-utils.c:988 +msgid "_Link Here" +msgstr "_Poveži sem" -#~ msgid "Play _Animation" -#~ msgstr "Pr_edvajaj animacijo" +#: ../gthumb/gtk-utils.c:997 +msgid "Cancel" +msgstr "Prekliči" -#~ msgid "Start or stop current animation" -#~ msgstr "Začne ali ustavi trenutno animacijo" +#: ../gthumb/main.c:59 +msgid "Open a new window" +msgstr "Odpri novo okno" -#~ msgid "_High Quality" -#~ msgstr "_Visoka kakovost" +#: ../gthumb/main.c:63 +msgid "Start in fullscreen mode" +msgstr "Zaženi v celozaslonskem načinu" -#~ msgid "Use high quality zoom" -#~ msgstr "Uporaba približanja velike kakovosti" +#: ../gthumb/main.c:67 +msgid "Automatically start a slideshow" +msgstr "Samodejno začni predstavitev" -#~ msgid "_Low Quality" -#~ msgstr "_Nizka kakovost" +#: ../gthumb/main.c:71 +msgid "Automatically import digital camera photos" +msgstr "Samodejno uvozi fotografije iz digitalnega fotoaparata" -#~ msgid "Use low quality zoom" -#~ msgstr "Uporaba približanja nizke kakovosti" +#: ../gthumb/main.c:75 +msgid "Show version" +msgstr "Pokaži različico" -#~ msgid "Use the viewer mode to view single images" -#~ msgstr "Uporaba načina pregledovalnika za ogled posameznik slik" +#: ../gthumb/main.c:344 +msgid "- Image browser and viewer" +msgstr "- Brskalnik in pregledovalnik slik" -#~ msgid "Could not create a local temporary copy of the remote file." -#~ msgstr "Začasne kopije oddaljene datoteke ni mogoče ustvariti." +#: ../gthumb/pixbuf-io.c:174 +#, c-format +msgid "Could not find a suitable module to save the image as \"%s\"" +msgstr "Ni mogoče najti primernega modula za shranjevanje slike kot \"%s\"" -#~ msgid "" -#~ "Could not move temporary file to local destination. Check folder " -#~ "permissions." -#~ msgstr "" -#~ "Začasne datoteke ni mogoče premakniti v krajevni cilj. Preverite " -#~ "dovoljenja mape." diff -Nru gthumb-2.14.3/po/sv.po gthumb-3.0.0/po/sv.po --- gthumb-2.14.3/po/sv.po 2012-02-19 16:49:51.000000000 +0000 +++ gthumb-3.0.0/po/sv.po 2012-03-04 15:22:03.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gThumb\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-14 23:42+0100\n" -"PO-Revision-Date: 2012-02-14 23:42+0100\n" +"POT-Creation-Date: 2012-02-14 23:36+0100\n" +"PO-Revision-Date: 2012-02-14 23:40+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -18,66 +18,71 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../copy-n-paste/eggdesktopfile.c:164 +#: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "" -#: ../copy-n-paste/eggdesktopfile.c:187 +#. translators: 'Version' is from a desktop file, and +#. * should not be translated. '%s' would probably be a +#. * version number. +#: ../copy-n-paste/eggdesktopfile.c:191 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "" -#: ../copy-n-paste/eggdesktopfile.c:957 +#: ../copy-n-paste/eggdesktopfile.c:974 #, c-format msgid "Starting %s" msgstr "Startar %s" -#: ../copy-n-paste/eggdesktopfile.c:1099 +#: ../copy-n-paste/eggdesktopfile.c:1116 #, c-format msgid "Application does not accept documents on command line" msgstr "" -#: ../copy-n-paste/eggdesktopfile.c:1167 +#: ../copy-n-paste/eggdesktopfile.c:1184 #, c-format msgid "Unrecognized launch option: %d" msgstr "" -#: ../copy-n-paste/eggdesktopfile.c:1372 +#. translators: The 'Type=Link' string is found in a +#. * desktop file, and should not be translated. +#: ../copy-n-paste/eggdesktopfile.c:1391 #, c-format msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "" -#: ../copy-n-paste/eggdesktopfile.c:1391 +#: ../copy-n-paste/eggdesktopfile.c:1412 #, c-format msgid "Not a launchable item" msgstr "" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "Inaktivera anslutning till sessionshanterare" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "Ange fil som innehåller sparad konfiguration" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "FIL" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "ID" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "Flaggor för sessionshantering:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "Visa flaggor för sessionshantering" @@ -91,10 +96,9 @@ #. manually set name and icon #: ../data/gthumb.desktop.in.in.h:3 -#: ../data/gthumb-import.desktop.in.in.h:3 -#: ../gthumb/gth-browser.c:523 -#: ../gthumb/gth-main.c:229 -#: ../gthumb/gth-progress-dialog.c:443 +#: ../gthumb/gth-browser.c:529 +#: ../gthumb/gth-progress-dialog.c:386 +#: ../gthumb/main.c:313 msgid "gThumb" msgstr "gThumb" @@ -107,6 +111,10 @@ msgstr "Importera foton från din digitalkamera" #: ../data/gthumb-import.desktop.in.in.h:2 +msgid "Import with gThumb" +msgstr "" + +#: ../data/gthumb-import.desktop.in.in.h:3 msgid "Photo Import Tool" msgstr "Importera foton" @@ -114,52 +122,45 @@ msgid "gThumb Photo Import Tool" msgstr "Fotoimportverktyget gThumb" -#: ../data/gthumb.schemas.in.h:1 +#: ../data/org.gnome.gthumb.gschema.xml.in.h:1 msgid "Images over this size (in bytes) will not be thumbnailed. Use 0 if you want to generate thumbnails for all images." msgstr "Bilder över denna storlek (i byte) kommer det inte att skapas miniatyrbilder för. Använd 0 om du vill generera miniatyrbilder för alla bilder." -#: ../data/gthumb.schemas.in.h:2 -msgid "Possible values are: actual_size, fit, keep_prev, fit_if_larger, fit_width_if_larger." -msgstr "Möjliga värden är: actual_size, fit, keep_prev, fit_if_larger, fit_width_if_larger." - -#: ../data/gthumb.schemas.in.h:3 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:2 -msgid "Possible values are: high, low." -msgstr "Möjliga värden är: high, low." - -#: ../data/gthumb.schemas.in.h:4 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:3 -msgid "Possible values are: light, midtone, dark." -msgstr "Möjliga värden är: light, midtone, dark." - -#: ../data/gthumb.schemas.in.h:5 -msgid "Possible values are: list, thumbnails." -msgstr "Möjliga värden är: list, thumbnails." - -#: ../data/gthumb.schemas.in.h:6 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:4 -msgid "Possible values are: small, medium, large." -msgstr "Möjliga värden är: small, medium, large." - -#: ../data/gthumb.schemas.in.h:7 -msgid "Possible values are: system, text_below, text_beside, text_only, icons_only." -msgstr "Möjliga värden är: system, text_below, text_beside, text_only, icons_only." +#: ../data/org.gnome.gthumb.gschema.xml.in.h:2 +#, fuzzy +msgid "Open files in the active window" +msgstr "Öppna ett annat fönster" -#: ../data/gthumb.schemas.in.h:8 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:5 +#: ../data/org.gnome.gthumb.gschema.xml.in.h:3 +#, fuzzy +msgid "Whether to resize the window to fit the size of the image" +msgstr "Återanvänd detta fönster för att visa andra bilder" + +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:1 msgid "Possible values are: white, black, checked, none." msgstr "Möjliga värden är: white, black, checked, none." -#: ../data/gthumb.schemas.in.h:9 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:6 +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:2 msgid "Whether to always use a black background." msgstr "Huruvida en svart bakgrund alltid ska användas." -#: ../data/gthumb.schemas.in.h:10 -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:7 -msgid "Whether to reset the scrollbar positions after changing image" +#: ../data/org.gnome.gthumb.image-viewer.gschema.xml.in.h:3 +#, fuzzy +msgid "Whether to reset the scrollbars position after changing image" msgstr "Huruvida rullistens positioner ska nollställas efter bild har ändrats" +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:1 +msgid "Possible values are: jpeg, jpg." +msgstr "Möjliga värden är: jpeg, jpg." + +#: ../data/org.gnome.gthumb.pixbuf-savers.gschema.xml.in.h:2 +msgid "Possible values are: tiff, tif." +msgstr "Möjliga värden är: tiff, tif." + +#: ../data/org.gnome.gthumb.rename-series.gschema.xml.in.h:1 +msgid "Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" +msgstr "" + #: ../data/ui/extensions-preferences.ui.h:1 msgid "More extensions..." msgstr "Fler tillägg..." @@ -179,8 +180,8 @@ #. limit label #: ../data/ui/filter-editor.ui.h:2 -#: ../gthumb/gth-filter.c:258 -#: ../gthumb/gth-filter.c:330 +#: ../gthumb/gth-filter.c:268 +#: ../gthumb/gth-filter.c:340 msgid "_Limit to" msgstr "_Begränsa till" @@ -222,7 +223,7 @@ msgid "Pixels:" msgstr "Bildpunkter:" -#. Short for "Standard deviation". Try to keep it short in the translation. +#. Short for "Standard deviation". Try to keep it under the 12 characters in the translation or it will be ellipsizied at the end. #: ../data/ui/histogram-info.ui.h:10 msgid "Std dev:" msgstr "" @@ -260,7 +261,7 @@ msgstr "Skriv över den gamla filen med den nya?" #: ../data/ui/overwrite-dialog.ui.h:9 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 #: ../extensions/image_print/data/ui/print-layout.ui.h:16 msgid "Size:" msgstr "Storlek:" @@ -286,186 +287,107 @@ msgstr "" #: ../data/ui/preferences.ui.h:1 -msgid "Activate items with a double click" -msgstr "Aktivera objekt med ett dubbelklick" - -#: ../data/ui/preferences.ui.h:2 -msgid "Activate items with a single click" -msgstr "Aktivera objekt med ett enkelklick" - -#: ../data/ui/preferences.ui.h:3 msgid "Appearance" msgstr "Utseende" -#: ../data/ui/preferences.ui.h:4 +#: ../data/ui/preferences.ui.h:2 msgid "As_k confirmation before deleting files or catalogs" msgstr "Fr_åga efter bekräftelse innan filer eller album tas bort" -#: ../data/ui/preferences.ui.h:5 +#: ../data/ui/preferences.ui.h:3 msgid "Ask whether to save _modified files" msgstr "Fråga huruvida _ändrade filer ska sparas" -#: ../data/ui/preferences.ui.h:6 -#: ../extensions/image_viewer/preferences.c:111 -msgid "Black" -msgstr "Svart" - -#: ../data/ui/preferences.ui.h:7 -#: ../gthumb/dlg-preferences-extensions.c:72 -#: ../gthumb/gth-browser-actions-entries.h:150 +#: ../data/ui/preferences.ui.h:4 +#: ../gthumb/dlg-preferences-extensions.c:71 +#: ../gthumb/gth-browser-actions-entries.h:173 msgid "Browser" msgstr "Bläddrare" -#: ../data/ui/preferences.ui.h:8 +#: ../data/ui/preferences.ui.h:5 #: ../extensions/contact_sheet/gth-contact-sheet-theme.c:34 #: ../extensions/image_print/data/ui/print-layout.ui.h:4 msgid "Caption" msgstr "Text" -#: ../data/ui/preferences.ui.h:9 -#: ../extensions/image_viewer/preferences.c:112 -msgid "Checked" -msgstr "Rutor" - -#: ../data/ui/preferences.ui.h:10 +#: ../data/ui/preferences.ui.h:6 msgid "Choose startup folder" msgstr "Välj uppstartsmapp" -#: ../data/ui/preferences.ui.h:11 +#: ../data/ui/preferences.ui.h:7 msgid "D_etermine image type from content (slower)" msgstr "Fa_stställ bildtyp från innehåll (långsammare)" -#: ../data/ui/preferences.ui.h:12 -#: ../extensions/image_viewer/preferences.c:101 -msgid "Fit to width if larger" -msgstr "Anpassa till bredd om större" - -#: ../data/ui/preferences.ui.h:13 -#: ../extensions/image_viewer/preferences.c:98 -msgid "Fit to window" -msgstr "Anpassa till fönster" - -#: ../data/ui/preferences.ui.h:14 -#: ../extensions/image_viewer/preferences.c:99 -msgid "Fit to window if larger" -msgstr "Anpassa till fönster om större" - -#: ../data/ui/preferences.ui.h:15 -msgid "Follow Nautilus behaviour" -msgstr "Följ Nautilus beteende" +#: ../data/ui/preferences.ui.h:8 +msgid "File _properties in browser:" +msgstr "" -#: ../data/ui/preferences.ui.h:16 +#: ../data/ui/preferences.ui.h:9 #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:2 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:15 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:393 +#: ../extensions/edit_metadata/gth-edit-general-page.c:473 #: ../extensions/webalbums/data/ui/web-album-exporter.ui.h:13 #: ../gthumb/gth-main-default-metadata.c:33 msgid "General" msgstr "Allmänt" -#: ../data/ui/preferences.ui.h:17 +#: ../data/ui/preferences.ui.h:10 msgid "Go to last _visited location" msgstr "Gå till senaste _besökta plats" -#: ../data/ui/preferences.ui.h:18 +#: ../data/ui/preferences.ui.h:11 msgid "Go to this _folder:" msgstr "Gå till denna _mapp:" -#: ../data/ui/preferences.ui.h:19 -#: ../gthumb/dlg-preferences.c:231 -msgid "Icons only" -msgstr "Endast ikoner" - -#: ../data/ui/preferences.ui.h:20 -#: ../extensions/image_viewer/preferences.c:97 -msgid "Keep previous zoom" -msgstr "Behåll föregående zoom" - -#: ../data/ui/preferences.ui.h:21 -#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-crop.c:448 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 -#: ../extensions/file_tools/gth-file-tool-rotate.c:414 -#: ../extensions/image_viewer/preferences.c:110 -#: ../extensions/slideshow/main.c:277 -msgid "None" -msgstr "Ingen" - -#: ../data/ui/preferences.ui.h:22 +#: ../data/ui/preferences.ui.h:12 msgid "On startup:" msgstr "Vid uppstart:" -#: ../data/ui/preferences.ui.h:23 -#: ../extensions/exiv2_tools/gth-edit-exiv2-page.c:192 +#: ../data/ui/preferences.ui.h:13 +#: ../extensions/exiv2_tools/gth-edit-iptc-page.c:198 #: ../extensions/gstreamer_tools/main.c:33 -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 msgid "Other" msgstr "Övrigt" -#: ../data/ui/preferences.ui.h:24 -#, fuzzy -msgid "Set image to actual size" -msgstr "Sortera bilder efter filstorlek" - -#: ../data/ui/preferences.ui.h:25 +#: ../data/ui/preferences.ui.h:14 msgid "Set to C_urrent" msgstr "Ställ in till a_ktuell" -#. Set widgets data. -#: ../data/ui/preferences.ui.h:26 -#: ../gthumb/dlg-preferences.c:231 -msgid "System settings" -msgstr "Systeminställningar" - -#: ../data/ui/preferences.ui.h:27 +#: ../data/ui/preferences.ui.h:15 #, fuzzy msgid "T_humbnails in viewer:" msgstr "M_iniatyrbildsstorlek:" -#: ../data/ui/preferences.ui.h:28 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text below icons" -msgstr "Text under ikoner" - -#: ../data/ui/preferences.ui.h:29 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text beside icons" -msgstr "Text bredvid ikoner" - -#: ../data/ui/preferences.ui.h:30 -#: ../gthumb/dlg-preferences.c:231 -msgid "Text only" -msgstr "Endast text" - -#: ../data/ui/preferences.ui.h:31 +#: ../data/ui/preferences.ui.h:16 msgid "Thumbnail _size:" msgstr "M_iniatyrbildsstorlek:" -#: ../data/ui/preferences.ui.h:32 -#: ../extensions/image_viewer/preferences.c:109 -msgid "White" -msgstr "Vit" +#: ../data/ui/preferences.ui.h:17 +#, fuzzy +msgid "_Reuse the active window to open files" +msgstr "Ändra storlek på fönstret till storleken för bilden" -#: ../data/ui/preferences.ui.h:33 +#: ../data/ui/preferences.ui.h:18 msgid "_Store metadata inside files if possible" msgstr "" -#: ../data/ui/preferences.ui.h:34 +#: ../data/ui/preferences.ui.h:19 msgid "_Toolbar style:" msgstr "_Verktygsradsstil:" -#: ../data/ui/preferences.ui.h:35 -msgid "gthumb Preferences" -msgstr "Inställningar för gthumb" +#: ../data/ui/preferences.ui.h:20 +#, fuzzy +msgid "below the folder list" +msgstr "Visa mapparna" -#: ../data/ui/preferences.ui.h:36 -msgid "on the bottom" -msgstr "" +#: ../data/ui/preferences.ui.h:21 +msgid "gThumb Preferences" +msgstr "Inställningar för gThumb" -#: ../data/ui/preferences.ui.h:37 +#: ../data/ui/preferences.ui.h:22 #, fuzzy -msgid "on the side" +msgid "on the right" msgstr "Gör om sökningen" #: ../data/ui/sort-order.ui.h:1 @@ -490,11 +412,11 @@ msgid "Upload images to 23hq.com" msgstr "Skicka upp bilder till Facebook" -#: ../extensions/23hq/callbacks.c:67 +#: ../extensions/23hq/callbacks.c:68 msgid "_23..." msgstr "_23..." -#: ../extensions/23hq/callbacks.c:68 +#: ../extensions/23hq/callbacks.c:69 #, fuzzy msgid "Upload photos to 23" msgstr "Skicka upp filer till Flickr" @@ -617,7 +539,7 @@ #: ../extensions/burn_disc/gth-burn-task.c:238 #: ../extensions/burn_disc/gth-burn-task.c:259 -#: ../extensions/burn_disc/gth-burn-task.c:393 +#: ../extensions/burn_disc/gth-burn-task.c:397 msgid "Write to Disc" msgstr "Skriv till skiva" @@ -636,8 +558,8 @@ #: ../extensions/catalogs/dlg-add-to-catalog.c:274 #: ../extensions/catalogs/dlg-add-to-catalog.c:394 #: ../extensions/file_manager/actions.c:65 -#: ../extensions/list_tools/gth-script-editor-dialog.c:319 -#: ../gthumb/gth-filter-editor-dialog.c:491 +#: ../extensions/list_tools/gth-script-editor-dialog.c:290 +#: ../gthumb/gth-filter-editor-dialog.c:461 #, c-format msgid "No name specified" msgstr "Inget namn angivet" @@ -695,7 +617,7 @@ msgid "Could not remove the catalog" msgstr "Kunde inte ta bort albumet" -#: ../extensions/catalogs/actions.c:361 +#: ../extensions/catalogs/actions.c:363 #, fuzzy, c-format msgid "Are you sure you want to remove \"%s\"?" msgstr "Är du säker på att du vill permanent ta bort \"%s\"?" @@ -713,8 +635,7 @@ msgstr "Gå till mappen som innehåller den markerade filen" #: ../extensions/catalogs/callbacks.c:110 -#: ../extensions/edit_metadata/callbacks.c:116 -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:86 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:85 msgid "Other..." msgstr "Annat..." @@ -757,10 +678,10 @@ #: ../extensions/catalogs/callbacks.c:497 #: ../extensions/catalogs/callbacks.c:502 -#: ../extensions/photo_importer/dlg-photo-importer.c:359 -#: ../extensions/photo_importer/dlg-photo-importer.c:399 -#: ../gthumb/gth-file-list.c:45 -#: ../gthumb/gth-folder-tree.c:888 +#: ../extensions/photo_importer/dlg-photo-importer.c:364 +#: ../extensions/photo_importer/dlg-photo-importer.c:404 +#: ../gthumb/gth-file-list.c:43 +#: ../gthumb/gth-folder-tree.c:883 msgid "(Empty)" msgstr "(Tom)" @@ -777,10 +698,10 @@ msgstr "Organisera automatiskt filer efter datum" #: ../extensions/catalogs/catalogs.extension.in.in.h:1 -#: ../extensions/catalogs/gth-catalog.c:641 -#: ../extensions/catalogs/gth-catalog.c:690 -#: ../extensions/catalogs/gth-catalog.c:1047 -#: ../extensions/catalogs/gth-catalog.c:1048 +#: ../extensions/catalogs/gth-catalog.c:611 +#: ../extensions/catalogs/gth-catalog.c:660 +#: ../extensions/catalogs/gth-catalog.c:1017 +#: ../extensions/catalogs/gth-catalog.c:1018 msgid "Catalogs" msgstr "Album" @@ -805,8 +726,8 @@ msgstr "_Nytt album" #: ../extensions/catalogs/data/ui/add-to-catalog.ui.h:5 -#: ../extensions/file_manager/actions.c:922 -#: ../extensions/webalbums/gth-web-exporter.c:1852 +#: ../extensions/file_manager/actions.c:929 +#: ../extensions/webalbums/gth-web-exporter.c:1842 msgid "_View the destination" msgstr "_Visa målet" @@ -815,7 +736,7 @@ msgstr "Album" #: ../extensions/catalogs/data/ui/catalog-properties.ui.h:3 -#: ../gthumb/gth-file-properties.c:201 +#: ../gthumb/gth-file-properties.c:212 msgid "Properties" msgstr "Egenskaper" @@ -862,7 +783,7 @@ msgstr "Markera inget" #: ../extensions/catalogs/data/ui/organize-files.ui.h:1 -#: ../extensions/edit_metadata/gth-edit-comment-page.c:470 +#: ../extensions/edit_metadata/gth-edit-general-page.c:549 #: ../gthumb/gth-main-default-tests.c:264 #, fuzzy msgid "Date photo was taken" @@ -888,7 +809,7 @@ msgstr "Enkel" #: ../extensions/catalogs/data/ui/organize-files.ui.h:7 -#: ../extensions/comments/main.c:261 +#: ../extensions/comments/main.c:280 msgid "Tag" msgstr "Tagg" @@ -919,7 +840,7 @@ msgstr "Kunde inte lägga till filerna till albumet" #: ../extensions/catalogs/dlg-add-to-catalog.c:217 -#: ../extensions/search/gth-search-task.c:352 +#: ../extensions/search/gth-search-task.c:356 msgid "Could not create the catalog" msgstr "Kunde inte skapa albumet" @@ -935,8 +856,9 @@ msgid "Files will be organized in catalogs. No file will be moved on disk." msgstr "" -#: ../extensions/catalogs/gth-catalog.c:1145 +#: ../extensions/catalogs/gth-catalog.c:1115 #: ../extensions/comments/main.c:43 +#: ../extensions/edit_metadata/callbacks.c:106 #: ../gthumb/gth-main-default-metadata.c:53 msgid "Tags" msgstr "Taggar" @@ -977,11 +899,11 @@ msgstr "Kunde inte ta bort filerna från albumet" #: ../extensions/catalogs/gth-file-source-catalogs.c:1441 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:675 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:684 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:712 -#: ../extensions/exiv2_tools/exiv2-utils.cpp:1215 -#: ../extensions/search/gth-search.c:295 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:682 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:691 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:720 +#: ../extensions/exiv2_tools/exiv2-utils.cpp:1225 +#: ../extensions/search/gth-search.c:265 msgid "Invalid file format" msgstr "Ogiltigt filformat" @@ -991,9 +913,8 @@ msgstr "Åtgärden är färdigställd. Album: %d. Bilder: %d." #: ../extensions/change_date/callbacks.c:44 -#, fuzzy msgid "Change _Date..." -msgstr "Ändra datum" +msgstr "Ändra _datum..." #: ../extensions/change_date/callbacks.c:45 #, fuzzy @@ -1018,9 +939,8 @@ msgstr "-" #: ../extensions/change_date/data/ui/change-date.ui.h:3 -#, fuzzy msgid "A_djust by" -msgstr "Justera färger" +msgstr "J_ustera efter" #: ../extensions/change_date/data/ui/change-date.ui.h:4 msgid "Change Date" @@ -1087,7 +1007,7 @@ msgstr "Kommentarer och taggar" #: ../extensions/comments/data/ui/comments-preferences.ui.h:1 -#: ../extensions/importer/gth-import-preferences-dialog.c:314 +#: ../extensions/importer/gth-import-preferences-dialog.c:318 msgid "Preferences" msgstr "Inställningar" @@ -1096,7 +1016,7 @@ msgstr "_Synkronisera med inbäddat metadata" #: ../extensions/comments/main.c:33 -#: ../extensions/edit_metadata/callbacks.c:111 +#: ../extensions/edit_metadata/callbacks.c:100 msgid "Comment" msgstr "Kommentar" @@ -1106,7 +1026,7 @@ msgstr "Titel" #: ../extensions/comments/main.c:40 -#: ../extensions/comments/main.c:245 +#: ../extensions/comments/main.c:264 #: ../extensions/contact_sheet/data/ui/contact-sheet.ui.h:12 #: ../extensions/contact_sheet/data/ui/image-wall.ui.h:4 #: ../extensions/image_print/data/ui/print-layout.ui.h:8 @@ -1119,7 +1039,7 @@ msgstr "Beskrivning" #: ../extensions/comments/main.c:41 -#: ../extensions/comments/main.c:253 +#: ../extensions/comments/main.c:272 #: ../gthumb/gth-main-default-metadata.c:50 msgid "Place" msgstr "Plats" @@ -1189,6 +1109,15 @@ msgid "Inward Shadow" msgstr "" +#: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:6 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-crop.c:454 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/slideshow/main.c:277 +msgid "None" +msgstr "Ingen" + #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:7 msgid "Outward Shadow" msgstr "" @@ -1220,7 +1149,7 @@ msgstr "Bildspel" #: ../extensions/contact_sheet/data/ui/contact-sheet-theme-properties.ui.h:14 -#: ../extensions/rename_series/dlg-rename-series.c:63 +#: ../extensions/rename_series/dlg-rename-series.c:57 msgid "Text" msgstr "Text" @@ -1419,21 +1348,21 @@ msgid "Image Wall" msgstr "Bildvägg" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:483 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:495 -#: ../extensions/contact_sheet/dlg-contact-sheet.c:509 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:486 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:498 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:512 msgid "Could not save the theme" msgstr "Kunde inte spara temat" -#: ../extensions/contact_sheet/dlg-contact-sheet.c:654 +#: ../extensions/contact_sheet/dlg-contact-sheet.c:657 msgid "Could not delete the theme" msgstr "Kunde inte ta bort temat" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:247 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:248 msgid "Creating images" msgstr "Skapar bilder" -#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:896 +#: ../extensions/contact_sheet/gth-contact-sheet-creator.c:897 msgid "Generating thumbnails" msgstr "Genererar miniatyrbilder" @@ -1445,15 +1374,15 @@ msgid "Footer" msgstr "Sidfot" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:197 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:193 msgid "Theme Properties" msgstr "Temaegenskaper" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:212 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:208 msgid "Copy _From" msgstr "Kopiera _från" -#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:348 +#: ../extensions/contact_sheet/gth-contact-sheet-theme-dialog.c:316 msgid "New theme" msgstr "Nytt tema" @@ -1492,17 +1421,17 @@ msgid "_Use the original image folder" msgstr "_Behåll ursprungliga filnamn" -#: ../extensions/convert_format/dlg-convert-format.c:91 +#: ../extensions/convert_format/dlg-convert-format.c:93 msgid "Converting images" msgstr "Konverterar bilder" -#: ../extensions/desktop_background/actions.c:203 +#: ../extensions/desktop_background/actions.c:162 #, fuzzy msgid "Could not show the desktop background properties" msgstr "Ställ in bilden som skrivbordsbakgrund (sida vid sida)" -#: ../extensions/desktop_background/actions.c:269 -#: ../extensions/desktop_background/actions.c:287 +#: ../extensions/desktop_background/actions.c:228 +#: ../extensions/desktop_background/actions.c:246 #, fuzzy msgid "Could not set the desktop background" msgstr "Ställ in bilden som skrivbordsbakgrund (sida vid sida)" @@ -1520,34 +1449,35 @@ msgid "Desktop background" msgstr "Skrivbordsbakgrund" -#: ../extensions/edit_metadata/actions.c:129 +#: ../extensions/edit_metadata/actions.c:66 #, fuzzy msgid "Are you sure you want to permanently delete the metadata of the selected files?" msgstr "Är du säker på att du vill permanent ta bort \"%s\"?" -#: ../extensions/edit_metadata/actions.c:136 +#: ../extensions/edit_metadata/actions.c:73 #, fuzzy msgid "If you delete the metadata, it will be permanently lost." msgstr "Om du tar bort en fil så kommer den förloras för alltid." -#: ../extensions/edit_metadata/callbacks.c:108 +#: ../extensions/edit_metadata/callbacks.c:97 msgid "T_ags" msgstr "T_aggar" -#: ../extensions/edit_metadata/callbacks.c:112 +#: ../extensions/edit_metadata/callbacks.c:101 #, fuzzy msgid "Edit the comment and other information of the selected files" msgstr "Gå till mappen som innehåller den markerade filen" -#: ../extensions/edit_metadata/callbacks.c:117 -msgid "Choose another tag" -msgstr "Välj en annan tagg" +#: ../extensions/edit_metadata/callbacks.c:107 +#, fuzzy +msgid "Set the tags of the selected files" +msgstr "Ta bort markerade filer" -#: ../extensions/edit_metadata/callbacks.c:121 +#: ../extensions/edit_metadata/callbacks.c:112 msgid "Delete Metadata" msgstr "Ta bort metadata" -#: ../extensions/edit_metadata/callbacks.c:122 +#: ../extensions/edit_metadata/callbacks.c:113 #, fuzzy msgid "Delete the comment and the embedded metadata of the selected files" msgstr "Gå till mappen som innehåller den markerade filen" @@ -1575,12 +1505,12 @@ msgid "_Title:" msgstr "_Titel:" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:63 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:121 msgid "Could not save the file metadata" msgstr "Kunde inte spara filens metadata" -#: ../extensions/edit_metadata/dlg-edit-metadata.c:150 -#: ../gthumb/gth-overwrite-dialog.c:166 +#: ../extensions/edit_metadata/dlg-edit-metadata.c:234 +#: ../gthumb/gth-overwrite-dialog.c:136 msgid "Cannot read file information" msgstr "Kan inte läsa filinformation" @@ -1592,56 +1522,63 @@ msgid "Edit metadata" msgstr "Redigera metadata" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:467 +#. Translators: the %s symbol in the string is a file name +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:63 +#, c-format +msgid "%s Metadata" +msgstr "%s-metadata" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:66 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:83 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:335 +#, c-format +msgid "%d file" +msgid_plural "%d files" +msgstr[0] "%d fil" +msgstr[1] "%d filer" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:144 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:192 +msgid "Sa_ve and Close" +msgstr "S_para och stäng" + +#: ../extensions/edit_metadata/gth-edit-comment-dialog.c:156 +msgid "Save only cha_nged fields" +msgstr "Spara endast än_drade fält" + +#: ../extensions/edit_metadata/gth-edit-general-page.c:546 msgid "No date" msgstr "Inget datum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:468 +#: ../extensions/edit_metadata/gth-edit-general-page.c:547 msgid "The following date" msgstr "Följande datum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:469 -#: ../extensions/importer/gth-import-preferences-dialog.c:327 +#: ../extensions/edit_metadata/gth-edit-general-page.c:548 +#: ../extensions/importer/gth-import-preferences-dialog.c:331 msgid "Current date" msgstr "Aktuellt datum" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:471 +#: ../extensions/edit_metadata/gth-edit-general-page.c:550 msgid "Last modified date" msgstr "Datum för senaste ändring" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:472 +#: ../extensions/edit_metadata/gth-edit-general-page.c:551 #, fuzzy msgid "File creation date" msgstr "Datum för skapande av bilden" -#: ../extensions/edit_metadata/gth-edit-comment-page.c:473 +#: ../extensions/edit_metadata/gth-edit-general-page.c:552 msgid "Do not modify" msgstr "Ändra inte" -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:105 -#, fuzzy -msgid "Save only cha_nged fields" -msgstr "Spara ändringar i filen \"%s\"?" - #. Translators: the %s symbol in the string is a file name -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:161 -#, c-format -msgid "%s Metadata" -msgstr "%s-metadata" - -#: ../extensions/edit_metadata/gth-edit-metadata-dialog.c:165 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:332 -#, c-format -msgid "%d file" -msgid_plural "%d files" -msgstr[0] "%d fil" -msgstr[1] "%d filer" - -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:81 -msgid "New tag" -msgstr "Ny tagg" +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:80 +#, fuzzy, c-format +msgid "%s Tags" +msgstr "Taggar" -#: ../extensions/edit_metadata/gth-tag-chooser-dialog.c:223 +#: ../extensions/edit_metadata/gth-edit-tags-dialog.c:184 msgid "Assign Tags" msgstr "" @@ -1772,11 +1709,11 @@ msgid "XMP Attached" msgstr "" -#: ../extensions/exiv2_tools/main.c:255 +#: ../extensions/exiv2_tools/main.c:256 msgid "date photo was taken" msgstr "datumet då fotot togs" -#: ../extensions/export_tools/callbacks.c:59 +#: ../extensions/export_tools/callbacks.c:99 msgid "Share" msgstr "Dela" @@ -1908,9 +1845,9 @@ msgstr "F_ortsätt" #: ../extensions/facebook/data/ui/facebook-complete-authorization.ui.h:2 -#: ../extensions/facebook/facebook-authentication.c:499 -#: ../extensions/flicker_utils/flickr-authentication.c:435 -#: ../extensions/oauth/oauth-authentication.c:450 +#: ../extensions/facebook/facebook-authentication.c:472 +#: ../extensions/flicker_utils/flickr-authentication.c:408 +#: ../extensions/oauth/oauth-authentication.c:423 msgid "Once you're done, click the 'Continue' button below." msgstr "" @@ -1925,34 +1862,34 @@ #: ../extensions/flicker_utils/data/ui/flicker-export-completed.ui.h:2 #: ../extensions/photobucket/data/ui/photobucket-export-completed.ui.h:2 #: ../extensions/picasaweb/data/ui/picasa-web-export-completed.ui.h:2 -#: ../extensions/webalbums/gth-web-exporter.c:1851 +#: ../extensions/webalbums/gth-web-exporter.c:1841 msgid "_Open in the Browser" msgstr "_Öppna i webbläsaren" -#: ../extensions/facebook/dlg-export-to-facebook.c:128 -#: ../extensions/facebook/dlg-export-to-facebook.c:333 -#: ../extensions/facebook/facebook-authentication.c:219 +#: ../extensions/facebook/dlg-export-to-facebook.c:130 +#: ../extensions/facebook/dlg-export-to-facebook.c:335 +#: ../extensions/facebook/facebook-authentication.c:192 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:138 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:399 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:234 -#: ../extensions/flicker_utils/flickr-authentication.c:218 -#: ../extensions/oauth/oauth-authentication.c:214 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:237 +#: ../extensions/flicker_utils/flickr-authentication.c:191 +#: ../extensions/oauth/oauth-authentication.c:187 #: ../extensions/photobucket/dlg-export-to-photobucket.c:131 #: ../extensions/photobucket/dlg-export-to-photobucket.c:376 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:139 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:424 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:377 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:380 msgid "Could not connect to the server" msgstr "Kunde inte ansluta till servern" -#: ../extensions/facebook/dlg-export-to-facebook.c:180 +#: ../extensions/facebook/dlg-export-to-facebook.c:182 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:246 #: ../extensions/photobucket/dlg-export-to-photobucket.c:182 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:192 msgid "Could not upload the files" msgstr "Kunde inte skicka upp filerna" -#: ../extensions/facebook/dlg-export-to-facebook.c:410 +#: ../extensions/facebook/dlg-export-to-facebook.c:412 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:188 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:223 #: ../extensions/photobucket/dlg-export-to-photobucket.c:462 @@ -1960,106 +1897,106 @@ msgid "Could not create the album" msgstr "Kunde inte skapa albumet" -#: ../extensions/facebook/dlg-export-to-facebook.c:479 +#: ../extensions/facebook/dlg-export-to-facebook.c:481 #: ../extensions/photobucket/dlg-export-to-photobucket.c:534 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:783 msgid "New Album" msgstr "Nytt album" -#: ../extensions/facebook/dlg-export-to-facebook.c:558 +#: ../extensions/facebook/dlg-export-to-facebook.c:561 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:557 -#: ../extensions/image_print/gth-image-print-job.c:1816 +#: ../extensions/image_print/gth-image-print-job.c:1789 #: ../extensions/photobucket/dlg-export-to-photobucket.c:614 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1002 msgid "No valid file selected." msgstr "" -#: ../extensions/facebook/dlg-export-to-facebook.c:559 +#: ../extensions/facebook/dlg-export-to-facebook.c:562 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:558 #: ../extensions/photobucket/dlg-export-to-photobucket.c:615 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1003 msgid "Could not export the files" msgstr "Kunde inte exportera filerna" -#: ../extensions/facebook/dlg-export-to-facebook.c:567 -#: ../extensions/find_duplicates/gth-find-duplicates.c:284 -#: ../extensions/find_duplicates/gth-find-duplicates.c:376 +#: ../extensions/facebook/dlg-export-to-facebook.c:570 +#: ../extensions/find_duplicates/gth-find-duplicates.c:255 +#: ../extensions/find_duplicates/gth-find-duplicates.c:347 #: ../extensions/flicker_utils/dlg-export-to-flickr.c:566 #: ../extensions/photobucket/dlg-export-to-photobucket.c:623 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:1010 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:800 -#: ../gthumb/gth-browser.c:990 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:803 +#: ../gthumb/gth-browser.c:995 #, c-format msgid "%d file (%s)" msgid_plural "%d files (%s)" msgstr[0] "%d fil (%s)" msgstr[1] "%d filer (%s)" -#: ../extensions/facebook/dlg-export-to-facebook.c:589 -#: ../extensions/flicker_utils/dlg-export-to-flickr.c:590 -#: ../extensions/photobucket/dlg-export-to-photobucket.c:643 +#: ../extensions/facebook/dlg-export-to-facebook.c:591 +#: ../extensions/flicker_utils/dlg-export-to-flickr.c:589 +#: ../extensions/photobucket/dlg-export-to-photobucket.c:642 #, c-format msgid "Export to %s" msgstr "Exportera till %s" -#: ../extensions/facebook/facebook-account-chooser-dialog.c:229 -#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:229 -#: ../extensions/oauth/oauth-account-chooser-dialog.c:229 +#: ../extensions/facebook/facebook-account-chooser-dialog.c:200 +#: ../extensions/flicker_utils/flickr-account-chooser-dialog.c:200 +#: ../extensions/oauth/oauth-account-chooser-dialog.c:200 msgid "New authentication..." msgstr "Ny autentisering..." -#: ../extensions/facebook/facebook-authentication.c:221 -#: ../extensions/flicker_utils/flickr-authentication.c:220 -#: ../extensions/oauth/oauth-authentication.c:216 +#: ../extensions/facebook/facebook-authentication.c:194 +#: ../extensions/flicker_utils/flickr-authentication.c:193 +#: ../extensions/oauth/oauth-authentication.c:189 msgid "Choose _Account..." msgstr "Välj k_onto..." -#: ../extensions/facebook/facebook-authentication.c:498 -#: ../extensions/flicker_utils/flickr-authentication.c:434 -#: ../extensions/oauth/oauth-authentication.c:449 +#: ../extensions/facebook/facebook-authentication.c:471 +#: ../extensions/flicker_utils/flickr-authentication.c:407 +#: ../extensions/oauth/oauth-authentication.c:422 #, c-format msgid "Return to this window when you have finished the authorization process on %s" msgstr "" -#: ../extensions/facebook/facebook-authentication.c:583 -#: ../extensions/flicker_utils/flickr-authentication.c:514 -#: ../extensions/oauth/oauth-authentication.c:529 +#: ../extensions/facebook/facebook-authentication.c:556 +#: ../extensions/flicker_utils/flickr-authentication.c:487 +#: ../extensions/oauth/oauth-authentication.c:502 #, c-format msgid "gthumb requires your authorization to upload the photos to %s" msgstr "" -#: ../extensions/facebook/facebook-authentication.c:584 -#: ../extensions/flicker_utils/flickr-authentication.c:515 -#: ../extensions/oauth/oauth-authentication.c:530 +#: ../extensions/facebook/facebook-authentication.c:557 +#: ../extensions/flicker_utils/flickr-authentication.c:488 +#: ../extensions/oauth/oauth-authentication.c:503 #, c-format msgid "Click 'Authorize' to open your web browser and authorize gthumb to upload photos to %s. When you're finished, return to this window to complete the authorization." msgstr "" -#: ../extensions/facebook/facebook-authentication.c:679 -#: ../extensions/flicker_utils/flickr-authentication.c:615 -#: ../extensions/oauth/oauth-authentication.c:632 +#: ../extensions/facebook/facebook-authentication.c:652 +#: ../extensions/flicker_utils/flickr-authentication.c:588 +#: ../extensions/oauth/oauth-authentication.c:605 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:820 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:681 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:684 msgid "Choose Account" msgstr "Välj konto" -#: ../extensions/facebook/facebook-authentication.c:788 -#: ../extensions/flicker_utils/flickr-authentication.c:724 -#: ../extensions/oauth/oauth-authentication.c:741 +#: ../extensions/facebook/facebook-authentication.c:761 +#: ../extensions/flicker_utils/flickr-authentication.c:697 +#: ../extensions/oauth/oauth-authentication.c:714 #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:881 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:742 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:745 msgid "Edit Accounts" msgstr "Redigera konton" -#: ../extensions/facebook/facebook-connection.c:304 -#: ../extensions/facebook/facebook-connection.c:464 -#: ../extensions/facebook/facebook-service.c:191 -#: ../extensions/facebook/facebook-service.c:294 -#: ../extensions/facebook/facebook-service.c:497 -#: ../extensions/flicker_utils/flickr-connection.c:295 -#: ../extensions/flicker_utils/flickr-connection.c:442 -#: ../extensions/flicker_utils/flickr-service.c:224 -#: ../extensions/flicker_utils/flickr-service.c:427 +#: ../extensions/facebook/facebook-connection.c:275 +#: ../extensions/facebook/facebook-connection.c:435 +#: ../extensions/facebook/facebook-service.c:162 +#: ../extensions/facebook/facebook-service.c:265 +#: ../extensions/facebook/facebook-service.c:468 +#: ../extensions/flicker_utils/flickr-connection.c:266 +#: ../extensions/flicker_utils/flickr-connection.c:413 +#: ../extensions/flicker_utils/flickr-service.c:195 +#: ../extensions/flicker_utils/flickr-service.c:398 #: ../extensions/photobucket/photobucket-consumer.c:74 #: ../extensions/photobucket/photobucket-consumer.c:79 #: ../extensions/photobucket/photobucket-consumer.c:115 @@ -2067,17 +2004,17 @@ msgid "Unknown error" msgstr "Okänt fel" -#: ../extensions/facebook/facebook-connection.c:339 -#: ../extensions/facebook/facebook-connection.c:490 -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-connection.c:321 -#: ../extensions/flicker_utils/flickr-connection.c:468 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 -#: ../extensions/picasaweb/google-connection.c:373 +#: ../extensions/facebook/facebook-connection.c:310 +#: ../extensions/facebook/facebook-connection.c:461 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-connection.c:292 +#: ../extensions/flicker_utils/flickr-connection.c:439 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 +#: ../extensions/picasaweb/google-connection.c:344 msgid "Connecting to the server" msgstr "Ansluter till servern" @@ -2089,58 +2026,58 @@ msgid "Upload images to Facebook" msgstr "Skicka upp bilder till Facebook" -#: ../extensions/facebook/facebook-service.c:217 -#: ../extensions/facebook/facebook-service.c:319 -#: ../extensions/flicker_utils/flickr-service.c:248 -#: ../extensions/oauth/oauth-connection.c:385 -#: ../extensions/oauth/oauth-connection.c:460 -#: ../extensions/oauth/oauth-connection.c:564 +#: ../extensions/facebook/facebook-service.c:188 +#: ../extensions/facebook/facebook-service.c:290 +#: ../extensions/flicker_utils/flickr-service.c:219 +#: ../extensions/oauth/oauth-connection.c:356 +#: ../extensions/oauth/oauth-connection.c:431 +#: ../extensions/oauth/oauth-connection.c:535 msgid "Getting account information" msgstr "Hämtar kontoinformation" -#: ../extensions/facebook/facebook-service.c:425 -#: ../extensions/flicker_utils/flickr-service.c:352 -#: ../extensions/photobucket/photobucket-service.c:236 -#: ../extensions/picasaweb/picasa-web-service.c:238 +#: ../extensions/facebook/facebook-service.c:396 +#: ../extensions/flicker_utils/flickr-service.c:323 +#: ../extensions/photobucket/photobucket-service.c:207 +#: ../extensions/picasaweb/picasa-web-service.c:209 msgid "Getting the album list" msgstr "Hämtar albumlistan" -#: ../extensions/facebook/facebook-service.c:554 -#: ../extensions/flicker_utils/flickr-service.c:455 -#: ../extensions/flicker_utils/flickr-service.c:575 -#: ../extensions/flicker_utils/flickr-service.c:613 -#: ../extensions/photobucket/photobucket-service.c:345 -#: ../extensions/picasaweb/picasa-web-service.c:329 +#: ../extensions/facebook/facebook-service.c:525 +#: ../extensions/flicker_utils/flickr-service.c:426 +#: ../extensions/flicker_utils/flickr-service.c:546 +#: ../extensions/flicker_utils/flickr-service.c:584 +#: ../extensions/photobucket/photobucket-service.c:316 +#: ../extensions/picasaweb/picasa-web-service.c:300 msgid "Creating the new album" msgstr "Skapar nya albumet" -#: ../extensions/facebook/facebook-service.c:613 -#: ../extensions/flicker_utils/flickr-service.c:663 -#: ../extensions/photobucket/photobucket-service.c:402 -#: ../extensions/picasaweb/picasa-web-service.c:386 +#: ../extensions/facebook/facebook-service.c:584 +#: ../extensions/flicker_utils/flickr-service.c:634 +#: ../extensions/photobucket/photobucket-service.c:373 +#: ../extensions/picasaweb/picasa-web-service.c:357 #, c-format msgid "Could not upload '%s': %s" msgstr "Kunde inte skicka upp \"%s\": %s" #. Translators: %s is a filename -#: ../extensions/facebook/facebook-service.c:699 -#: ../extensions/flicker_utils/flickr-service.c:774 -#: ../extensions/photobucket/photobucket-service.c:459 -#: ../extensions/picasaweb/picasa-web-service.c:441 +#: ../extensions/facebook/facebook-service.c:670 +#: ../extensions/flicker_utils/flickr-service.c:745 +#: ../extensions/photobucket/photobucket-service.c:430 +#: ../extensions/picasaweb/picasa-web-service.c:412 #, c-format msgid "Uploading '%s'" msgstr "Skickar upp \"%s\"" -#: ../extensions/facebook/facebook-service.c:915 -#: ../extensions/flicker_utils/flickr-service.c:943 -#: ../extensions/photobucket/photobucket-service.c:628 -#: ../extensions/picasaweb/picasa-web-service.c:634 +#: ../extensions/facebook/facebook-service.c:886 +#: ../extensions/flicker_utils/flickr-service.c:914 +#: ../extensions/photobucket/photobucket-service.c:599 +#: ../extensions/picasaweb/picasa-web-service.c:605 msgid "Uploading the files to the server" msgstr "Skickar upp filerna till servern" -#: ../extensions/facebook/facebook-service.c:1032 -#: ../extensions/flicker_utils/flickr-service.c:1106 -#: ../extensions/picasaweb/picasa-web-service.c:747 +#: ../extensions/facebook/facebook-service.c:1003 +#: ../extensions/flicker_utils/flickr-service.c:1077 +#: ../extensions/picasaweb/picasa-web-service.c:718 msgid "Getting the photo list" msgstr "Hämtar fotolistan" @@ -2185,29 +2122,29 @@ msgstr "Kunde inte flytta mappen till papperskorgen" #: ../extensions/file_manager/actions.c:808 -#: ../gthumb/gth-file-source-vfs.c:830 +#: ../gthumb/gth-file-source-vfs.c:841 #, c-format msgid "Are you sure you want to permanently delete \"%s\"?" msgstr "Är du säker på att du vill permanent ta bort \"%s\"?" #: ../extensions/file_manager/actions.c:818 -#: ../gthumb/gth-file-source-vfs.c:843 +#: ../gthumb/gth-file-source-vfs.c:854 msgid "If you delete a file, it will be permanently lost." msgstr "Om du tar bort en fil så kommer den förloras för alltid." -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:910 msgid "Move To" msgstr "Flytta till" -#: ../extensions/file_manager/actions.c:907 +#: ../extensions/file_manager/actions.c:910 msgid "Copy To" msgstr "Kopiera till" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:914 msgid "Move" msgstr "Flytta" -#: ../extensions/file_manager/actions.c:911 +#: ../extensions/file_manager/actions.c:914 msgid "Copy" msgstr "Kopiera" @@ -2231,7 +2168,7 @@ #: ../extensions/file_manager/callbacks.c:183 #: ../extensions/file_manager/callbacks.c:219 -#: ../gthumb/gth-file-source-vfs.c:804 +#: ../gthumb/gth-file-source-vfs.c:813 msgid "Mo_ve to Trash" msgstr "Flytta till _papperskorgen" @@ -2293,10 +2230,10 @@ msgid "Move the selected files to another folder" msgstr "Flytta de markerade filerna till en annan mapp" -#: ../extensions/file_manager/callbacks.c:1004 -#: ../extensions/find_duplicates/gth-find-duplicates.c:610 -#: ../gthumb/gth-browser.c:4922 -#: ../gthumb/gth-browser.c:4956 +#: ../extensions/file_manager/callbacks.c:1003 +#: ../extensions/find_duplicates/gth-find-duplicates.c:581 +#: ../gthumb/gth-browser.c:4925 +#: ../gthumb/gth-browser.c:4959 msgid "Could not perform the operation" msgstr "Kunde inte genomföra åtgärden" @@ -2354,57 +2291,57 @@ msgid "_Yellow-Blue:" msgstr "_Gul-Blå:" -#. this is used to separate the dimensions, for example: 120 × 250 -#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 -msgid "×" -msgstr "×" - -#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:1 #: ../extensions/file_tools/data/ui/resize-options.ui.h:3 msgid "Aspect ratio" msgstr "Bildförhållande" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:2 msgid "C_rop" msgstr "Bes_kär" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:5 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:3 msgid "Center" msgstr "Centrera" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:4 #: ../extensions/file_tools/data/ui/resize-options.ui.h:7 msgid "I_nvert aspect ratio" msgstr "I_nvertera aspektförhållande" #. after the colon there is a control to select the size in pixels -#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:6 msgid "M_ultiple of:" msgstr "" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:9 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:7 msgid "Maximize" msgstr "Maximera" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:8 #: ../extensions/red_eye_removal/data/ui/red-eye-removal-options.ui.h:1 msgid "Selection" msgstr "Markering" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:12 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:10 #, fuzzy msgid "_Grid:" msgstr "_Bredd:" -#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:11 msgid "_Position:" msgstr "_Position:" #. abbreviation of pixel -#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:13 msgid "px" msgstr "" +#. this is used to separate the dimensions, for example: 120 × 250 +#: ../extensions/file_tools/data/ui/crop-options.ui.h:15 +msgid "×" +msgstr "×" + #: ../extensions/file_tools/data/ui/resize-options.ui.h:2 #: ../extensions/resize_images/data/ui/resize-images.ui.h:2 #, no-c-format @@ -2512,11 +2449,11 @@ #: ../extensions/file_tools/data/ui/rotate-options.ui.h:16 msgid "Point 1:" -msgstr "" +msgstr "Punkt 1:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:17 msgid "Point 2:" -msgstr "" +msgstr "Punkt 2:" #: ../extensions/file_tools/data/ui/rotate-options.ui.h:18 msgid "Reset" @@ -2568,201 +2505,201 @@ msgid "Change brightness, contrast, saturation and gamma level of the image" msgstr "Ändra ljusstyrka, kontrast, färgmättnad och gammanivå för bilden" -#: ../extensions/file_tools/gth-file-tool-crop.c:422 -#: ../extensions/file_tools/gth-file-tool-resize.c:493 +#: ../extensions/file_tools/gth-file-tool-crop.c:424 +#: ../extensions/file_tools/gth-file-tool-resize.c:498 msgid "Square" msgstr "Kvadratiskt" -#: ../extensions/file_tools/gth-file-tool-crop.c:423 -#: ../extensions/file_tools/gth-file-tool-resize.c:494 +#: ../extensions/file_tools/gth-file-tool-crop.c:425 +#: ../extensions/file_tools/gth-file-tool-resize.c:499 #, c-format msgid "%d x %d (Image)" msgstr "%d × %d (bild)" -#: ../extensions/file_tools/gth-file-tool-crop.c:426 -#: ../extensions/file_tools/gth-file-tool-resize.c:498 +#: ../extensions/file_tools/gth-file-tool-crop.c:428 +#: ../extensions/file_tools/gth-file-tool-resize.c:503 #, c-format msgid "%d x %d (Screen)" msgstr "%d × %d (skärm)" -#: ../extensions/file_tools/gth-file-tool-crop.c:430 -#: ../extensions/file_tools/gth-file-tool-resize.c:503 +#: ../extensions/file_tools/gth-file-tool-crop.c:432 +#: ../extensions/file_tools/gth-file-tool-resize.c:508 msgid "5:4" msgstr "5:4" -#: ../extensions/file_tools/gth-file-tool-crop.c:431 -#: ../extensions/file_tools/gth-file-tool-resize.c:504 +#: ../extensions/file_tools/gth-file-tool-crop.c:433 +#: ../extensions/file_tools/gth-file-tool-resize.c:509 msgid "4:3 (DVD, Book)" msgstr "" -#: ../extensions/file_tools/gth-file-tool-crop.c:432 -#: ../extensions/file_tools/gth-file-tool-resize.c:505 +#: ../extensions/file_tools/gth-file-tool-crop.c:434 +#: ../extensions/file_tools/gth-file-tool-resize.c:510 msgid "7:5" msgstr "7:5" -#: ../extensions/file_tools/gth-file-tool-crop.c:433 -#: ../extensions/file_tools/gth-file-tool-resize.c:506 +#: ../extensions/file_tools/gth-file-tool-crop.c:435 +#: ../extensions/file_tools/gth-file-tool-resize.c:511 msgid "3:2 (Postcard)" msgstr "3:2 (vykort)" -#: ../extensions/file_tools/gth-file-tool-crop.c:434 -#: ../extensions/file_tools/gth-file-tool-resize.c:507 +#: ../extensions/file_tools/gth-file-tool-crop.c:436 +#: ../extensions/file_tools/gth-file-tool-resize.c:512 msgid "16:10" msgstr "16:10" -#: ../extensions/file_tools/gth-file-tool-crop.c:435 -#: ../extensions/file_tools/gth-file-tool-resize.c:508 +#: ../extensions/file_tools/gth-file-tool-crop.c:437 +#: ../extensions/file_tools/gth-file-tool-resize.c:513 msgid "16:9 (DVD)" msgstr "16:9 (DVD)" -#: ../extensions/file_tools/gth-file-tool-crop.c:436 -#: ../extensions/file_tools/gth-file-tool-resize.c:509 +#: ../extensions/file_tools/gth-file-tool-crop.c:438 +#: ../extensions/file_tools/gth-file-tool-resize.c:514 msgid "1.85:1" msgstr "1.85:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:437 -#: ../extensions/file_tools/gth-file-tool-resize.c:510 +#: ../extensions/file_tools/gth-file-tool-crop.c:439 +#: ../extensions/file_tools/gth-file-tool-resize.c:515 msgid "2.39:1" msgstr "2.39:1" -#: ../extensions/file_tools/gth-file-tool-crop.c:438 -#: ../extensions/file_tools/gth-file-tool-resize.c:511 +#: ../extensions/file_tools/gth-file-tool-crop.c:440 +#: ../extensions/file_tools/gth-file-tool-resize.c:516 #: ../extensions/image_print/data/ui/print-layout.ui.h:7 -#: ../extensions/rename_series/gth-template-selector.c:260 +#: ../extensions/rename_series/gth-template-selector.c:232 msgid "Custom" msgstr "Anpassat" -#: ../extensions/file_tools/gth-file-tool-crop.c:449 -#: ../extensions/file_tools/gth-file-tool-rotate.c:415 +#: ../extensions/file_tools/gth-file-tool-crop.c:455 +#: ../extensions/file_tools/gth-file-tool-rotate.c:416 msgid "Rule of Thirds" msgstr "" -#: ../extensions/file_tools/gth-file-tool-crop.c:450 -#: ../extensions/file_tools/gth-file-tool-rotate.c:416 +#: ../extensions/file_tools/gth-file-tool-crop.c:456 +#: ../extensions/file_tools/gth-file-tool-rotate.c:417 msgid "Golden Sections" msgstr "" -#: ../extensions/file_tools/gth-file-tool-crop.c:451 -#: ../extensions/file_tools/gth-file-tool-rotate.c:417 +#: ../extensions/file_tools/gth-file-tool-crop.c:457 +#: ../extensions/file_tools/gth-file-tool-rotate.c:418 #, fuzzy msgid "Center Lines" msgstr "Centrerad" -#: ../extensions/file_tools/gth-file-tool-crop.c:452 -#: ../extensions/file_tools/gth-file-tool-rotate.c:418 +#: ../extensions/file_tools/gth-file-tool-crop.c:458 +#: ../extensions/file_tools/gth-file-tool-rotate.c:419 msgid "Uniform" msgstr "" -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop..." msgstr "Beskär..." -#: ../extensions/file_tools/gth-file-tool-crop.c:595 +#: ../extensions/file_tools/gth-file-tool-crop.c:614 msgid "Crop" msgstr "Beskär" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:65 -#: ../extensions/file_tools/gth-file-tool-negative.c:65 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:68 +#: ../extensions/file_tools/gth-file-tool-negative.c:68 msgid "Applying changes" msgstr "Verkställer ändringar" -#: ../extensions/file_tools/gth-file-tool-desaturate.c:189 +#: ../extensions/file_tools/gth-file-tool-desaturate.c:203 msgid "Desaturate" msgstr "Avmätta" -#: ../extensions/file_tools/gth-file-tool-enhance.c:116 +#: ../extensions/file_tools/gth-file-tool-enhance.c:119 msgid "White balance correction" msgstr "Korrigering av vitbalans" -#: ../extensions/file_tools/gth-file-tool-enhance.c:339 +#: ../extensions/file_tools/gth-file-tool-enhance.c:342 msgid "Enhance Colors" msgstr "Förbättra färger" -#: ../extensions/file_tools/gth-file-tool-enhance.c:340 +#: ../extensions/file_tools/gth-file-tool-enhance.c:343 msgid "Automatic white balance correction" msgstr "Automatisk korrigering av vitbalans" -#: ../extensions/file_tools/gth-file-tool-equalize.c:83 +#: ../extensions/file_tools/gth-file-tool-equalize.c:86 msgid "Equalizing image histogram" msgstr "Jämnar ut bildhistogrammet" -#: ../extensions/file_tools/gth-file-tool-equalize.c:261 +#: ../extensions/file_tools/gth-file-tool-equalize.c:275 msgid "Equalize" msgstr "Jämna ut" -#: ../extensions/file_tools/gth-file-tool-equalize.c:262 +#: ../extensions/file_tools/gth-file-tool-equalize.c:276 msgid "Equalize image histogram" msgstr "Jämna ut bildhistogrammet" -#: ../extensions/file_tools/gth-file-tool-flip.c:73 +#: ../extensions/file_tools/gth-file-tool-flip.c:87 msgid "Flip" msgstr "Vänd" -#: ../extensions/file_tools/gth-file-tool-flip.c:74 +#: ../extensions/file_tools/gth-file-tool-flip.c:88 msgid "Flip the image vertically" msgstr "Vänd bilden vertikalt" -#: ../extensions/file_tools/gth-file-tool-mirror.c:73 +#: ../extensions/file_tools/gth-file-tool-mirror.c:87 msgid "Mirror" msgstr "Spegla" -#: ../extensions/file_tools/gth-file-tool-mirror.c:74 +#: ../extensions/file_tools/gth-file-tool-mirror.c:88 msgid "Mirror the image horizontally" msgstr "Spegla bilden horisontellt" -#: ../extensions/file_tools/gth-file-tool-negative.c:183 +#: ../extensions/file_tools/gth-file-tool-negative.c:197 msgid "Negative" msgstr "Negativ" -#: ../extensions/file_tools/gth-file-tool-redo.c:62 +#: ../extensions/file_tools/gth-file-tool-redo.c:75 msgid "Redo" msgstr "Gör om" -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize..." msgstr "Ändra storlek..." -#: ../extensions/file_tools/gth-file-tool-resize.c:630 +#: ../extensions/file_tools/gth-file-tool-resize.c:680 msgid "Resize" msgstr "Ändra storlek" -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate..." msgstr "Rotera..." -#: ../extensions/file_tools/gth-file-tool-rotate.c:596 +#: ../extensions/file_tools/gth-file-tool-rotate.c:636 msgid "Rotate" msgstr "Rotera" -#: ../extensions/file_tools/gth-file-tool-rotate.c:597 +#: ../extensions/file_tools/gth-file-tool-rotate.c:637 msgid "Freely rotate the image" msgstr "Rotera bilden manuellt" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:73 -#: ../extensions/image_rotation/callbacks.c:54 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:87 +#: ../extensions/image_rotation/callbacks.c:55 msgid "Rotate Left" msgstr "Rotera åt vänster" -#: ../extensions/file_tools/gth-file-tool-rotate-left.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-left.c:88 #, fuzzy msgid "Rotate the image by 90 degrees counterclockwise" msgstr "Rotera bilden 90 grader motsols" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:73 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:87 #: ../extensions/image_rotation/callbacks.c:49 msgid "Rotate Right" msgstr "Rotera åt höger" -#: ../extensions/file_tools/gth-file-tool-rotate-right.c:74 +#: ../extensions/file_tools/gth-file-tool-rotate-right.c:88 #, fuzzy msgid "Rotate the image by 90 degrees clockwise" msgstr "Rotera bilden 90 grader medsols" -#: ../extensions/file_tools/gth-file-tool-save-as.c:56 +#: ../extensions/file_tools/gth-file-tool-save-as.c:70 msgid "Save As" msgstr "Spara som" -#: ../extensions/file_tools/gth-file-tool-save.c:52 +#: ../extensions/file_tools/gth-file-tool-save.c:66 msgid "Save" msgstr "Spara" @@ -2771,15 +2708,15 @@ msgid "Sharpening image" msgstr "Sparar bilder" -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus..." msgstr "Förbättra fokus..." -#: ../extensions/file_tools/gth-file-tool-sharpen.c:420 +#: ../extensions/file_tools/gth-file-tool-sharpen.c:458 msgid "Enhance Focus" msgstr "Förbättra fokus" -#: ../extensions/file_tools/gth-file-tool-undo.c:61 +#: ../extensions/file_tools/gth-file-tool-undo.c:75 msgid "Undo" msgstr "Ångra" @@ -2813,7 +2750,7 @@ msgstr "Sök efter dubletter" #: ../extensions/find_duplicates/data/ui/find-duplicates-dialog.ui.h:6 -#: ../gthumb/gth-browser-actions-entries.h:32 +#: ../gthumb/gth-browser-actions-entries.h:33 msgid "_View" msgstr "_Visa" @@ -2859,23 +2796,23 @@ msgid "no file" msgstr "ingen fil" -#: ../extensions/find_duplicates/gth-find-duplicates.c:426 -#: ../extensions/find_duplicates/gth-find-duplicates.c:521 +#: ../extensions/find_duplicates/gth-find-duplicates.c:397 +#: ../extensions/find_duplicates/gth-find-duplicates.c:492 #, c-format msgid "%d duplicate" msgid_plural "%d duplicates" msgstr[0] "%d dublett" msgstr[1] "%d dubletter" -#: ../extensions/find_duplicates/gth-find-duplicates.c:565 +#: ../extensions/find_duplicates/gth-find-duplicates.c:536 msgid "Search completed" msgstr "Sökningen är färdig" -#: ../extensions/find_duplicates/gth-find-duplicates.c:577 +#: ../extensions/find_duplicates/gth-find-duplicates.c:548 msgid "Searching for duplicates" msgstr "Söker efter dubletter" -#: ../extensions/find_duplicates/gth-find-duplicates.c:580 +#: ../extensions/find_duplicates/gth-find-duplicates.c:551 #: ../gthumb/gth-load-file-data-task.c:106 #: ../gthumb/gth-save-file-data-task.c:100 #, c-format @@ -2884,22 +2821,22 @@ msgstr[0] "%d fil återstår" msgstr[1] "%d filer återstår" -#: ../extensions/find_duplicates/gth-find-duplicates.c:663 +#: ../extensions/find_duplicates/gth-find-duplicates.c:634 #, fuzzy msgid "Getting the file list" msgstr "Hämtar albumlistan" -#: ../extensions/find_duplicates/gth-find-duplicates.c:769 +#: ../extensions/find_duplicates/gth-find-duplicates.c:740 msgid "Duplicates" msgstr "Dubletter" -#: ../extensions/find_duplicates/gth-find-duplicates.c:1023 +#: ../extensions/find_duplicates/gth-find-duplicates.c:997 #, fuzzy msgid "Select" msgstr "Markering" #: ../extensions/flicker/callbacks.c:59 -#: ../extensions/flicker/callbacks.c:63 +#: ../extensions/flicker/callbacks.c:64 msgid "_Flickr..." msgstr "_Flickr..." @@ -2907,7 +2844,7 @@ msgid "Download photos from Flickr" msgstr "Hämta foton från Flickr" -#: ../extensions/flicker/callbacks.c:64 +#: ../extensions/flicker/callbacks.c:65 msgid "Upload photos to Flickr" msgstr "Skicka upp foton till Flickr" @@ -2974,82 +2911,75 @@ msgid "_Import" msgstr "_Importera" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:357 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:827 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:360 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:830 msgid "Could not get the photo list" msgstr "Kunde inte få fotolistan" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:394 -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:559 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:861 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1024 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:397 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:561 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:864 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:1026 msgid "No album selected" msgstr "Inget album har markerats" -#: ../extensions/flicker_utils/dlg-import-from-flickr.c:577 +#: ../extensions/flicker_utils/dlg-import-from-flickr.c:579 #, c-format msgid "Import from %s" msgstr "Importera från %s" -#: ../extensions/gstreamer_tools/actions.c:64 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1118 -#: ../gthumb/gth-browser.c:2008 +#: ../extensions/gstreamer_tools/actions.c:66 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1080 +#: ../gthumb/gth-browser.c:1998 msgid "Could not save the file" msgstr "Kunde inte spara filen" -#: ../extensions/gstreamer_tools/actions.c:124 +#: ../extensions/gstreamer_tools/actions.c:126 msgid "Could not take a screenshot" msgstr "Kunde inte ta en skärmbild" -#: ../extensions/gstreamer_tools/actions.c:130 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1266 +#: ../extensions/gstreamer_tools/actions.c:132 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1248 msgid "Save Image" msgstr "Spara bild" -#: ../extensions/gstreamer_tools/actions.c:150 +#: ../extensions/gstreamer_tools/actions.c:152 msgctxt "Filename" msgid "Screenshot" msgstr "Skärmbild" -#. this is an empty time -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:1 msgid "--:--" msgstr "--:--" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:2 msgid "Change volume level" msgstr "Ändra volymnivå" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:3 msgid "Faster" msgstr "Snabbare" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:657 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:4 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:686 msgid "Play" msgstr "Spela upp" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:5 msgid "Slower" msgstr "Långsammare" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:6 msgid "Time:" msgstr "Tid:" -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:8 +#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:7 msgid "Toggle volume" msgstr "Växla volym" -#. this is the separator between current position and duration of a media file -#: ../extensions/gstreamer_tools/data/ui/mediabar.ui.h:10 -msgctxt "time" -msgid "/" -msgstr "/" - #: ../extensions/gstreamer_tools/data/ui/save-screenshot.ui.h:1 #: ../extensions/photo_importer/actions.c:67 -#: ../extensions/photo_importer/dlg-photo-importer.c:614 +#: ../extensions/photo_importer/dlg-photo-importer.c:620 msgid "Choose a folder" msgstr "Välj en mapp" @@ -3061,20 +2991,20 @@ msgid "Play audio and video files." msgstr "Spela upp ljud- och videofiler." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:94 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:104 msgid "Screenshot" msgstr "Skärmbild" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:95 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:105 msgid "Take a screenshot" msgstr "Ta en skärmbild" -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:634 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:663 #, fuzzy msgid "Playing video" msgstr "Spela upp ljud- och videofiler." -#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:647 +#: ../extensions/gstreamer_tools/gth-media-viewer-page.c:676 msgid "Pause" msgstr "Paus" @@ -3116,7 +3046,7 @@ #: ../extensions/gstreamer_tools/main.c:46 #: ../extensions/image_print/data/ui/print-layout.ui.h:25 -#: ../extensions/image_viewer/gth-image-viewer-page.c:222 +#: ../extensions/image_viewer/gth-image-viewer-page.c:209 msgid "Width" msgstr "Bredd" @@ -3143,10 +3073,10 @@ #. Translators: this is an image size, such as 1024 × 768 #: ../extensions/gstreamer_utils/gstreamer-utils.c:396 -#: ../extensions/image_viewer/gth-image-viewer-page.c:1321 +#: ../extensions/image_viewer/gth-image-viewer-page.c:1303 #: ../extensions/image_viewer/gth-metadata-provider-image.c:190 -#: ../extensions/webalbums/dlg-web-exporter.c:429 -#: ../extensions/webalbums/gth-web-exporter.c:2456 +#: ../extensions/webalbums/dlg-web-exporter.c:442 +#: ../extensions/webalbums/gth-web-exporter.c:2446 #, c-format msgid "%d × %d" msgstr "%d × %d" @@ -3233,26 +3163,26 @@ msgid "Select Header Font" msgstr "Välj ett typsnitt" -#: ../extensions/image_print/gth-image-print-job.c:997 +#: ../extensions/image_print/gth-image-print-job.c:971 #: ../extensions/webalbums/data/albumthemes/text.h:31 #, c-format msgid "Page %d of %d" msgstr "Sida %d av %d" -#: ../extensions/image_print/gth-image-print-job.c:1761 -#: ../extensions/image_print/gth-image-print-job.c:1888 -#: ../extensions/image_print/gth-image-print-job.c:1925 +#: ../extensions/image_print/gth-image-print-job.c:1734 +#: ../extensions/image_print/gth-image-print-job.c:1861 +#: ../extensions/image_print/gth-image-print-job.c:1898 msgid "Could not print" msgstr "Kunde inte skriva ut" -#: ../extensions/image_print/gth-image-print-job.c:1823 +#: ../extensions/image_print/gth-image-print-job.c:1796 #: ../gthumb/gth-main-default-tests.c:204 msgid "Images" msgstr "Bilder" -#: ../extensions/image_print/gth-image-print-job.c:1890 -#: ../gthumb/gth-image-loader.c:233 -#: ../gthumb/gth-image-loader.c:306 +#: ../extensions/image_print/gth-image-print-job.c:1863 +#: ../gthumb/gth-image-loader.c:204 +#: ../gthumb/gth-image-loader.c:277 msgid "No suitable loader available for this file type" msgstr "" @@ -3263,7 +3193,7 @@ msgstr "Läser in \"%s\"" #: ../extensions/image_print/gth-load-image-info-task.c:166 -#: ../extensions/webalbums/gth-web-exporter.c:2695 +#: ../extensions/webalbums/gth-web-exporter.c:2685 msgid "Loading images" msgstr "Läser in bilder" @@ -3276,7 +3206,7 @@ msgid "Image print" msgstr "Bildtext" -#: ../extensions/image_print/preferences.c:76 +#: ../extensions/image_print/preferences.c:79 msgid "Print" msgstr "Skriv ut" @@ -3285,32 +3215,32 @@ msgid "Rotate the selected images 90° to the right" msgstr "Flytta de markerade bilderna till papperskorgen" -#: ../extensions/image_rotation/callbacks.c:55 +#: ../extensions/image_rotation/callbacks.c:56 #, fuzzy msgid "Rotate the selected images 90° to the left" msgstr "Flytta de markerade bilderna till papperskorgen" -#: ../extensions/image_rotation/callbacks.c:59 +#: ../extensions/image_rotation/callbacks.c:61 msgid "Rotate Physically" msgstr "Rotera fysiskt" -#: ../extensions/image_rotation/callbacks.c:60 +#: ../extensions/image_rotation/callbacks.c:62 #, fuzzy msgid "Rotate the selected images according to the embedded orientation" msgstr "Flytta de markerade bilderna till papperskorgen" -#: ../extensions/image_rotation/callbacks.c:64 +#: ../extensions/image_rotation/callbacks.c:67 msgid "Reset the EXIF Orientation" msgstr "Nollställ Exif-orientering" -#: ../extensions/image_rotation/callbacks.c:65 +#: ../extensions/image_rotation/callbacks.c:68 msgid "Reset the embedded orientation without rotating the images" msgstr "" #: ../extensions/image_rotation/gth-reset-orientation-task.c:111 #: ../extensions/image_rotation/gth-transform-task.c:141 -#: ../extensions/webalbums/gth-web-exporter.c:2349 -#: ../extensions/webalbums/gth-web-exporter.c:2433 +#: ../extensions/webalbums/gth-web-exporter.c:2339 +#: ../extensions/webalbums/gth-web-exporter.c:2423 msgid "Saving images" msgstr "Sparar bilder" @@ -3323,12 +3253,12 @@ msgid "Rotate images without data loss." msgstr "Rotera bilder utan kvalitetsförlust" -#: ../extensions/image_rotation/rotation-utils.c:118 +#: ../extensions/image_rotation/rotation-utils.c:117 #, c-format msgid "Problem transforming the image: %s" msgstr "Problem vid transformering av bilden: %s" -#: ../extensions/image_rotation/rotation-utils.c:123 +#: ../extensions/image_rotation/rotation-utils.c:122 msgid "" "This transformation may introduce small image distortions along one or more edges, because the image dimensions are not multiples of 8.\n" "\n" @@ -3342,114 +3272,88 @@ "\n" "Du kan även välja att förkasta (eller trimma) eventuella kantbildpunkter som inte kan transformeras. För praktisk användning innebär det att detta läge ger det snyggast resultatet, men transformeringen förstör bilddata numera." -#: ../extensions/image_rotation/rotation-utils.c:129 +#: ../extensions/image_rotation/rotation-utils.c:128 msgid "_Trim" msgstr "_Trimma" -#: ../extensions/image_rotation/rotation-utils.c:131 +#: ../extensions/image_rotation/rotation-utils.c:130 msgid "_Accept distortion" msgstr "_Acceptera distortion" -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:1 -#, fuzzy -msgid "Possible values are: actual-size, keep-prev, fit-size, fit-size-if-larger, fit-width, fit-width-if-larger." -msgstr "Möjliga värden är: actual_size, fit, keep_prev, fit_if_larger, fit_width_if_larger." - -#: ../extensions/image_viewer/data/gthumb-image-viewer.schemas.in.h:8 -#, fuzzy -msgid "Whether to resize the window to fit the size of the image" -msgstr "Återanvänd detta fönster för att visa andra bilder" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:1 msgid "After loading an image:" msgstr "Efter inläsning av en bild:" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:2 -msgid "High" -msgstr "Hög" - #: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:3 -msgid "Low" -msgstr "Låg" - -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 #, fuzzy msgid "Reset scrollbar positions" msgstr "Nollställ rullistens positioner efter inläsning av bild" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:6 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:4 msgid "Transparency _type:" msgstr "Transparens_typ:" -#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:7 +#: ../extensions/image_viewer/data/ui/image-viewer-preferences.ui.h:5 msgid "_Zoom quality:" msgstr "_Zoomkvalitet:" -#: ../extensions/image_viewer/gth-image-histogram.c:74 +#: ../extensions/image_viewer/gth-image-histogram.c:84 msgid "Histogram" msgstr "Histogram" -#: ../extensions/image_viewer/gth-image-viewer-page.c:192 +#: ../extensions/image_viewer/gth-image-viewer-page.c:179 msgid "Copy Image" msgstr "Kopiera bild" -#: ../extensions/image_viewer/gth-image-viewer-page.c:193 +#: ../extensions/image_viewer/gth-image-viewer-page.c:180 msgid "Copy the image to the clipboard" msgstr "Kopiera bilden till urklipp" -#: ../extensions/image_viewer/gth-image-viewer-page.c:197 +#: ../extensions/image_viewer/gth-image-viewer-page.c:184 msgid "Paste Image" msgstr "Klistra in bild" -#: ../extensions/image_viewer/gth-image-viewer-page.c:198 +#: ../extensions/image_viewer/gth-image-viewer-page.c:185 msgid "Paste the image from the clipboard" msgstr "Klistra in bilden från urklipp" # Tror detta är i sammanhanget "zoom in" -#: ../extensions/image_viewer/gth-image-viewer-page.c:202 +#: ../extensions/image_viewer/gth-image-viewer-page.c:189 msgid "In" msgstr "In" -#: ../extensions/image_viewer/gth-image-viewer-page.c:203 +#: ../extensions/image_viewer/gth-image-viewer-page.c:190 msgid "Zoom in" msgstr "Zooma in" -#: ../extensions/image_viewer/gth-image-viewer-page.c:207 +#: ../extensions/image_viewer/gth-image-viewer-page.c:194 msgid "Out" msgstr "Ut" -#: ../extensions/image_viewer/gth-image-viewer-page.c:208 +#: ../extensions/image_viewer/gth-image-viewer-page.c:195 msgid "Zoom out" msgstr "Zooma ut" -#: ../extensions/image_viewer/gth-image-viewer-page.c:212 +#: ../extensions/image_viewer/gth-image-viewer-page.c:199 msgid "1:1" msgstr "1:1" -#: ../extensions/image_viewer/gth-image-viewer-page.c:213 +#: ../extensions/image_viewer/gth-image-viewer-page.c:200 msgid "Actual size" msgstr "Naturlig storlek" -#: ../extensions/image_viewer/gth-image-viewer-page.c:217 +#: ../extensions/image_viewer/gth-image-viewer-page.c:204 msgid "Fit" msgstr "Passa" -#: ../extensions/image_viewer/gth-image-viewer-page.c:218 +#: ../extensions/image_viewer/gth-image-viewer-page.c:205 msgid "Zoom to fit window" msgstr "Anpassa till fönstret" -#: ../extensions/image_viewer/gth-image-viewer-page.c:223 +#: ../extensions/image_viewer/gth-image-viewer-page.c:210 msgid "Zoom to fit width" msgstr "Zooma för att passa bredden" -#: ../extensions/image_viewer/gth-image-viewer-page.c:230 -msgid "_Fit Window to Image" -msgstr "_Anpassa fönster till bild" - -#: ../extensions/image_viewer/gth-image-viewer-page.c:231 -msgid "Resize the window to the size of the image" -msgstr "Ändra storlek på fönstret till storleken för bilden" - #: ../extensions/image_viewer/image_viewer.extension.in.in.h:1 msgid "Basic image viewing." msgstr "" @@ -3458,26 +3362,10 @@ msgid "Image viewer" msgstr "Bildvisare" -#: ../extensions/image_viewer/preferences.c:96 -msgid "Set to actual size" -msgstr "Ställ in till faktisk storlek" - -#: ../extensions/image_viewer/preferences.c:100 -msgid "Fit to width" -msgstr "Anpassa till bredd" - -#: ../extensions/image_viewer/preferences.c:137 +#: ../extensions/image_viewer/preferences.c:125 msgid "Viewer" msgstr "Visare" -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:1 -msgid "Possible values are: none, file_date, current_date" -msgstr "Möjliga värden är: none, file_date, current_date" - -#: ../extensions/importer/data/gthumb-importer.schemas.in.h:2 -msgid "Possible values are: yyyymmdd, yyyymm, yyyy" -msgstr "Möjliga värden är: yyyymmdd, yyyymm, yyyy" - #: ../extensions/importer/data/ui/import-preferences.ui.h:3 msgid "The day of the month" msgstr "Dagen i månaden" @@ -3514,41 +3402,41 @@ msgid "as _single subfolder" msgstr "som _enkel undermapp" -#: ../extensions/importer/gth-import-destination-button.c:212 +#: ../extensions/importer/gth-import-destination-button.c:183 msgid "Invalid Destination" msgstr "Ogiltigt mål" -#: ../extensions/importer/gth-import-preferences-dialog.c:195 +#: ../extensions/importer/gth-import-preferences-dialog.c:198 #, c-format msgid "example: %s" msgstr "exempel: %s" #. subfolder type -#: ../extensions/importer/gth-import-preferences-dialog.c:326 +#: ../extensions/importer/gth-import-preferences-dialog.c:330 msgid "File date" msgstr "Fildatum" #. gtk_label_set_mnemonic_widget (GTK_LABEL (GET_WIDGET ("subfolder_label")), self->priv->subfolder_type_list); #. subfolder format -#: ../extensions/importer/gth-import-preferences-dialog.c:336 +#: ../extensions/importer/gth-import-preferences-dialog.c:340 msgid "year-month-day" msgstr "år-månad-dag" -#: ../extensions/importer/gth-import-preferences-dialog.c:337 +#: ../extensions/importer/gth-import-preferences-dialog.c:341 msgid "year-month" msgstr "år-månad" -#: ../extensions/importer/gth-import-preferences-dialog.c:338 +#: ../extensions/importer/gth-import-preferences-dialog.c:342 msgid "year" msgstr "år" -#: ../extensions/importer/gth-import-preferences-dialog.c:339 +#: ../extensions/importer/gth-import-preferences-dialog.c:343 msgid "custom format" msgstr "anpassat format" #: ../extensions/importer/gth-import-task.c:442 #: ../extensions/importer/gth-import-task.c:477 -#: ../extensions/importer/gth-import-task.c:643 +#: ../extensions/importer/gth-import-task.c:648 msgid "Importing files" msgstr "Importerar filer" @@ -3560,44 +3448,42 @@ msgid "The selected files are already present in the destination." msgstr "" -#: ../extensions/importer/gth-import-task.c:619 -#: ../gthumb/gth-file-source-vfs.c:689 +#: ../extensions/importer/gth-import-task.c:622 +#: ../gthumb/gth-file-source-vfs.c:694 msgid "Could not delete the files" msgstr "Kunde inte ta bort filerna" -#: ../extensions/importer/gth-import-task.c:620 +#: ../extensions/importer/gth-import-task.c:623 #, fuzzy msgid "Delete operation not supported." msgstr "Filtypen stöds inte %s" -#: ../extensions/importer/gth-import-task.c:704 +#: ../extensions/importer/gth-import-task.c:709 msgid "Last imported" msgstr "Senast importerad" -#: ../extensions/importer/gth-import-task.c:839 +#: ../extensions/importer/gth-import-task.c:815 msgid "No file specified." msgstr "Ingen fil angiven." #. Translators: For example: Not enough free space in '/home/user/Images'.\n1.3 GB of space is required but only 300 MB is available. -#: ../extensions/importer/gth-import-task.c:876 +#: ../extensions/importer/gth-import-task.c:852 #, c-format msgid "" "Not enough free space in '%s'.\n" "%s of space is required but only %s is available." msgstr "" -#: ../extensions/list_tools/callbacks.c:65 +#: ../extensions/list_tools/callbacks.c:75 #: ../gthumb/gth-filterbar.c:303 msgid "Personalize..." msgstr "Personalisera..." -#: ../extensions/list_tools/callbacks.c:238 -#: ../extensions/list_tools/callbacks.c:249 +#: ../extensions/list_tools/callbacks.c:319 msgid "Tools" msgstr "Verktyg" -#: ../extensions/list_tools/callbacks.c:240 -#: ../extensions/list_tools/callbacks.c:251 +#: ../extensions/list_tools/callbacks.c:320 msgid "Batch tools for multiple files" msgstr "Satsverktyg för flera filer" @@ -3711,7 +3597,7 @@ msgstr "Genväg" #: ../extensions/list_tools/dlg-personalize-scripts.c:285 -#: ../gthumb/dlg-personalize-filters.c:251 +#: ../gthumb/dlg-personalize-filters.c:252 msgid "Show" msgstr "Visa" @@ -3732,32 +3618,32 @@ msgid "Are you sure you want to delete the selected command?" msgstr "Är du säker på att du vill permanent ta bort \"%s\"?" -#: ../extensions/list_tools/gth-script.c:642 +#: ../extensions/list_tools/gth-script.c:610 msgid "Enter a value:" msgstr "Ange ett värde:" -#: ../extensions/list_tools/gth-script.c:777 -#: ../extensions/webalbums/gth-web-exporter.c:570 -#: ../extensions/webalbums/gth-web-exporter.c:582 -#: ../extensions/webalbums/gth-web-exporter.c:590 +#: ../extensions/list_tools/gth-script.c:745 +#: ../extensions/webalbums/gth-web-exporter.c:560 +#: ../extensions/webalbums/gth-web-exporter.c:572 +#: ../extensions/webalbums/gth-web-exporter.c:580 msgid "Malformed command" msgstr "Felformulerat kommando" -#: ../extensions/list_tools/gth-script-editor-dialog.c:176 +#: ../extensions/list_tools/gth-script-editor-dialog.c:147 msgid "none" msgstr "ingen" -#: ../extensions/list_tools/gth-script-editor-dialog.c:182 +#: ../extensions/list_tools/gth-script-editor-dialog.c:153 #, c-format msgid "key %d on the numeric keypad" msgstr "" -#: ../extensions/list_tools/gth-script-editor-dialog.c:325 +#: ../extensions/list_tools/gth-script-editor-dialog.c:296 #, c-format msgid "No command specified" msgstr "Inget kommando angavs" -#: ../extensions/list_tools/gth-script-task.c:84 +#: ../extensions/list_tools/gth-script-task.c:83 #, c-format msgid "Command exited abnormally with status %d" msgstr "Kommandot avslutas onormalt med status %d" @@ -3770,33 +3656,33 @@ msgid "Scripting and batch manipulation of files." msgstr "Skriptning och satsmanipulering av filer." -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "S" msgstr "S" -#: ../extensions/map_view/gth-map-view.c:121 +#: ../extensions/map_view/gth-map-view.c:130 msgctxt "Cardinal point" msgid "N" msgstr "N" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "W" msgstr "V" -#: ../extensions/map_view/gth-map-view.c:123 +#: ../extensions/map_view/gth-map-view.c:132 msgctxt "Cardinal point" msgid "E" msgstr "Ö" -#: ../extensions/map_view/gth-map-view.c:196 +#: ../extensions/map_view/gth-map-view.c:205 #: ../extensions/map_view/map_view.extension.in.in.h:1 msgid "Map" msgstr "Karta" #. No GPS label -#: ../extensions/map_view/gth-map-view.c:265 +#: ../extensions/map_view/gth-map-view.c:273 msgid "The geographical position information is not available for this image." msgstr "Den geografiska positionsinformation är inte tillgänglig för denna bild." @@ -3936,35 +3822,35 @@ msgid "_Tags:" msgstr "_Taggar:" -#: ../extensions/photo_importer/dlg-photo-importer.c:222 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:173 +#: ../extensions/photo_importer/dlg-photo-importer.c:227 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:174 msgid "Could not import the files" msgstr "Kunde inte importera filerna" #. translators: %d is the number of files, %s the total size -#: ../extensions/photo_importer/dlg-photo-importer.c:294 +#: ../extensions/photo_importer/dlg-photo-importer.c:299 #, c-format msgid "Files to import: %d (%s)" msgstr "Filer att importera: %d (%s)" -#: ../extensions/photo_importer/dlg-photo-importer.c:334 +#: ../extensions/photo_importer/dlg-photo-importer.c:339 msgid "Could not load the folder" msgstr "Kunde inte läsa in mappen" -#: ../extensions/photo_importer/dlg-photo-importer.c:364 -#: ../gthumb/gth-browser.c:1921 +#: ../extensions/photo_importer/dlg-photo-importer.c:369 +#: ../gthumb/gth-browser.c:1911 msgid "Getting folder listing..." msgstr "Hämtar mapplistning..." -#: ../extensions/photo_importer/dlg-photo-importer.c:410 +#: ../extensions/photo_importer/dlg-photo-importer.c:415 msgid "Empty" msgstr "Tom" -#: ../extensions/photo_importer/dlg-photo-importer.c:580 +#: ../extensions/photo_importer/dlg-photo-importer.c:586 msgid "Import from Removable Device" msgstr "Importera från flyttbar enhet" -#: ../extensions/photo_importer/dlg-photo-importer.c:612 +#: ../extensions/photo_importer/dlg-photo-importer.c:618 msgid "Import from Folder" msgstr "Importera från mapp" @@ -3977,7 +3863,7 @@ msgstr "Importera foton från flyttbara enheter." #: ../extensions/picasaweb/callbacks.c:59 -#: ../extensions/picasaweb/callbacks.c:63 +#: ../extensions/picasaweb/callbacks.c:64 msgid "_Picasa Web Album..." msgstr "_Picasa webbalbum..." @@ -3985,7 +3871,7 @@ msgid "Download photos from Picasa Web Album" msgstr "Hämta foton från Picasa webbalbum" -#: ../extensions/picasaweb/callbacks.c:64 +#: ../extensions/picasaweb/callbacks.c:65 msgid "Upload photos to Picasa Web Album" msgstr "Skicka upp foton till Picasa webbalbum" @@ -4022,21 +3908,21 @@ msgstr "Publik" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:354 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:307 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:310 msgid "Could not get the album list" msgstr "Kunde inte få albumlistan" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:438 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:391 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:394 msgid "Picasa Web Album" msgstr "Picasa Web Album" #: ../extensions/picasaweb/dlg-export-to-picasaweb.c:525 -#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:478 +#: ../extensions/picasaweb/dlg-import-from-picasaweb.c:481 msgid "Account" msgstr "Konto" -#: ../extensions/picasaweb/picasa-account-properties-dialog.c:133 +#: ../extensions/picasaweb/picasa-account-properties-dialog.c:104 msgid "Could not load the file" msgstr "Kunde inte läsa in filen" @@ -4048,18 +3934,6 @@ msgid "Upload images to Picasa Web Albums" msgstr "Skicka upp bilder till Picasa webbalbum" -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:1 -msgid "Possible values are: jpeg, jpg." -msgstr "Möjliga värden är: jpeg, jpg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:2 -msgid "Possible values are: none, deflate, jpeg." -msgstr "Möjliga värden är: none, deflate, jpeg." - -#: ../extensions/pixbuf_savers/data/gthumb-pixbuf-savers.schemas.in.h:3 -msgid "Possible values are: tiff, tif." -msgstr "Möjliga värden är: tiff, tif." - #: ../extensions/pixbuf_savers/data/ui/jpeg-options.ui.h:1 msgid "Opti_mize" msgstr "Opti_mera" @@ -4118,24 +3992,24 @@ msgid "dpi" msgstr "punkter/tum" -#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:527 +#: ../extensions/pixbuf_savers/gth-jpeg-saver.c:519 msgid "JPEG" msgstr "JPEG" -#: ../extensions/pixbuf_savers/gth-png-saver.c:145 +#: ../extensions/pixbuf_savers/gth-png-saver.c:140 msgid "PNG" msgstr "PNG" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:291 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:286 #: ../gthumb/gth-buffer-data.c:84 msgid "Insufficient memory" msgstr "Slut på minne" -#: ../extensions/pixbuf_savers/gth-tga-saver.c:378 +#: ../extensions/pixbuf_savers/gth-tga-saver.c:373 msgid "TGA" msgstr "TGA" -#: ../extensions/pixbuf_savers/gth-tiff-saver.c:542 +#: ../extensions/pixbuf_savers/gth-tiff-saver.c:537 msgid "TIFF" msgstr "TIFF" @@ -4163,15 +4037,15 @@ msgid "_Y:" msgstr "_Y:" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal..." msgstr "Ta bort röda ögon..." -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:469 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:510 msgid "Red Eye Removal" msgstr "Ta bort röda ögon" -#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:470 +#: ../extensions/red_eye_removal/gth-file-tool-red-eye.c:511 msgid "Remove the red eye effect caused by camera flashes" msgstr "Ta bort röda ögon orsakade av kamerablixtar" @@ -4183,14 +4057,6 @@ msgid "Tool to remove the red-eye effect from a photo." msgstr "Verktyg för att ta bort röda ögon från ett foto." -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:1 -msgid "Possible values include: general::unsorted, file::name, file::size, file::mtime, exif::photo::datetimeoriginal" -msgstr "" - -#: ../extensions/rename_series/data/gthumb_rename_series.schemas.in.h:2 -msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" -msgstr "Möjliga värden är: 0 (ingen), 1 (lägre), 2 (övre)" - #: ../extensions/rename_series/data/ui/code-selector.ui.h:1 msgid "add" msgstr "lägg till" @@ -4264,71 +4130,68 @@ msgid "_Template:" msgstr "_Mall:" -#: ../extensions/rename_series/dlg-rename-series.c:64 +#: ../extensions/rename_series/dlg-rename-series.c:58 msgid "Enumerator" msgstr "" -#: ../extensions/rename_series/dlg-rename-series.c:65 +#: ../extensions/rename_series/dlg-rename-series.c:59 #, fuzzy msgid "Original filename" msgstr "_Behåll ursprungliga filnamn" -#: ../extensions/rename_series/dlg-rename-series.c:66 +#: ../extensions/rename_series/dlg-rename-series.c:60 #, fuzzy msgid "Original extension" msgstr "Avgör på filändelse" -#: ../extensions/rename_series/dlg-rename-series.c:67 +#: ../extensions/rename_series/dlg-rename-series.c:61 #, fuzzy msgid "Original enumerator" msgstr "_Behåll ursprungliga filnamn" -#: ../extensions/rename_series/dlg-rename-series.c:68 -#, fuzzy +#: ../extensions/rename_series/dlg-rename-series.c:62 msgid "Modification date" -msgstr "efter filens ändringstid" +msgstr "Ändringsdatum" -#: ../extensions/rename_series/dlg-rename-series.c:69 +#: ../extensions/rename_series/dlg-rename-series.c:63 #, fuzzy msgid "Digitalization date" msgstr "Datum för skapande av bilden" -#: ../extensions/rename_series/dlg-rename-series.c:70 -#, fuzzy +#: ../extensions/rename_series/dlg-rename-series.c:64 msgid "File attribute" -msgstr "Ett filattribut" +msgstr "Filattribut" -#: ../extensions/rename_series/dlg-rename-series.c:556 -#: ../extensions/rename_series/dlg-rename-series.c:687 +#: ../extensions/rename_series/dlg-rename-series.c:552 +#: ../extensions/rename_series/dlg-rename-series.c:683 msgid "Could not rename the files" msgstr "Kunde inte byta namn på filerna" -#: ../extensions/rename_series/dlg-rename-series.c:784 -#, fuzzy +#: ../extensions/rename_series/dlg-rename-series.c:780 msgid "Could not save the template" -msgstr "Kunde inte spara filtret" +msgstr "Kunde inte spara mallen" -#: ../extensions/rename_series/dlg-rename-series.c:802 +#: ../extensions/rename_series/dlg-rename-series.c:798 msgid "Edit Template" msgstr "Redigera mall" -#: ../extensions/rename_series/dlg-rename-series.c:859 +#: ../extensions/rename_series/dlg-rename-series.c:856 msgid "Old Name" msgstr "Gammalt namn" -#: ../extensions/rename_series/dlg-rename-series.c:870 +#: ../extensions/rename_series/dlg-rename-series.c:867 msgid "New Name" msgstr "Nytt namn" -#: ../extensions/rename_series/dlg-rename-series.c:945 +#: ../extensions/rename_series/dlg-rename-series.c:944 msgid "Keep original case" msgstr "Behåll ursprungligt skiftläge" -#: ../extensions/rename_series/dlg-rename-series.c:946 +#: ../extensions/rename_series/dlg-rename-series.c:945 msgid "Convert to lower-case" msgstr "Konvertera till gemener" -#: ../extensions/rename_series/dlg-rename-series.c:947 +#: ../extensions/rename_series/dlg-rename-series.c:946 msgid "Convert to upper-case" msgstr "Konvertera till versaler" @@ -4352,10 +4215,6 @@ msgid "Resize the selected images" msgstr "Ändra storlek på markerade bilder" -#: ../extensions/resize_images/data/gthumb_resize_images.schemas.in.h:1 -msgid "Possible values: pixels, percentage" -msgstr "Möjliga värden är: pixels, percentage" - #: ../extensions/resize_images/data/ui/resize-images.ui.h:5 #: ../gthumb/gth-main-default-metadata.c:49 msgid "Format" @@ -4382,11 +4241,11 @@ msgid "pixel" msgstr "bildpunkt" -#: ../extensions/resize_images/dlg-resize-images.c:166 +#: ../extensions/resize_images/dlg-resize-images.c:168 msgid "Resizing images" msgstr "Ändrar storlek på bilder" -#: ../extensions/resize_images/dlg-resize-images.c:408 +#: ../extensions/resize_images/dlg-resize-images.c:412 msgid "Keep the original format" msgstr "Behåll ursprungligt format" @@ -4416,24 +4275,24 @@ msgid "Find files" msgstr "Sök filer" -#: ../extensions/search/callbacks.c:133 +#: ../extensions/search/callbacks.c:132 msgid "Search again" msgstr "Sök igen" #. Translators: This is not a verb, it's a name as in "the search properties". -#: ../extensions/search/callbacks.c:175 +#: ../extensions/search/callbacks.c:174 #: ../extensions/search/search.extension.in.in.h:2 msgid "Search" msgstr "Sök" -#: ../extensions/search/gth-search-editor.c:138 -#: ../gthumb/gth-filter-editor-dialog.c:195 +#: ../extensions/search/gth-search-editor.c:111 +#: ../gthumb/gth-filter-editor-dialog.c:165 #, fuzzy msgid "all the following rules" msgstr "Följande datum" -#: ../extensions/search/gth-search-editor.c:139 -#: ../gthumb/gth-filter-editor-dialog.c:196 +#: ../extensions/search/gth-search-editor.c:112 +#: ../gthumb/gth-filter-editor-dialog.c:166 #, fuzzy msgid "any of the following rules" msgstr "Ändra följande värden:" @@ -4443,11 +4302,11 @@ msgid "Files found until now: %s" msgstr "Filer hittade tills nu: %s" -#: ../extensions/search/gth-search-task.c:270 +#: ../extensions/search/gth-search-task.c:271 msgid "Searching..." msgstr "Söker..." -#: ../extensions/search/gth-search-task.c:276 +#: ../extensions/search/gth-search-task.c:277 #, fuzzy msgid "Cancel the operation" msgstr "Avbryt åtgärden" @@ -4464,9 +4323,9 @@ msgid "View as a slideshow" msgstr "Visa som ett bildspel" -#: ../extensions/slideshow/callbacks.c:406 +#: ../extensions/slideshow/callbacks.c:410 #: ../extensions/slideshow/data/ui/slideshow-preferences.ui.h:5 -#: ../extensions/slideshow/preferences.c:138 +#: ../extensions/slideshow/preferences.c:162 #: ../extensions/slideshow/slideshow.extension.in.in.h:1 msgid "Slideshow" msgstr "Bildspel" @@ -4510,15 +4369,15 @@ msgid "Playing slideshow" msgstr "Bildspel" -#: ../extensions/slideshow/gth-slideshow-preferences.c:214 +#: ../extensions/slideshow/gth-slideshow-preferences.c:183 msgid "Choose the files to play" msgstr "Välj filerna att spela upp" -#: ../extensions/slideshow/gth-slideshow-preferences.c:223 +#: ../extensions/slideshow/gth-slideshow-preferences.c:192 msgid "Audio files" msgstr "Ljudfiler" -#: ../extensions/slideshow/gth-slideshow-preferences.c:289 +#: ../extensions/slideshow/gth-slideshow-preferences.c:258 msgid "Random" msgstr "Slumpmässig" @@ -4584,12 +4443,12 @@ msgstr "Index" #: ../extensions/webalbums/data/albumthemes/text.h:30 -#: ../gthumb/gth-browser-actions-entries.h:110 +#: ../gthumb/gth-browser-actions-entries.h:125 msgid "Next" msgstr "Nästa" #: ../extensions/webalbums/data/albumthemes/text.h:32 -#: ../gthumb/gth-browser-actions-entries.h:105 +#: ../gthumb/gth-browser-actions-entries.h:119 msgid "Previous" msgstr "Föregående" @@ -4682,38 +4541,38 @@ msgid "_Resize if larger than:" msgstr "_Ändra storlek om större än:" -#: ../extensions/webalbums/gth-web-exporter.c:1812 +#: ../extensions/webalbums/gth-web-exporter.c:1802 #, fuzzy msgid "Could not show the destination" msgstr "Kunde inte öppna platsen" -#: ../extensions/webalbums/gth-web-exporter.c:1848 +#: ../extensions/webalbums/gth-web-exporter.c:1838 msgid "The album has been created successfully." msgstr "Albumet har skapats." -#: ../extensions/webalbums/gth-web-exporter.c:2116 -#: ../extensions/webalbums/gth-web-exporter.c:2143 +#: ../extensions/webalbums/gth-web-exporter.c:2106 +#: ../extensions/webalbums/gth-web-exporter.c:2133 msgid "Saving thumbnails" msgstr "Sparar miniatyrbilder" -#: ../extensions/webalbums/gth-web-exporter.c:2171 +#: ../extensions/webalbums/gth-web-exporter.c:2161 msgid "Saving HTML pages: Images" msgstr "Sparar HTML-sidor: Bilder" -#: ../extensions/webalbums/gth-web-exporter.c:2229 +#: ../extensions/webalbums/gth-web-exporter.c:2219 msgid "Saving HTML pages: Indexes" msgstr "Sparar HTML-sidor: Index" -#: ../extensions/webalbums/gth-web-exporter.c:2512 +#: ../extensions/webalbums/gth-web-exporter.c:2502 msgid "Copying original images" msgstr "Kopierar ursprungliga bilder" -#: ../extensions/webalbums/gth-web-exporter.c:2938 +#: ../extensions/webalbums/gth-web-exporter.c:2929 #, fuzzy msgid "Could not find the style folder" msgstr "Kunde inte hitta papperskorgen" -#: ../extensions/webalbums/gth-web-exporter.c:2971 +#: ../extensions/webalbums/gth-web-exporter.c:2967 msgid "Could not create a temporary folder" msgstr "Kunde inte skapa temporär mapp" @@ -4726,64 +4585,64 @@ msgid "Web Albums" msgstr "Webbalbum" -#: ../gthumb/dlg-personalize-filters.c:236 +#: ../gthumb/dlg-personalize-filters.c:237 msgid "Filter" msgstr "Filter" -#: ../gthumb/dlg-personalize-filters.c:314 +#: ../gthumb/dlg-personalize-filters.c:315 msgid "Could not save the filter" msgstr "Kunde inte spara filtret" -#: ../gthumb/dlg-personalize-filters.c:357 +#: ../gthumb/dlg-personalize-filters.c:358 msgid "New Filter" msgstr "Nytt filter" -#: ../gthumb/dlg-personalize-filters.c:386 +#: ../gthumb/dlg-personalize-filters.c:387 msgid "Edit Filter" msgstr "Redigera filter" -#: ../gthumb/dlg-preferences-extensions.c:68 +#: ../gthumb/dlg-preferences-extensions.c:67 #: ../gthumb/gth-filterbar.c:269 msgid "All" msgstr "Alla" -#: ../gthumb/dlg-preferences-extensions.c:69 +#: ../gthumb/dlg-preferences-extensions.c:68 msgid "Enabled" msgstr "Aktiverade" -#: ../gthumb/dlg-preferences-extensions.c:70 +#: ../gthumb/dlg-preferences-extensions.c:69 msgid "Disabled" msgstr "Inaktiverade" -#: ../gthumb/dlg-preferences-extensions.c:73 +#: ../gthumb/dlg-preferences-extensions.c:72 msgid "Viewers" msgstr "Visning" -#: ../gthumb/dlg-preferences-extensions.c:74 +#: ../gthumb/dlg-preferences-extensions.c:73 msgid "Metadata" msgstr "Metadata" -#: ../gthumb/dlg-preferences-extensions.c:75 +#: ../gthumb/dlg-preferences-extensions.c:74 msgid "File tools" msgstr "Filverktyg" -#: ../gthumb/dlg-preferences-extensions.c:76 +#: ../gthumb/dlg-preferences-extensions.c:75 msgid "List tools" msgstr "Listverktyg" -#: ../gthumb/dlg-preferences-extensions.c:77 +#: ../gthumb/dlg-preferences-extensions.c:76 msgid "Importers" msgstr "Importera" -#: ../gthumb/dlg-preferences-extensions.c:78 +#: ../gthumb/dlg-preferences-extensions.c:77 msgid "Exporters" msgstr "Exportera" -#: ../gthumb/dlg-preferences-extensions.c:215 +#: ../gthumb/dlg-preferences-extensions.c:216 msgid "Could not activate the extension" msgstr "Kunde inte aktivera tillägget" -#: ../gthumb/dlg-preferences-extensions.c:225 +#: ../gthumb/dlg-preferences-extensions.c:226 msgid "Could not deactivate the extension" msgstr "Kunde inte inaktivera tillägget" @@ -4877,7 +4736,7 @@ #. * the separator that your locale uses or use "%Id" instead #. * of "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2756 +#: ../gthumb/glib-utils.c:2844 #, c-format msgctxt "long time format" msgid "%d:%02d:%02d" @@ -4889,29 +4748,29 @@ #. * separator that your locale uses or use "%Id" instead of #. * "%d" if your locale uses localized digits. #. -#: ../gthumb/glib-utils.c:2765 +#: ../gthumb/glib-utils.c:2853 #, c-format msgctxt "short time format" msgid "%d:%02d" msgstr "%d.%02d" -#: ../gthumb/gth-browser-actions-callbacks.c:361 +#: ../gthumb/gth-browser-actions-callbacks.c:391 msgid "gthumb is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version." msgstr "gthumb är fri programvara. Du kan distribuera det och/eller modifiera det under villkoren i GNU General Public License, publicerad av Free Software Foundation, antingen version 2 eller (om du så vill) någon senare version." -#: ../gthumb/gth-browser-actions-callbacks.c:365 +#: ../gthumb/gth-browser-actions-callbacks.c:395 msgid "gthumb is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." msgstr "gthumb distribueras i hopp om att det ska vara användbart, men UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för ytterligare information." -#: ../gthumb/gth-browser-actions-callbacks.c:369 +#: ../gthumb/gth-browser-actions-callbacks.c:399 msgid "You should have received a copy of the GNU General Public License along with gthumb. If not, see http://www.gnu.org/licenses/." msgstr "Du bör ha fått en kopia av GNU General Public License tillsammans med gthumb. Om inte, se http://www.gnu.org/licenses/." -#: ../gthumb/gth-browser-actions-callbacks.c:388 +#: ../gthumb/gth-browser-actions-callbacks.c:418 msgid "An image viewer and browser for GNOME." msgstr "En bildvisare och bläddrare för GNOME." -#: ../gthumb/gth-browser-actions-callbacks.c:391 +#: ../gthumb/gth-browser-actions-callbacks.c:421 msgid "translator_credits" msgstr "" "Daniel Nylander \n" @@ -4921,319 +4780,328 @@ "Skicka synpunkter på översättningen till\n" "." -#: ../gthumb/gth-browser-actions-entries.h:30 +#: ../gthumb/gth-browser-actions-entries.h:31 msgid "_File" msgstr "_Arkiv" -#: ../gthumb/gth-browser-actions-entries.h:31 +#: ../gthumb/gth-browser-actions-entries.h:32 msgid "_Edit" msgstr "_Redigera" -#: ../gthumb/gth-browser-actions-entries.h:33 +#: ../gthumb/gth-browser-actions-entries.h:34 msgid "_Go" msgstr "_Gå" -#: ../gthumb/gth-browser-actions-entries.h:34 +#: ../gthumb/gth-browser-actions-entries.h:35 msgid "_Help" msgstr "_Hjälp" -#: ../gthumb/gth-browser-actions-entries.h:35 +#: ../gthumb/gth-browser-actions-entries.h:36 msgid "Open _With" msgstr "Öppna _med" -#: ../gthumb/gth-browser-actions-entries.h:36 +#: ../gthumb/gth-browser-actions-entries.h:37 msgid "I_mport From" msgstr "Imp_ortera från" -#: ../gthumb/gth-browser-actions-entries.h:37 +#: ../gthumb/gth-browser-actions-entries.h:38 msgid "E_xport To" msgstr "E_xportera till" -#: ../gthumb/gth-browser-actions-entries.h:40 +#: ../gthumb/gth-browser-actions-entries.h:41 msgid "New _Window" msgstr "Nytt _fönster" -#: ../gthumb/gth-browser-actions-entries.h:41 +#: ../gthumb/gth-browser-actions-entries.h:42 msgid "Open another window" msgstr "Öppna ett annat fönster" -#: ../gthumb/gth-browser-actions-entries.h:65 +#: ../gthumb/gth-browser-actions-entries.h:71 msgid "Open" msgstr "Öppna" -#: ../gthumb/gth-browser-actions-entries.h:70 +#: ../gthumb/gth-browser-actions-entries.h:77 msgid "Open in New Window" msgstr "Öppna i nytt fönster" -#: ../gthumb/gth-browser-actions-entries.h:76 +#: ../gthumb/gth-browser-actions-entries.h:84 msgid "Edit various preferences" msgstr "Redigera olika inställningar" -#: ../gthumb/gth-browser-actions-entries.h:85 +#: ../gthumb/gth-browser-actions-entries.h:95 msgid "_Sort By..." msgstr "_Sortera efter..." -#: ../gthumb/gth-browser-actions-entries.h:90 +#: ../gthumb/gth-browser-actions-entries.h:101 msgid "_Filter..." msgstr "_Filter..." -#: ../gthumb/gth-browser-actions-entries.h:96 +#: ../gthumb/gth-browser-actions-entries.h:108 #, fuzzy msgid "Stop loading the current location" msgstr "Stoppa inläsning av aktuell plats" -#: ../gthumb/gth-browser-actions-entries.h:101 +#: ../gthumb/gth-browser-actions-entries.h:114 msgid "Reload the current location" msgstr "Uppdatera aktuell plats" -#: ../gthumb/gth-browser-actions-entries.h:106 +#: ../gthumb/gth-browser-actions-entries.h:120 msgid "View previous image" msgstr "Visa föregående bild" -#: ../gthumb/gth-browser-actions-entries.h:111 +#: ../gthumb/gth-browser-actions-entries.h:126 msgid "View next image" msgstr "Visa nästa bild" -#: ../gthumb/gth-browser-actions-entries.h:116 +#: ../gthumb/gth-browser-actions-entries.h:132 msgid "Switch to fullscreen" msgstr "Växla till helskärmsläge" -#: ../gthumb/gth-browser-actions-entries.h:121 +#: ../gthumb/gth-browser-actions-entries.h:138 msgid "Leave Fullscreen" msgstr "Lämna helskärmsläget" -#: ../gthumb/gth-browser-actions-entries.h:126 -#: ../gthumb/gth-browser.c:3628 +#: ../gthumb/gth-browser-actions-entries.h:144 +#: ../gthumb/gth-browser.c:3575 msgid "Go to the previous visited location" msgstr "Gå till föregående besökta plats" -#: ../gthumb/gth-browser-actions-entries.h:131 -#: ../gthumb/gth-browser.c:3649 +#: ../gthumb/gth-browser-actions-entries.h:150 +#: ../gthumb/gth-browser.c:3593 msgid "Go to the next visited location" msgstr "Gå till nästa besökta plats" -#: ../gthumb/gth-browser-actions-entries.h:136 -#: ../gthumb/gth-browser.c:3670 +#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser.c:3611 msgid "Go up one level" msgstr "Gå upp en nivå" -#: ../gthumb/gth-browser-actions-entries.h:145 -#: ../gthumb/gth-browser.c:667 +#: ../gthumb/gth-browser-actions-entries.h:167 +#: ../gthumb/gth-browser.c:672 msgid "_Delete History" msgstr "_Ta bort historik" -#: ../gthumb/gth-browser-actions-entries.h:146 +#: ../gthumb/gth-browser-actions-entries.h:168 msgid "Delete the list of visited locations" msgstr "Ta bort listan över besökta platser" -#: ../gthumb/gth-browser-actions-entries.h:151 +#: ../gthumb/gth-browser-actions-entries.h:174 msgid "View the folders" msgstr "Visa mapparna" -#: ../gthumb/gth-browser-actions-entries.h:156 +#: ../gthumb/gth-browser-actions-entries.h:180 msgid "Show information about gthumb" msgstr "Visa information om gthumb" -#: ../gthumb/gth-browser-actions-entries.h:160 +#: ../gthumb/gth-browser-actions-entries.h:185 msgid "Contents" msgstr "Innehåll" -#: ../gthumb/gth-browser-actions-entries.h:161 +#: ../gthumb/gth-browser-actions-entries.h:186 msgid "Display the gthumb Manual" msgstr "Visa handboken för gthumb" -#: ../gthumb/gth-browser-actions-entries.h:165 +#: ../gthumb/gth-browser-actions-entries.h:191 msgid "_Keyboard Shortcuts" msgstr "_Tangentbordsgenvägar" -#: ../gthumb/gth-browser-actions-entries.h:174 +#: ../gthumb/gth-browser-actions-entries.h:200 msgid "_Toolbar" msgstr "_Verktygsrad" -#: ../gthumb/gth-browser-actions-entries.h:175 +#: ../gthumb/gth-browser-actions-entries.h:201 msgid "View or hide the toolbar of this window" msgstr "Visa eller dölj verktygsraden för detta fönster" -#: ../gthumb/gth-browser-actions-entries.h:179 +#: ../gthumb/gth-browser-actions-entries.h:205 msgid "_Statusbar" msgstr "_Statusrad" -#: ../gthumb/gth-browser-actions-entries.h:180 +#: ../gthumb/gth-browser-actions-entries.h:206 msgid "View or hide the statusbar of this window" msgstr "Visa eller dölj statusraden för detta fönster" -#: ../gthumb/gth-browser-actions-entries.h:184 +#: ../gthumb/gth-browser-actions-entries.h:210 msgid "_Filterbar" msgstr "_Filterrad" -#: ../gthumb/gth-browser-actions-entries.h:185 +#: ../gthumb/gth-browser-actions-entries.h:211 msgid "View or hide the filterbar of this window" msgstr "Visa eller dölj filterraden för detta fönster" -#: ../gthumb/gth-browser-actions-entries.h:189 +#: ../gthumb/gth-browser-actions-entries.h:215 msgid "_Sidebar" msgstr "Si_dopanel" -#: ../gthumb/gth-browser-actions-entries.h:190 +#: ../gthumb/gth-browser-actions-entries.h:216 msgid "View or hide the sidebar of this window" msgstr "Visa eller dölj sidopanelen för detta fönster" -#: ../gthumb/gth-browser-actions-entries.h:194 +#: ../gthumb/gth-browser-actions-entries.h:220 #, fuzzy msgid "_Thumbnail Pane" msgstr "_Miniatyrbilder" -#: ../gthumb/gth-browser-actions-entries.h:195 +#: ../gthumb/gth-browser-actions-entries.h:221 #, fuzzy msgid "View or hide the thumbnail pane in viewer mode" msgstr "Visa eller dölj statusraden för detta fönster" -#: ../gthumb/gth-browser-actions-entries.h:199 +#: ../gthumb/gth-browser-actions-entries.h:225 msgid "_Thumbnails" msgstr "_Miniatyrbilder" -#: ../gthumb/gth-browser-actions-entries.h:200 +#: ../gthumb/gth-browser-actions-entries.h:226 msgid "View thumbnails" msgstr "Visa miniatyrbilder" -#: ../gthumb/gth-browser-actions-entries.h:204 +#: ../gthumb/gth-browser-actions-entries.h:230 msgid "_Hidden Files" msgstr "_Dolda filer" -#: ../gthumb/gth-browser-actions-entries.h:205 +#: ../gthumb/gth-browser-actions-entries.h:231 msgid "Show hidden files and folders" msgstr "Visa dolda filer och mappar" -#: ../gthumb/gth-browser-actions-entries.h:210 +#: ../gthumb/gth-browser-actions-entries.h:236 +#: ../gthumb/gth-browser-actions-entries.h:241 msgid "View file properties" msgstr "Visa filegenskaper" -#: ../gthumb/gth-browser-actions-entries.h:214 +#: ../gthumb/gth-browser-actions-entries.h:245 msgid "Edit" msgstr "Redigera" -#: ../gthumb/gth-browser-actions-entries.h:215 +#: ../gthumb/gth-browser-actions-entries.h:246 msgid "Edit file" msgstr "Redigera fil" -#: ../gthumb/gth-browser.c:363 +#: ../gthumb/gth-browser-actions-entries.h:250 +msgid "_Fit Window to Image" +msgstr "_Anpassa fönster till bild" + +#: ../gthumb/gth-browser-actions-entries.h:251 +msgid "Resize the window to the size of the image" +msgstr "Ändra storlek på fönstret till storleken för bilden" + +#: ../gthumb/gth-browser.c:369 #, c-format msgid "Open %s" msgstr "Öppna %s" -#: ../gthumb/gth-browser.c:503 +#: ../gthumb/gth-browser.c:509 msgid "[modified]" msgstr "[ändrad]" -#: ../gthumb/gth-browser.c:991 +#: ../gthumb/gth-browser.c:996 #, c-format msgid "%d file selected (%s)" msgid_plural "%d files selected (%s)" msgstr[0] "%d fil markerad (%s)" msgstr[1] "%d filer markerade (%s)" -#: ../gthumb/gth-browser.c:1026 +#: ../gthumb/gth-browser.c:1031 #, c-format msgid "%s of free space" msgstr "%s ledigt utrymme" -#: ../gthumb/gth-browser.c:1235 -#: ../gthumb/gth-browser.c:1809 -#: ../gthumb/gth-browser.c:5774 -#: ../gthumb/gth-browser.c:5793 -#: ../gthumb/gth-browser.c:5818 +#: ../gthumb/gth-browser.c:1240 +#: ../gthumb/gth-browser.c:1799 +#: ../gthumb/gth-browser.c:5883 +#: ../gthumb/gth-browser.c:5902 +#: ../gthumb/gth-browser.c:5927 #, c-format msgid "Could not load the position \"%s\"" msgstr "Kunde inte läsa in positionen \"%s\"" -#: ../gthumb/gth-browser.c:1905 -#: ../gthumb/gth-browser.c:1932 +#: ../gthumb/gth-browser.c:1895 +#: ../gthumb/gth-browser.c:1922 #, c-format msgid "No suitable module found for %s" msgstr "Ingen lämplig modul hittades för %s" -#: ../gthumb/gth-browser.c:2052 +#: ../gthumb/gth-browser.c:2042 #, c-format msgid "Save changes to file '%s'?" msgstr "Spara ändringar i filen \"%s\"?" -#: ../gthumb/gth-browser.c:2057 +#: ../gthumb/gth-browser.c:2047 msgid "If you don't save, changes to the file will be permanently lost." msgstr "Om du inte sparar kommer ändringarna i filen att gå förlorade för alltid." -#: ../gthumb/gth-browser.c:2058 +#: ../gthumb/gth-browser.c:2048 msgid "Do _Not Save" msgstr "Spara _inte" -#: ../gthumb/gth-browser.c:2863 -#: ../gthumb/gth-source-tree.c:178 +#: ../gthumb/gth-browser.c:2818 +#: ../gthumb/gth-source-tree.c:182 msgid "Could not change name" msgstr "Kunde inte ändra namnet" -#: ../gthumb/gth-browser.c:3309 +#: ../gthumb/gth-browser.c:3247 #: ../gthumb/gth-main-default-metadata.c:41 msgid "Modified" msgstr "Ändrad" -#: ../gthumb/gth-browser.c:3629 -#: ../gthumb/gth-browser.c:3650 +#: ../gthumb/gth-browser.c:3576 +#: ../gthumb/gth-browser.c:3594 msgid "View the list of visited locations" msgstr "Visa listan över besökta platser" -#: ../gthumb/gth-browser.c:3671 +#: ../gthumb/gth-browser.c:3612 msgid "View the list of upper locations" msgstr "Visa listan över övre platser" -#: ../gthumb/gth-browser.c:5775 +#: ../gthumb/gth-browser.c:5884 #, c-format msgid "File type not supported" msgstr "Filtypen stöds inte" -#: ../gthumb/gth-browser.c:5819 +#: ../gthumb/gth-browser.c:5928 #, c-format msgid "No suitable module found" msgstr "Ingen lämplig modul hittades" -#: ../gthumb/gth-extensions.c:228 +#: ../gthumb/gth-extensions.c:203 #, c-format msgid "Could not open the module `%s`: %s" msgstr "Kunde inte öppna modulen \"%s\": %s" -#: ../gthumb/gth-extensions.c:831 +#: ../gthumb/gth-extensions.c:733 #, fuzzy, c-format msgid "The extension '%1$s' is required by the extension '%2$s'" msgstr "Tillägget \"%s\" krävs av tillägget \"%s\"" -#: ../gthumb/gth-file-source-vfs.c:120 +#: ../gthumb/gth-file-source-vfs.c:121 msgid "Home Folder" msgstr "Hemmapp" -#: ../gthumb/gth-file-source-vfs.c:125 +#: ../gthumb/gth-file-source-vfs.c:126 msgid "File System" msgstr "Filsystem" -#: ../gthumb/gth-file-source-vfs.c:734 +#: ../gthumb/gth-file-source-vfs.c:739 #, fuzzy msgid "The files cannot be moved to the Trash. Do you want to delete them permanently?" msgstr "Bilderna kan inte flyttas till papperskorgen. Vill du ta bort dem permanent?" -#: ../gthumb/gth-file-source-vfs.c:745 +#: ../gthumb/gth-file-source-vfs.c:750 msgid "Could not move the files to the Trash" msgstr "Kunde inte flytta filerna till papperskorgen" -#: ../gthumb/gth-file-source-vfs.c:789 -#, fuzzy, c-format +#: ../gthumb/gth-file-source-vfs.c:797 +#, c-format msgid "Are you sure you want to move \"%s\" to trash?" -msgstr "Är du säker på att du vill permanent ta bort \"%s\"?" +msgstr "Är du säker på att du vill flytta \"%s\" till papperskorgen?" -#: ../gthumb/gth-file-source-vfs.c:792 -#, fuzzy, c-format +#: ../gthumb/gth-file-source-vfs.c:801 +#, c-format msgid "Are you sure you want to move to trash the %'d selected file?" msgid_plural "Are you sure you want to move to trash the %'d selected files?" -msgstr[0] "Är du säker på att du vill permanent ta bort \"%s\"?" -msgstr[1] "Är du säker på att du vill permanent ta bort \"%s\"?" +msgstr[0] "Är du säker på att du vill flytta %'d markerad fil till papperskorgen?" +msgstr[1] "Är du säker på att du vill flytta %'d markerade filer till papperskorgen?" -#: ../gthumb/gth-file-source-vfs.c:833 +#: ../gthumb/gth-file-source-vfs.c:844 #, c-format msgid "Are you sure you want to permanently delete the %'d selected file?" msgid_plural "Are you sure you want to permanently delete the %'d selected files?" @@ -5241,95 +5109,93 @@ msgstr[1] "" #: ../gthumb/gth-filterbar.c:405 -#, fuzzy msgid "Hide the filterbar" -msgstr "Visa mapparna" +msgstr "Dölj filterraden" #: ../gthumb/gth-filter.c:43 -#: ../gthumb/gth-filter-editor-dialog.c:208 +#: ../gthumb/gth-filter-editor-dialog.c:178 #: ../gthumb/gth-test-simple.c:75 msgid "kB" msgstr "kB" #: ../gthumb/gth-filter.c:44 -#: ../gthumb/gth-filter-editor-dialog.c:209 +#: ../gthumb/gth-filter-editor-dialog.c:179 #: ../gthumb/gth-test-simple.c:76 msgid "MB" msgstr "MB" #: ../gthumb/gth-filter.c:45 -#: ../gthumb/gth-filter-editor-dialog.c:210 +#: ../gthumb/gth-filter-editor-dialog.c:180 #: ../gthumb/gth-test-simple.c:77 msgid "GB" msgstr "GB" #. "files" label -#: ../gthumb/gth-filter.c:279 -#: ../gthumb/gth-filter-editor-dialog.c:207 +#: ../gthumb/gth-filter.c:289 +#: ../gthumb/gth-filter-editor-dialog.c:177 msgid "files" msgstr "filer" -#: ../gthumb/gth-filter-editor-dialog.c:254 +#: ../gthumb/gth-filter-editor-dialog.c:224 msgid "ascending" msgstr "stigande" -#: ../gthumb/gth-filter-editor-dialog.c:255 +#: ../gthumb/gth-filter-editor-dialog.c:225 msgid "descending" msgstr "fallande" -#: ../gthumb/gth-filter-editor-dialog.c:545 +#: ../gthumb/gth-filter-editor-dialog.c:515 #, c-format msgid "No limit specified" msgstr "" -#: ../gthumb/gth-folder-tree.c:862 +#: ../gthumb/gth-folder-tree.c:857 msgid "Loading..." msgstr "Läser in..." -#: ../gthumb/gth-folder-tree.c:1133 +#: ../gthumb/gth-folder-tree.c:1100 msgid "(Open Parent)" msgstr "" -#: ../gthumb/gth-histogram-view.c:800 +#: ../gthumb/gth-histogram-view.c:826 msgid "Linear scale" msgstr "Linjär skalning" -#: ../gthumb/gth-histogram-view.c:812 +#: ../gthumb/gth-histogram-view.c:838 msgid "Logarithmic scale" msgstr "Logaritmisk skalning" -#: ../gthumb/gth-histogram-view.c:832 +#: ../gthumb/gth-histogram-view.c:858 msgid "Channel:" msgstr "Kanal:" -#: ../gthumb/gth-histogram-view.c:864 +#: ../gthumb/gth-histogram-view.c:890 msgid "Value" msgstr "Värde" -#: ../gthumb/gth-histogram-view.c:870 +#: ../gthumb/gth-histogram-view.c:896 msgid "Red" msgstr "Röd" -#: ../gthumb/gth-histogram-view.c:876 +#: ../gthumb/gth-histogram-view.c:902 msgid "Green" msgstr "Grön" -#: ../gthumb/gth-histogram-view.c:882 +#: ../gthumb/gth-histogram-view.c:908 msgid "Blue" msgstr "Blå" -#: ../gthumb/gth-histogram-view.c:888 +#: ../gthumb/gth-histogram-view.c:914 msgid "Alpha" msgstr "Alfa" -#: ../gthumb/gth-histogram-view.c:895 +#: ../gthumb/gth-histogram-view.c:921 msgid "RGB" msgstr "RGB" #: ../gthumb/gth-load-file-data-task.c:108 -#, fuzzy msgid "Reading file information" -msgstr "Hämtar filinformation" +msgstr "Läser filinformation" #: ../gthumb/gth-main-default-metadata.c:32 msgid "File" @@ -5361,18 +5227,16 @@ msgstr "filnamn" #: ../gthumb/gth-main-default-sort-types.c:132 -#, fuzzy msgid "file path" -msgstr "Sök_väg till filen" +msgstr "filsökväg" #: ../gthumb/gth-main-default-sort-types.c:133 msgid "file size" msgstr "filstorlek" #: ../gthumb/gth-main-default-sort-types.c:134 -#, fuzzy msgid "file modified date" -msgstr "efter filens ändringstid" +msgstr "filens ändringsdatum" #: ../gthumb/gth-main-default-sort-types.c:135 msgid "no sorting" @@ -5396,12 +5260,11 @@ #: ../gthumb/gth-main-default-tests.c:272 msgid "Title (embedded)" -msgstr "" +msgstr "Titel (inbäddad)" #: ../gthumb/gth-main-default-tests.c:278 -#, fuzzy msgid "Description (embedded)" -msgstr "Beskrivning" +msgstr "Beskrivning (inbäddad)" #: ../gthumb/gth-pixbuf-list-task.c:139 msgid "Could not rename the file" @@ -5416,16 +5279,15 @@ msgstr "Avbryt åtgärden" #: ../gthumb/gth-save-file-data-task.c:102 -#, fuzzy msgid "Saving file information" -msgstr "Hämtar filinformation" +msgstr "Sparar filinformation" -#: ../gthumb/gth-tags-entry.c:373 +#: ../gthumb/gth-tags-entry.c:388 #, c-format msgid "Create tag «%s»" msgstr "Skapa taggen \"%s\"" -#: ../gthumb/gth-tags-entry.c:719 +#: ../gthumb/gth-tags-entry.c:743 msgid "Show all the tags" msgstr "Visa alla taggar" @@ -5493,20 +5355,20 @@ msgid "is not" msgstr "är inte" -#: ../gthumb/gth-test-category.c:374 -#: ../gthumb/gth-test-simple.c:800 -#: ../gthumb/gth-test-simple.c:826 -#: ../gthumb/gth-test-simple.c:847 -#: ../gthumb/gth-test-simple.c:873 +#: ../gthumb/gth-test-category.c:386 +#: ../gthumb/gth-test-simple.c:812 +#: ../gthumb/gth-test-simple.c:838 +#: ../gthumb/gth-test-simple.c:859 +#: ../gthumb/gth-test-simple.c:885 #, c-format msgid "The test definition is incomplete" msgstr "" -#: ../gthumb/gth-test-selector.c:278 +#: ../gthumb/gth-test-selector.c:251 msgid "Add a new rule" msgstr "Lägg till en ny regel" -#: ../gthumb/gth-test-selector.c:289 +#: ../gthumb/gth-test-selector.c:262 msgid "Remove this rule" msgstr "Ta bort denna regel" @@ -5544,17 +5406,17 @@ #: ../gthumb/gth-test-simple.c:62 msgid "is before" -msgstr "" +msgstr "är före" #: ../gthumb/gth-test-simple.c:63 msgid "is after" msgstr "är efter" -#: ../gthumb/gth-time-selector.c:471 +#: ../gthumb/gth-time-selector.c:474 msgid "Today" msgstr "Idag" -#: ../gthumb/gth-time-selector.c:479 +#: ../gthumb/gth-time-selector.c:482 msgid "Now" msgstr "Nu" @@ -5566,53 +5428,52 @@ msgid "Close _All Windows" msgstr "Stäng _alla fönster" -#: ../gthumb/gtk-utils.c:704 +#: ../gthumb/gtk-utils.c:551 msgid "Could not display help" msgstr "Kunde inte visa hjälp" -#: ../gthumb/gtk-utils.c:991 -#: ../gthumb/gtk-utils.c:1000 +#: ../gthumb/gtk-utils.c:868 +#: ../gthumb/gtk-utils.c:875 msgid "Could not launch the application" msgstr "Kunde inte starta programmet" -#: ../gthumb/gtk-utils.c:1103 +#: ../gthumb/gtk-utils.c:978 msgid "_Copy Here" msgstr "_Kopiera hit" -#: ../gthumb/gtk-utils.c:1108 +#: ../gthumb/gtk-utils.c:983 msgid "_Move Here" msgstr "_Flytta hit" -#: ../gthumb/gtk-utils.c:1113 +#: ../gthumb/gtk-utils.c:988 msgid "_Link Here" msgstr "_Länka hit" -#: ../gthumb/gtk-utils.c:1122 +#: ../gthumb/gtk-utils.c:997 msgid "Cancel" msgstr "Avbryt" -#: ../gthumb/main.c:72 +#: ../gthumb/main.c:59 msgid "Open a new window" msgstr "Öppna ett nytt fönster" -#: ../gthumb/main.c:76 +#: ../gthumb/main.c:63 msgid "Start in fullscreen mode" msgstr "Starta i helskärmsläge" -#: ../gthumb/main.c:80 +#: ../gthumb/main.c:67 msgid "Automatically start a slideshow" msgstr "Starta ett bildspel automatiskt" -#: ../gthumb/main.c:84 +#: ../gthumb/main.c:71 msgid "Automatically import digital camera photos" msgstr "Importera digitalkamerabilder automatiskt" -#: ../gthumb/main.c:88 +#: ../gthumb/main.c:75 msgid "Show version" msgstr "Visa version" -#. command line options -#: ../gthumb/main.c:539 +#: ../gthumb/main.c:344 msgid "- Image browser and viewer" msgstr "- Bildbläddrare och bildvisare" @@ -5621,6 +5482,83 @@ msgid "Could not find a suitable module to save the image as \"%s\"" msgstr "Kunde inte hitta en lämplig modul för att spara bilden som \"%s\"" +#~ msgid "" +#~ "Possible values are: actual_size, fit, keep_prev, fit_if_larger, " +#~ "fit_width_if_larger." +#~ msgstr "" +#~ "Möjliga värden är: actual_size, fit, keep_prev, fit_if_larger, " +#~ "fit_width_if_larger." + +#~ msgid "Possible values are: high, low." +#~ msgstr "Möjliga värden är: high, low." + +#~ msgid "Possible values are: light, midtone, dark." +#~ msgstr "Möjliga värden är: light, midtone, dark." + +#~ msgid "Possible values are: list, thumbnails." +#~ msgstr "Möjliga värden är: list, thumbnails." + +#~ msgid "Possible values are: small, medium, large." +#~ msgstr "Möjliga värden är: small, medium, large." + +#~ msgid "" +#~ "Possible values are: system, text_below, text_beside, text_only, " +#~ "icons_only." +#~ msgstr "" +#~ "Möjliga värden är: system, text_below, text_beside, text_only, icons_only." + +#~ msgid "Activate items with a double click" +#~ msgstr "Aktivera objekt med ett dubbelklick" + +#~ msgid "Activate items with a single click" +#~ msgstr "Aktivera objekt med ett enkelklick" + +#~ msgid "Black" +#~ msgstr "Svart" + +#~ msgid "Checked" +#~ msgstr "Rutor" + +#~ msgid "Fit to width if larger" +#~ msgstr "Anpassa till bredd om större" + +#~ msgid "Fit to window" +#~ msgstr "Anpassa till fönster" + +#~ msgid "Fit to window if larger" +#~ msgstr "Anpassa till fönster om större" + +#~ msgid "Follow Nautilus behaviour" +#~ msgstr "Följ Nautilus beteende" + +#~ msgid "Icons only" +#~ msgstr "Endast ikoner" + +#~ msgid "Keep previous zoom" +#~ msgstr "Behåll föregående zoom" + +#, fuzzy +#~ msgid "Set image to actual size" +#~ msgstr "Sortera bilder efter filstorlek" + +#~ msgid "System settings" +#~ msgstr "Systeminställningar" + +#~ msgid "Text below icons" +#~ msgstr "Text under ikoner" + +#~ msgid "Text beside icons" +#~ msgstr "Text bredvid ikoner" + +#~ msgid "Text only" +#~ msgstr "Endast text" + +#~ msgid "White" +#~ msgstr "Vit" + +#~ msgid "Possible values: pixels, percentage" +#~ msgstr "Möjliga värden är: pixels, percentage" + #~ msgid " " #~ msgstr " " @@ -5636,6 +5574,45 @@ #~ msgid "%p" #~ msgstr "%p" +#~ msgid "Choose another tag" +#~ msgstr "Välj en annan tagg" + +#~ msgid "New tag" +#~ msgstr "Ny tagg" + +#~ msgid "×" +#~ msgstr "×" +#~ msgctxt "time" + +#~ msgid "/" +#~ msgstr "/" + +#, fuzzy +#~ msgid "" +#~ "Possible values are: actual-size, keep-prev, fit-size, fit-size-if-" +#~ "larger, fit-width, fit-width-if-larger." +#~ msgstr "" +#~ "Möjliga värden är: actual_size, fit, keep_prev, fit_if_larger, " +#~ "fit_width_if_larger." + +#~ msgid "High" +#~ msgstr "Hög" + +#~ msgid "Low" +#~ msgstr "Låg" + +#~ msgid "Set to actual size" +#~ msgstr "Ställ in till faktisk storlek" + +#~ msgid "Fit to width" +#~ msgstr "Anpassa till bredd" + +#~ msgid "Possible values are: none, file_date, current_date" +#~ msgstr "Möjliga värden är: none, file_date, current_date" + +#~ msgid "Possible values are: yyyymmdd, yyyymm, yyyy" +#~ msgstr "Möjliga värden är: yyyymmdd, yyyymm, yyyy" + #~ msgid "%B" #~ msgstr "%B" @@ -5645,6 +5622,12 @@ #~ msgid "%U" #~ msgstr "%U" +#~ msgid "Possible values are: none, deflate, jpeg." +#~ msgstr "Möjliga värden är: none, deflate, jpeg." + +#~ msgid "Possible values: 0 (none), 1 (lower), 2 (upper)" +#~ msgstr "Möjliga värden är: 0 (ingen), 1 (lägre), 2 (övre)" + #~ msgid "%C" #~ msgstr "%C" @@ -6618,9 +6601,6 @@ #~ msgid "Came_ra Model" #~ msgstr "Kame_ramodell" -#~ msgid "Da_te and Time" -#~ msgstr "Da_tum och tid" - #~ msgid "E_xposure mode" #~ msgstr "E_xponeringsläge" diff -Nru gthumb-2.14.3/tests/Makefile.in gthumb-3.0.0/tests/Makefile.in --- gthumb-2.14.3/tests/Makefile.in 2012-03-25 18:34:16.000000000 +0000 +++ gthumb-3.0.0/tests/Makefile.in 2012-04-23 18:09:52.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -16,6 +16,23 @@ @SET_MAKE@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -119,6 +136,11 @@ $(gsignature_test_SOURCES) $(oauth_test_SOURCES) DIST_SOURCES = $(dom_test_SOURCES) $(glib_utils_test_SOURCES) \ $(gsignature_test_SOURCES) $(oauth_test_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -166,10 +188,8 @@ EXTENSION_LIBTOOL_FLAGS = @EXTENSION_LIBTOOL_FLAGS@ FGREP = @FGREP@ FLEX = @FLEX@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMOFILES = @GMOFILES@ @@ -177,6 +197,7 @@ GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ GREP = @GREP@ +GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@ GSTREAMER_LIBS = @GSTREAMER_LIBS@ GTHUMB_API_VERSION = @GTHUMB_API_VERSION@ @@ -216,6 +237,8 @@ LIBOBJS = @LIBOBJS@ LIBOPENRAW_CFLAGS = @LIBOPENRAW_CFLAGS@ LIBOPENRAW_LIBS = @LIBOPENRAW_LIBS@ +LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ +LIBRSVG_LIBS = @LIBRSVG_LIBS@ LIBS = @LIBS@ LIBSOUP_CFLAGS = @LIBSOUP_CFLAGS@ LIBSOUP_GNOME_CFLAGS = @LIBSOUP_GNOME_CFLAGS@ @@ -264,8 +287,6 @@ SMCLIENT_LIBS = @SMCLIENT_LIBS@ STRIP = @STRIP@ TIFF_LIBS = @TIFF_LIBS@ -UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ -UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -296,6 +317,7 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gsettingsschemadir = @gsettingsschemadir@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@
@@ -496,7 +485,7 @@

-

Začne diapredstavitev.

+

Začne predstavitev.

-

Premor ali nadaljevanje diapredstavitve.

+

Premor ali nadaljevanje predstavitve.

-

Zapre diapredstavitev.

+

Zapre predstavitev.